annotate mp3.c @ 5016:eb6dd7717805 libavformat

Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c. patch by Patrick Dehne, patrick mysonicweb com
author diego
date Thu, 11 Jun 2009 15:26:57 +0000
parents d24b4e25db8d
children 9ed3c88ed9ba
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
1 /*
1415
3b00fb8ef8e4 replace coder/decoder file description in libavformat by muxer/demuxer
aurel
parents: 1358
diff changeset
2 * MP3 muxer and demuxer
4251
77e0c7511d41 cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 4221
diff changeset
3 * Copyright (c) 2003 Fabrice Bellard
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
4 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
5 * This file is part of FFmpeg.
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
6 *
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
11 *
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
16 *
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
1358
0899bfe4105c Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 1321
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
896
edbe5c3717f9 Update licensing information: The FSF changed postal address.
diego
parents: 885
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
20 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
21
3714
3790cb6c893d strcasecmp() requires #include <strings.h>
aurel
parents: 3561
diff changeset
22 #include <strings.h>
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
23 #include "libavutil/avstring.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
24 #include "libavcodec/mpegaudio.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
25 #include "libavcodec/mpegaudiodecheader.h"
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
26 #include "avformat.h"
4221
55f448c99135 Factorise id3v2 header parsing from mp3.c to be shared
superdump
parents: 4206
diff changeset
27 #include "id3v2.h"
5016
eb6dd7717805 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
diego
parents: 4900
diff changeset
28 #include "id3v1.h"
2097
cab3fcb34077 id3v2 reader
benoit
parents: 2096
diff changeset
29
4354
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
30 static void id3v1_get_string(AVFormatContext *s, const char *key,
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
31 const uint8_t *buf, int buf_size)
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
32 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
33 int i, c;
4354
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
34 char *q, str[512];
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
35
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
36 q = str;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
37 for(i = 0; i < buf_size; i++) {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
38 c = buf[i];
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
39 if (c == '\0')
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
40 break;
4354
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
41 if ((q - str) >= sizeof(str) - 1)
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
42 break;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
43 *q++ = c;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
44 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
45 *q = '\0';
4354
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
46
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
47 if (*str)
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
48 av_metadata_set(&s->metadata, key, str);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
49 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
50
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
51 /* 'buf' must be ID3v1_TAG_SIZE byte long */
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
52 static int id3v1_parse_tag(AVFormatContext *s, const uint8_t *buf)
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
53 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
54 char str[5];
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
55 int genre;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
56
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
57 if (!(buf[0] == 'T' &&
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
58 buf[1] == 'A' &&
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
59 buf[2] == 'G'))
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
60 return -1;
4354
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
61 id3v1_get_string(s, "title", buf + 3, 30);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
62 id3v1_get_string(s, "author", buf + 33, 30);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
63 id3v1_get_string(s, "album", buf + 63, 30);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
64 id3v1_get_string(s, "year", buf + 93, 4);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
65 id3v1_get_string(s, "comment", buf + 97, 30);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
66 if (buf[125] == 0 && buf[126] != 0) {
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
67 snprintf(str, sizeof(str), "%d", buf[126]);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
68 av_metadata_set(&s->metadata, "track", str);
6111dd03464b use new metadata API in the mp3 demuxer
aurel
parents: 4333
diff changeset
69 }
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
70 genre = buf[127];
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
71 if (genre <= ID3v1_GENRE_MAX)
5016
eb6dd7717805 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
diego
parents: 4900
diff changeset
72 av_metadata_set(&s->metadata, "genre", ff_id3v1_genre_str[genre]);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
73 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
74 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
75
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
76 /* mp3 read */
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
77
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
78 static int mp3_read_probe(AVProbeData *p)
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
79 {
2234
2bc002540a9b kill uninitialised variable warning in mp3_read_probe()
mru
parents: 2231
diff changeset
80 int max_frames, first_frames = 0;
1433
dababce8f69e dont set the sampling rate just because 1 mp3 packet header says so (fixes playback speed on some old mencoder generated avis which where then dumped to mp3)
michael
parents: 1415
diff changeset
81 int fsize, frames, sample_rate;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
82 uint32_t header;
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
83 uint8_t *buf, *buf0, *buf2, *end;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
84 AVCodecContext avctx;
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
85
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
86 buf0 = p->buf;
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
87 if(ff_id3v2_match(buf0)) {
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
88 buf0 += ff_id3v2_tag_len(buf0);
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
89 }
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
90
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
91 max_frames = 0;
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
92 buf = buf0;
4258
35c8abd32d93 Fix a read past end of buffer crash in the mp3 probe
alexc
parents: 4254
diff changeset
93 end = p->buf + p->buf_size - sizeof(uint32_t);
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
94
2797
428c1678b21f ensure that the probe code runs in O(n)
michael
parents: 2796
diff changeset
95 for(; buf < end; buf= buf2+1) {
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
96 buf2 = buf;
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
97
1312
24f1d6a50117 10l typo
michael
parents: 1308
diff changeset
98 for(frames = 0; buf2 < end; frames++) {
2222
3427d0c63a32 Use AV_RB* macros where appropriate.
diego
parents: 2189
diff changeset
99 header = AV_RB32(buf2);
4126
bfc790ab375f Change mpeg audio parser so it only sets frame_size, channels and bit_rate
michael
parents: 3973
diff changeset
100 fsize = ff_mpa_decode_header(&avctx, header, &sample_rate, &sample_rate, &sample_rate, &sample_rate);
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
101 if(fsize < 0)
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
102 break;
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
103 buf2 += fsize;
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
104 }
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
105 max_frames = FFMAX(max_frames, frames);
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
106 if(buf == buf0)
1321
9eeb01383e30 reduce scores if the mp3 frames dont start from the begin of the file (fixes flv deteted as mp3 issues)
michael
parents: 1312
diff changeset
107 first_frames= frames;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
108 }
1321
9eeb01383e30 reduce scores if the mp3 frames dont start from the begin of the file (fixes flv deteted as mp3 issues)
michael
parents: 1312
diff changeset
109 if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
2798
51e0a502392f return a slightly larger score if we find more than 500 valid mp3 frames in a row
michael
parents: 2797
diff changeset
110 else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
4900
d24b4e25db8d Require 4 instead of 3 frames for detecting mp3,
michael
parents: 4787
diff changeset
111 else if(max_frames>=4) return AVPROBE_SCORE_MAX/4;
4383
0b688ff86d2f Make the MP3 probe weakly claim all files with ID3v2 tags to fix regressions on
alexc
parents: 4358
diff changeset
112 else if(buf0!=p->buf) return AVPROBE_SCORE_MAX/4-1;
1321
9eeb01383e30 reduce scores if the mp3 frames dont start from the begin of the file (fixes flv deteted as mp3 issues)
michael
parents: 1312
diff changeset
113 else if(max_frames>=1) return 1;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
114 else return 0;
4900
d24b4e25db8d Require 4 instead of 3 frames for detecting mp3,
michael
parents: 4787
diff changeset
115 //mpegps_mp3_unrecognized_format.mpg has max_frames=3
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
116 }
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
117
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
118 /**
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
119 * Try to find Xing/Info/VBRI tags and compute duration from info therein
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
120 */
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
121 static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
122 {
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
123 uint32_t v, spf;
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
124 int frames = -1; /* Total number of frames in file */
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3871
diff changeset
125 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
4274
39f62ce83e5a Avoid allocating MPADecodeContext on stack.
andoma
parents: 4258
diff changeset
126 MPADecodeHeader c;
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
127 int vbrtag_size = 0;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
128
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
129 v = get_be32(s->pb);
2703
2c2da3011d6e make sure the mpeg audio header is valid before passing it to ff_mpegaudio_decode_header()
andoma
parents: 2667
diff changeset
130 if(ff_mpa_check_header(v) < 0)
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
131 return -1;
2703
2c2da3011d6e make sure the mpeg audio header is valid before passing it to ff_mpegaudio_decode_header()
andoma
parents: 2667
diff changeset
132
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
133 if (ff_mpegaudio_decode_header(&c, v) == 0)
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
134 vbrtag_size = c.frame_size;
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
135 if(c.layer != 3)
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
136 return -1;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
137
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
138 /* Check for Xing / Info tag */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
139 url_fseek(s->pb, xing_offtbl[c.lsf == 1][c.nb_channels == 1], SEEK_CUR);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
140 v = get_be32(s->pb);
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
141 if(v == MKBETAG('X', 'i', 'n', 'g') || v == MKBETAG('I', 'n', 'f', 'o')) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
142 v = get_be32(s->pb);
2664
33122df98824 fix indent
andoma
parents: 2663
diff changeset
143 if(v & 0x1)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
144 frames = get_be32(s->pb);
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
145 }
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
146
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
147 /* Check for VBRI tag (always 32 bytes after end of mpegaudio header) */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
148 url_fseek(s->pb, base + 4 + 32, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
149 v = get_be32(s->pb);
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
150 if(v == MKBETAG('V', 'B', 'R', 'I')) {
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
151 /* Check tag version */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
152 if(get_be16(s->pb) == 1) {
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
153 /* skip delay, quality and total bytes */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
154 url_fseek(s->pb, 8, SEEK_CUR);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
155 frames = get_be32(s->pb);
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
156 }
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
157 }
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
158
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
159 if(frames < 0)
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
160 return -1;
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
161
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
162 /* Skip the vbr tag frame */
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
163 url_fseek(s->pb, base + vbrtag_size, SEEK_SET);
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
164
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
165 spf = c.lsf ? 576 : 1152; /* Samples per frame, layer 3 */
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
166 st->duration = av_rescale_q(frames, (AVRational){spf, c.sample_rate},
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
167 st->time_base);
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
168 return 0;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
169 }
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
170
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
171 static int mp3_read_header(AVFormatContext *s,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
172 AVFormatParameters *ap)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
173 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
174 AVStream *st;
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
175 uint8_t buf[ID3v1_TAG_SIZE];
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
176 int len, ret, filesize;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3871
diff changeset
177 int64_t off;
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
178
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
179 st = av_new_stream(s, 0);
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
180 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2234
diff changeset
181 return AVERROR(ENOMEM);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
182
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
183 st->codec->codec_type = CODEC_TYPE_AUDIO;
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
184 st->codec->codec_id = CODEC_ID_MP3;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
185 st->need_parsing = AVSTREAM_PARSE_FULL;
2622
c63b1bd7be16 set start_time to 0 to enable seeking in mp3-files
andoma
parents: 2306
diff changeset
186 st->start_time = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
187
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
188 /* try to get the TAG */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
189 if (!url_is_streamed(s->pb)) {
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
190 /* XXX: change that */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
191 filesize = url_fsize(s->pb);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
192 if (filesize > 128) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
193 url_fseek(s->pb, filesize - 128, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
194 ret = get_buffer(s->pb, buf, ID3v1_TAG_SIZE);
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
195 if (ret == ID3v1_TAG_SIZE) {
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
196 id3v1_parse_tag(s, buf);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
197 }
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
198 url_fseek(s->pb, 0, SEEK_SET);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
199 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
200 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
201
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
202 /* if ID3v2 header found, skip it */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
203 ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE);
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
204 if (ret != ID3v2_HEADER_SIZE)
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
205 return -1;
4221
55f448c99135 Factorise id3v2 header parsing from mp3.c to be shared
superdump
parents: 4206
diff changeset
206 if (ff_id3v2_match(buf)) {
2097
cab3fcb34077 id3v2 reader
benoit
parents: 2096
diff changeset
207 /* parse ID3v2 header */
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
208 len = ((buf[6] & 0x7f) << 21) |
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
209 ((buf[7] & 0x7f) << 14) |
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
210 ((buf[8] & 0x7f) << 7) |
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
211 (buf[9] & 0x7f);
5016
eb6dd7717805 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
diego
parents: 4900
diff changeset
212 ff_id3v2_parse(s, len, buf[3], buf[5]);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
213 } else {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
214 url_fseek(s->pb, 0, SEEK_SET);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
215 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
216
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
217 off = url_ftell(s->pb);
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
218 if (mp3_parse_vbr_tags(s, st, off) < 0)
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
219 url_fseek(s->pb, off, SEEK_SET);
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
220
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
221 /* the parameters will be extracted from the compressed bitstream */
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
222 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
223 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
224
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
225 #define MP3_PACKET_SIZE 1024
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
226
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
227 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
228 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
229 int ret, size;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
230 // AVStream *st = s->streams[0];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
231
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
232 size= MP3_PACKET_SIZE;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
233
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
234 ret= av_get_packet(s->pb, pkt, size);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
235
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
236 pkt->stream_index = 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
237 if (ret <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
238 return AVERROR(EIO);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
239 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
240 /* note: we need to modify the packet size here to handle the last
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
241 packet */
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
242 pkt->size = ret;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
243 return ret;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
244 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
245
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
246 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
247 static int id3v1_set_string(AVFormatContext *s, const char *key,
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
248 uint8_t *buf, int buf_size)
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
249 {
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
250 AVMetadataTag *tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
251 if ((tag = av_metadata_get(s->metadata, key, NULL, 0)))
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
252 strncpy(buf, tag->value, buf_size);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
253 return !!tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
254 }
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
255
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
256 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
257 {
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
258 AVMetadataTag *tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
259 int i, count = 0;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
260
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
261 memset(buf, 0, ID3v1_TAG_SIZE); /* fail safe */
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
262 buf[0] = 'T';
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
263 buf[1] = 'A';
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
264 buf[2] = 'G';
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
265 count += id3v1_set_string(s, "title", buf + 3, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
266 count += id3v1_set_string(s, "author", buf + 33, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
267 count += id3v1_set_string(s, "album", buf + 63, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
268 count += id3v1_set_string(s, "year", buf + 93, 4);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
269 count += id3v1_set_string(s, "comment", buf + 97, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
270 if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) {
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
271 buf[125] = 0;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
272 buf[126] = atoi(tag->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
273 count++;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
274 }
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
275 if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) {
4356
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
276 for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
5016
eb6dd7717805 Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
diego
parents: 4900
diff changeset
277 if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
4356
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
278 buf[127] = i;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
279 count++;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
280 break;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
281 }
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
282 }
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
283 }
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
284 return count;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
285 }
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
286
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
287 /* simple formats */
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
288
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
289 static void id3v2_put_size(AVFormatContext *s, int size)
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
290 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
291 put_byte(s->pb, size >> 21 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
292 put_byte(s->pb, size >> 14 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
293 put_byte(s->pb, size >> 7 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
294 put_byte(s->pb, size & 0x7f);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
295 }
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
296
3008
6eaceb561ae9 Another const found by -Wwrite-strings.
michael
parents: 2798
diff changeset
297 static void id3v2_put_ttag(AVFormatContext *s, const char *string, uint32_t tag)
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
298 {
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
299 int len = strlen(string);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
300 put_be32(s->pb, tag);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
301 id3v2_put_size(s, len + 1);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
302 put_be16(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
303 put_byte(s->pb, 3); /* UTF-8 */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
304 put_buffer(s->pb, string, len);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
305 }
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
306
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
307
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
308 /**
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
309 * Write an ID3v2.4 header at beginning of stream
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
310 */
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
311
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
312 static int mp3_write_header(struct AVFormatContext *s)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
313 {
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
314 AVMetadataTag *title, *author, *album, *genre, *copyright, *track, *year;
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
315 int totlen = 0;
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
316
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
317 title = av_metadata_get(s->metadata, "title", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
318 author = av_metadata_get(s->metadata, "author", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
319 album = av_metadata_get(s->metadata, "album", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
320 genre = av_metadata_get(s->metadata, "genre", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
321 copyright = av_metadata_get(s->metadata, "copyright", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
322 track = av_metadata_get(s->metadata, "track", NULL, 0);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
323 year = av_metadata_get(s->metadata, "year", NULL, 0);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
324
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
325 if(title) totlen += 11 + strlen(title->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
326 if(author) totlen += 11 + strlen(author->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
327 if(album) totlen += 11 + strlen(album->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
328 if(genre) totlen += 11 + strlen(genre->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
329 if(copyright) totlen += 11 + strlen(copyright->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
330 if(track) totlen += 11 + strlen(track->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
331 if(year) totlen += 11 + strlen(year->value);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
332 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
333 totlen += strlen(LIBAVFORMAT_IDENT) + 11;
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
334
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
335 if(totlen == 0)
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
336 return 0;
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
337
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
338 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
339 put_byte(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
340 put_byte(s->pb, 0); /* flags */
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
341
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
342 id3v2_put_size(s, totlen);
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
343
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
344 if(title) id3v2_put_ttag(s, title->value, MKBETAG('T', 'I', 'T', '2'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
345 if(author) id3v2_put_ttag(s, author->value, MKBETAG('T', 'P', 'E', '1'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
346 if(album) id3v2_put_ttag(s, album->value, MKBETAG('T', 'A', 'L', 'B'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
347 if(genre) id3v2_put_ttag(s, genre->value, MKBETAG('T', 'C', 'O', 'N'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
348 if(copyright) id3v2_put_ttag(s, copyright->value, MKBETAG('T', 'C', 'O', 'P'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
349 if(track) id3v2_put_ttag(s, track->value, MKBETAG('T', 'R', 'C', 'K'));
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
350 if(year) id3v2_put_ttag(s, year->value, MKBETAG('T', 'Y', 'E', 'R'));
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
351 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
352 id3v2_put_ttag(s, LIBAVFORMAT_IDENT, MKBETAG('T', 'E', 'N', 'C'));
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
353 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
354 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
355
468
60f897e8dd2d pass AVPacket into av_write_frame()
michael
parents: 307
diff changeset
356 static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt)
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
357 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
358 put_buffer(s->pb, pkt->data, pkt->size);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
359 put_flush_packet(s->pb);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
360 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
361 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
362
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
363 static int mp3_write_trailer(struct AVFormatContext *s)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
364 {
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
365 uint8_t buf[ID3v1_TAG_SIZE];
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
366
2096
85e48ffccf91 cosmetic v1/v2 renaming
benoit
parents: 2090
diff changeset
367 /* write the id3v1 tag */
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
368 if (id3v1_create_tag(s, buf) > 0) {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
369 put_buffer(s->pb, buf, ID3v1_TAG_SIZE);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
370 put_flush_packet(s->pb);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
371 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
372 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
373 }
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
374 #endif /* CONFIG_MP2_MUXER || CONFIG_MP3_MUXER */
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
375
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
376 #if CONFIG_MP3_DEMUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1107
diff changeset
377 AVInputFormat mp3_demuxer = {
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
378 "mp3",
4627
2119994c15ba Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents: 4383
diff changeset
379 NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
380 0,
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
381 mp3_read_probe,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
382 mp3_read_header,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
383 mp3_read_packet,
1756
5d72afc6c8aa better generic index building and seeking code
michael
parents: 1622
diff changeset
384 .flags= AVFMT_GENERIC_INDEX,
814
731af78f150d .m1v and .m2a (feature req #1178960)
michael
parents: 775
diff changeset
385 .extensions = "mp2,mp3,m2a", /* XXX: use probe */
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
386 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
387 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
388 #if CONFIG_MP2_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1107
diff changeset
389 AVOutputFormat mp2_muxer = {
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
390 "mp2",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3289
diff changeset
391 NULL_IF_CONFIG_SMALL("MPEG audio layer 2"),
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
392 "audio/x-mpeg",
814
731af78f150d .m1v and .m2a (feature req #1178960)
michael
parents: 775
diff changeset
393 "mp2,m2a",
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
394 0,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
395 CODEC_ID_MP2,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
396 CODEC_ID_NONE,
2306
d045cbcf37a3 do not write id3v2 header when writing .mp2 files
bcoudurier
parents: 2274
diff changeset
397 NULL,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
398 mp3_write_packet,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
399 mp3_write_trailer,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
400 };
1169
d18cc9a1fd02 allow individual selection of muxers and demuxers
mru
parents: 1167
diff changeset
401 #endif
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
402 #if CONFIG_MP3_MUXER
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1107
diff changeset
403 AVOutputFormat mp3_muxer = {
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
404 "mp3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3289
diff changeset
405 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
406 "audio/x-mpeg",
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
407 "mp3",
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
408 0,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
409 CODEC_ID_MP3,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
410 CODEC_ID_NONE,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
411 mp3_write_header,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
412 mp3_write_packet,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
413 mp3_write_trailer,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
414 };
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
415 #endif