Mercurial > libavformat.hg
annotate mp3.c @ 4281:f1d8951d6813 libavformat
Skip m= blocks in the SDP if the media type is unknown. This prevents
subsequent a= lines from the m= block to be applied to the previous
m= line, thus breaking otherwise functional RTP streams. See discussion in
[PATCH] RTSP-MS 7/15: parse and allow unknown m= line codes" thread on
mailinglist.
author | rbultje |
---|---|
date | Sat, 24 Jan 2009 04:56:18 +0000 |
parents | 39f62ce83e5a |
children | faf0db68fcda |
rev | line source |
---|---|
885 | 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 | 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 | 8 * modify it under the terms of the GNU Lesser General Public |
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 | 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 | 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
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 | 20 */ |
3286 | 21 |
3714 | 22 #include <strings.h> |
3286 | 23 #include "libavutil/avstring.h" |
24 #include "libavcodec/mpegaudio.h" | |
25 #include "libavcodec/mpegaudiodecheader.h" | |
234 | 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" |
234 | 28 |
2096 | 29 #define ID3v1_TAG_SIZE 128 |
234 | 30 |
2096 | 31 #define ID3v1_GENRE_MAX 125 |
234 | 32 |
3761
3a874c41adaf
Make the id3v1_genre_str array const, not just the strings it points to.
reimar
parents:
3714
diff
changeset
|
33 static const char * const id3v1_genre_str[ID3v1_GENRE_MAX + 1] = { |
234 | 34 [0] = "Blues", |
35 [1] = "Classic Rock", | |
36 [2] = "Country", | |
37 [3] = "Dance", | |
38 [4] = "Disco", | |
39 [5] = "Funk", | |
40 [6] = "Grunge", | |
41 [7] = "Hip-Hop", | |
42 [8] = "Jazz", | |
43 [9] = "Metal", | |
44 [10] = "New Age", | |
45 [11] = "Oldies", | |
46 [12] = "Other", | |
47 [13] = "Pop", | |
48 [14] = "R&B", | |
49 [15] = "Rap", | |
50 [16] = "Reggae", | |
51 [17] = "Rock", | |
52 [18] = "Techno", | |
53 [19] = "Industrial", | |
54 [20] = "Alternative", | |
55 [21] = "Ska", | |
56 [22] = "Death Metal", | |
57 [23] = "Pranks", | |
58 [24] = "Soundtrack", | |
59 [25] = "Euro-Techno", | |
60 [26] = "Ambient", | |
61 [27] = "Trip-Hop", | |
62 [28] = "Vocal", | |
63 [29] = "Jazz+Funk", | |
64 [30] = "Fusion", | |
65 [31] = "Trance", | |
66 [32] = "Classical", | |
67 [33] = "Instrumental", | |
68 [34] = "Acid", | |
69 [35] = "House", | |
70 [36] = "Game", | |
71 [37] = "Sound Clip", | |
72 [38] = "Gospel", | |
73 [39] = "Noise", | |
74 [40] = "AlternRock", | |
75 [41] = "Bass", | |
76 [42] = "Soul", | |
77 [43] = "Punk", | |
78 [44] = "Space", | |
79 [45] = "Meditative", | |
80 [46] = "Instrumental Pop", | |
81 [47] = "Instrumental Rock", | |
82 [48] = "Ethnic", | |
83 [49] = "Gothic", | |
84 [50] = "Darkwave", | |
85 [51] = "Techno-Industrial", | |
86 [52] = "Electronic", | |
87 [53] = "Pop-Folk", | |
88 [54] = "Eurodance", | |
89 [55] = "Dream", | |
90 [56] = "Southern Rock", | |
91 [57] = "Comedy", | |
92 [58] = "Cult", | |
93 [59] = "Gangsta", | |
94 [60] = "Top 40", | |
95 [61] = "Christian Rap", | |
96 [62] = "Pop/Funk", | |
97 [63] = "Jungle", | |
98 [64] = "Native American", | |
99 [65] = "Cabaret", | |
100 [66] = "New Wave", | |
101 [67] = "Psychadelic", | |
102 [68] = "Rave", | |
103 [69] = "Showtunes", | |
104 [70] = "Trailer", | |
105 [71] = "Lo-Fi", | |
106 [72] = "Tribal", | |
107 [73] = "Acid Punk", | |
108 [74] = "Acid Jazz", | |
109 [75] = "Polka", | |
110 [76] = "Retro", | |
111 [77] = "Musical", | |
112 [78] = "Rock & Roll", | |
113 [79] = "Hard Rock", | |
114 [80] = "Folk", | |
115 [81] = "Folk-Rock", | |
116 [82] = "National Folk", | |
117 [83] = "Swing", | |
118 [84] = "Fast Fusion", | |
119 [85] = "Bebob", | |
120 [86] = "Latin", | |
121 [87] = "Revival", | |
122 [88] = "Celtic", | |
123 [89] = "Bluegrass", | |
124 [90] = "Avantgarde", | |
125 [91] = "Gothic Rock", | |
126 [92] = "Progressive Rock", | |
127 [93] = "Psychedelic Rock", | |
128 [94] = "Symphonic Rock", | |
129 [95] = "Slow Rock", | |
130 [96] = "Big Band", | |
131 [97] = "Chorus", | |
132 [98] = "Easy Listening", | |
133 [99] = "Acoustic", | |
134 [100] = "Humour", | |
135 [101] = "Speech", | |
136 [102] = "Chanson", | |
137 [103] = "Opera", | |
138 [104] = "Chamber Music", | |
139 [105] = "Sonata", | |
140 [106] = "Symphony", | |
141 [107] = "Booty Bass", | |
142 [108] = "Primus", | |
143 [109] = "Porn Groove", | |
144 [110] = "Satire", | |
145 [111] = "Slow Jam", | |
146 [112] = "Club", | |
147 [113] = "Tango", | |
148 [114] = "Samba", | |
149 [115] = "Folklore", | |
150 [116] = "Ballad", | |
151 [117] = "Power Ballad", | |
152 [118] = "Rhythmic Soul", | |
153 [119] = "Freestyle", | |
154 [120] = "Duet", | |
155 [121] = "Punk Rock", | |
156 [122] = "Drum Solo", | |
157 [123] = "A capella", | |
158 [124] = "Euro-House", | |
159 [125] = "Dance Hall", | |
160 }; | |
161 | |
2097 | 162 static unsigned int id3v2_get_size(ByteIOContext *s, int len) |
163 { | |
164 int v=0; | |
165 while(len--) | |
166 v= (v<<7) + (get_byte(s)&0x7F); | |
167 return v; | |
168 } | |
169 | |
170 static void id3v2_read_ttag(AVFormatContext *s, int taglen, char *dst, int dstlen) | |
171 { | |
172 char *q; | |
173 int len; | |
174 | |
3539
4dee13c8073a
All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
michael
parents:
3484
diff
changeset
|
175 if(dstlen > 0) |
4dee13c8073a
All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
michael
parents:
3484
diff
changeset
|
176 dst[0]= 0; |
2097 | 177 if(taglen < 1) |
178 return; | |
179 | |
180 taglen--; /* account for encoding type byte */ | |
181 dstlen--; /* Leave space for zero terminator */ | |
182 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
183 switch(get_byte(s->pb)) { /* encoding type */ |
2097 | 184 |
185 case 0: /* ISO-8859-1 (0 - 255 maps directly into unicode) */ | |
186 q = dst; | |
187 while(taglen--) { | |
188 uint8_t tmp; | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
189 PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;) |
2097 | 190 } |
191 *q = '\0'; | |
192 break; | |
193 | |
194 case 3: /* UTF-8 */ | |
3540
3dfb35d2ac51
All mp3 parsers are buggy fix 2 of n (out of array write, i suspect not exploitable)
michael
parents:
3539
diff
changeset
|
195 len = FFMIN(taglen, dstlen-1); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
196 get_buffer(s->pb, dst, len); |
2097 | 197 dst[len] = 0; |
198 break; | |
199 } | |
200 } | |
201 | |
202 /** | |
203 * ID3v2 parser | |
204 * | |
205 * Handles ID3v2.2, 2.3 and 2.4. | |
206 * | |
207 */ | |
208 | |
209 static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) | |
210 { | |
211 int isv34, tlen; | |
212 uint32_t tag; | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
213 int64_t next; |
2097 | 214 char tmp[16]; |
215 int taghdrlen; | |
216 const char *reason; | |
217 | |
218 switch(version) { | |
219 case 2: | |
220 if(flags & 0x40) { | |
221 reason = "compression"; | |
222 goto error; | |
223 } | |
224 isv34 = 0; | |
225 taghdrlen = 6; | |
226 break; | |
227 | |
2231
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2222
diff
changeset
|
228 case 3: |
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2222
diff
changeset
|
229 case 4: |
2097 | 230 isv34 = 1; |
231 taghdrlen = 10; | |
232 break; | |
233 | |
234 default: | |
235 reason = "version"; | |
236 goto error; | |
237 } | |
238 | |
239 if(flags & 0x80) { | |
240 reason = "unsynchronization"; | |
241 goto error; | |
242 } | |
243 | |
244 if(isv34 && flags & 0x40) /* Extended header present, just skip over it */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
245 url_fskip(s->pb, id3v2_get_size(s->pb, 4)); |
2097 | 246 |
247 while(len >= taghdrlen) { | |
248 if(isv34) { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
249 tag = get_be32(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
250 tlen = id3v2_get_size(s->pb, 4); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
251 get_be16(s->pb); /* flags */ |
2097 | 252 } else { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
253 tag = get_be24(s->pb); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
254 tlen = id3v2_get_size(s->pb, 3); |
2097 | 255 } |
256 len -= taghdrlen + tlen; | |
257 | |
258 if(len < 0) | |
259 break; | |
260 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
261 next = url_ftell(s->pb) + tlen; |
2097 | 262 |
263 switch(tag) { | |
264 case MKBETAG('T', 'I', 'T', '2'): | |
265 case MKBETAG(0, 'T', 'T', '2'): | |
266 id3v2_read_ttag(s, tlen, s->title, sizeof(s->title)); | |
267 break; | |
268 case MKBETAG('T', 'P', 'E', '1'): | |
269 case MKBETAG(0, 'T', 'P', '1'): | |
270 id3v2_read_ttag(s, tlen, s->author, sizeof(s->author)); | |
271 break; | |
272 case MKBETAG('T', 'A', 'L', 'B'): | |
273 case MKBETAG(0, 'T', 'A', 'L'): | |
274 id3v2_read_ttag(s, tlen, s->album, sizeof(s->album)); | |
275 break; | |
276 case MKBETAG('T', 'C', 'O', 'N'): | |
277 case MKBETAG(0, 'T', 'C', 'O'): | |
278 id3v2_read_ttag(s, tlen, s->genre, sizeof(s->genre)); | |
279 break; | |
280 case MKBETAG('T', 'C', 'O', 'P'): | |
281 case MKBETAG(0, 'T', 'C', 'R'): | |
282 id3v2_read_ttag(s, tlen, s->copyright, sizeof(s->copyright)); | |
283 break; | |
284 case MKBETAG('T', 'R', 'C', 'K'): | |
285 case MKBETAG(0, 'T', 'R', 'K'): | |
286 id3v2_read_ttag(s, tlen, tmp, sizeof(tmp)); | |
287 s->track = atoi(tmp); | |
288 break; | |
289 case 0: | |
290 /* padding, skip to end */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
291 url_fskip(s->pb, len); |
2097 | 292 len = 0; |
293 continue; | |
294 } | |
295 /* Skip to end of tag */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
296 url_fseek(s->pb, next, SEEK_SET); |
2097 | 297 } |
298 | |
299 if(version == 4 && flags & 0x10) /* Footer preset, always 10 bytes, skip over it */ | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
300 url_fskip(s->pb, 10); |
2097 | 301 return; |
302 | |
303 error: | |
304 av_log(s, AV_LOG_INFO, "ID3v2.%d tag skipped, cannot handle %s\n", version, reason); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
305 url_fskip(s->pb, len); |
2097 | 306 } |
307 | |
2096 | 308 static void id3v1_get_string(char *str, int str_size, |
309 const uint8_t *buf, int buf_size) | |
234 | 310 { |
311 int i, c; | |
312 char *q; | |
313 | |
314 q = str; | |
315 for(i = 0; i < buf_size; i++) { | |
316 c = buf[i]; | |
317 if (c == '\0') | |
318 break; | |
319 if ((q - str) >= str_size - 1) | |
320 break; | |
321 *q++ = c; | |
322 } | |
323 *q = '\0'; | |
324 } | |
325 | |
2096 | 326 /* 'buf' must be ID3v1_TAG_SIZE byte long */ |
327 static int id3v1_parse_tag(AVFormatContext *s, const uint8_t *buf) | |
234 | 328 { |
329 char str[5]; | |
330 int genre; | |
885 | 331 |
234 | 332 if (!(buf[0] == 'T' && |
333 buf[1] == 'A' && | |
334 buf[2] == 'G')) | |
335 return -1; | |
2096 | 336 id3v1_get_string(s->title, sizeof(s->title), buf + 3, 30); |
337 id3v1_get_string(s->author, sizeof(s->author), buf + 33, 30); | |
338 id3v1_get_string(s->album, sizeof(s->album), buf + 63, 30); | |
339 id3v1_get_string(str, sizeof(str), buf + 93, 4); | |
234 | 340 s->year = atoi(str); |
2096 | 341 id3v1_get_string(s->comment, sizeof(s->comment), buf + 97, 30); |
234 | 342 if (buf[125] == 0 && buf[126] != 0) |
343 s->track = buf[126]; | |
344 genre = buf[127]; | |
2096 | 345 if (genre <= ID3v1_GENRE_MAX) |
2189 | 346 av_strlcpy(s->genre, id3v1_genre_str[genre], sizeof(s->genre)); |
234 | 347 return 0; |
348 } | |
349 | |
350 /* mp3 read */ | |
1107 | 351 |
352 static int mp3_read_probe(AVProbeData *p) | |
353 { | |
2234
2bc002540a9b
kill uninitialised variable warning in mp3_read_probe()
mru
parents:
2231
diff
changeset
|
354 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
|
355 int fsize, frames, sample_rate; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
356 uint32_t header; |
4254 | 357 uint8_t *buf, *buf0, *buf2, *end; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
358 AVCodecContext avctx; |
1107 | 359 |
4254 | 360 buf0 = p->buf; |
361 if(ff_id3v2_match(buf0)) { | |
362 buf0 += ff_id3v2_tag_len(buf0); | |
363 } | |
1107 | 364 |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
365 max_frames = 0; |
4254 | 366 buf = buf0; |
4258
35c8abd32d93
Fix a read past end of buffer crash in the mp3 probe
alexc
parents:
4254
diff
changeset
|
367 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
|
368 |
2797 | 369 for(; buf < end; buf= buf2+1) { |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
370 buf2 = buf; |
1107 | 371 |
1312 | 372 for(frames = 0; buf2 < end; frames++) { |
2222 | 373 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
|
374 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
|
375 if(fsize < 0) |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
376 break; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
377 buf2 += fsize; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
378 } |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
379 max_frames = FFMAX(max_frames, frames); |
4254 | 380 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
|
381 first_frames= frames; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
382 } |
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
|
383 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
|
384 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; |
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
|
385 else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; |
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
|
386 else if(max_frames>=1) return 1; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
387 else return 0; |
1107 | 388 } |
389 | |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
390 /** |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
391 * 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
|
392 */ |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
393 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
|
394 { |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
395 uint32_t v, spf; |
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
396 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
|
397 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; |
4274 | 398 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
|
399 int vbrtag_size = 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
400 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
401 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
|
402 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
|
403 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
|
404 |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
405 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
|
406 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
|
407 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
|
408 return -1; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
409 |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
410 /* Check for Xing / Info tag */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
411 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
|
412 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
|
413 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
|
414 v = get_be32(s->pb); |
2664 | 415 if(v & 0x1) |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
416 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
|
417 } |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
418 |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
419 /* 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
|
420 url_fseek(s->pb, base + 4 + 32, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
421 v = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
422 if(v == MKBETAG('V', 'B', 'R', 'I')) { |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
423 /* Check tag version */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
424 if(get_be16(s->pb) == 1) { |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
425 /* skip delay, quality and total bytes */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
426 url_fseek(s->pb, 8, SEEK_CUR); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
427 frames = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
428 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
429 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
430 |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
431 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
|
432 return -1; |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
433 |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
434 /* 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
|
435 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
|
436 |
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
437 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
|
438 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
|
439 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
|
440 return 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
441 } |
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
442 |
234 | 443 static int mp3_read_header(AVFormatContext *s, |
444 AVFormatParameters *ap) | |
445 { | |
446 AVStream *st; | |
2096 | 447 uint8_t buf[ID3v1_TAG_SIZE]; |
234 | 448 int len, ret, filesize; |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
449 int64_t off; |
234 | 450 |
451 st = av_new_stream(s, 0); | |
452 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2234
diff
changeset
|
453 return AVERROR(ENOMEM); |
234 | 454 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
455 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
|
456 st->codec->codec_id = CODEC_ID_MP3; |
2023 | 457 st->need_parsing = AVSTREAM_PARSE_FULL; |
2622 | 458 st->start_time = 0; |
885 | 459 |
234 | 460 /* try to get the TAG */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
461 if (!url_is_streamed(s->pb)) { |
234 | 462 /* XXX: change that */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
463 filesize = url_fsize(s->pb); |
234 | 464 if (filesize > 128) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
465 url_fseek(s->pb, filesize - 128, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
466 ret = get_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
2096 | 467 if (ret == ID3v1_TAG_SIZE) { |
468 id3v1_parse_tag(s, buf); | |
234 | 469 } |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
470 url_fseek(s->pb, 0, SEEK_SET); |
234 | 471 } |
472 } | |
473 | |
2096 | 474 /* if ID3v2 header found, skip it */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
475 ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE); |
2096 | 476 if (ret != ID3v2_HEADER_SIZE) |
234 | 477 return -1; |
4221
55f448c99135
Factorise id3v2 header parsing from mp3.c to be shared
superdump
parents:
4206
diff
changeset
|
478 if (ff_id3v2_match(buf)) { |
2097 | 479 /* parse ID3v2 header */ |
234 | 480 len = ((buf[6] & 0x7f) << 21) | |
481 ((buf[7] & 0x7f) << 14) | | |
482 ((buf[8] & 0x7f) << 7) | | |
483 (buf[9] & 0x7f); | |
2097 | 484 id3v2_parse(s, len, buf[3], buf[5]); |
234 | 485 } else { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
486 url_fseek(s->pb, 0, SEEK_SET); |
234 | 487 } |
488 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
489 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
|
490 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
|
491 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
|
492 |
234 | 493 /* the parameters will be extracted from the compressed bitstream */ |
494 return 0; | |
495 } | |
496 | |
497 #define MP3_PACKET_SIZE 1024 | |
498 | |
499 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) | |
500 { | |
501 int ret, size; | |
502 // AVStream *st = s->streams[0]; | |
885 | 503 |
234 | 504 size= MP3_PACKET_SIZE; |
505 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
506 ret= av_get_packet(s->pb, pkt, size); |
234 | 507 |
508 pkt->stream_index = 0; | |
509 if (ret <= 0) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
510 return AVERROR(EIO); |
234 | 511 } |
512 /* note: we need to modify the packet size here to handle the last | |
513 packet */ | |
514 pkt->size = ret; | |
515 return ret; | |
516 } | |
517 | |
4206 | 518 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
519 static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf) |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
520 { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
521 int v, i; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
522 |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
523 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
|
524 buf[0] = 'T'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
525 buf[1] = 'A'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
526 buf[2] = 'G'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
527 strncpy(buf + 3, s->title, 30); |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
528 strncpy(buf + 33, s->author, 30); |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
529 strncpy(buf + 63, s->album, 30); |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
530 v = s->year; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
531 if (v > 0) { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
532 for(i = 0;i < 4; i++) { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
533 buf[96 - i] = '0' + (v % 10); |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
534 v = v / 10; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
535 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
536 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
537 strncpy(buf + 97, s->comment, 30); |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
538 if (s->track != 0) { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
539 buf[125] = 0; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
540 buf[126] = s->track; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
541 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
542 for(i = 0; i <= ID3v1_GENRE_MAX; i++) { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
543 if (!strcasecmp(s->genre, id3v1_genre_str[i])) { |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
544 buf[127] = i; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
545 break; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
546 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
547 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
548 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
549 |
234 | 550 /* simple formats */ |
2098 | 551 |
552 static void id3v2_put_size(AVFormatContext *s, int size) | |
553 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
554 put_byte(s->pb, size >> 21 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
555 put_byte(s->pb, size >> 14 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
556 put_byte(s->pb, size >> 7 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
557 put_byte(s->pb, size & 0x7f); |
2098 | 558 } |
559 | |
3008 | 560 static void id3v2_put_ttag(AVFormatContext *s, const char *string, uint32_t tag) |
2098 | 561 { |
562 int len = strlen(string); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
563 put_be32(s->pb, tag); |
2098 | 564 id3v2_put_size(s, len + 1); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
565 put_be16(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
566 put_byte(s->pb, 3); /* UTF-8 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
567 put_buffer(s->pb, string, len); |
2098 | 568 } |
569 | |
570 | |
571 /** | |
572 * Write an ID3v2.4 header at beginning of stream | |
573 */ | |
574 | |
234 | 575 static int mp3_write_header(struct AVFormatContext *s) |
576 { | |
2098 | 577 int totlen = 0; |
578 char tracktxt[10]; | |
2735 | 579 char yeartxt[10]; |
2098 | 580 |
581 if(s->track) | |
2746 | 582 snprintf(tracktxt, sizeof(tracktxt), "%d", s->track); |
2735 | 583 if(s->year) |
2746 | 584 snprintf( yeartxt, sizeof(yeartxt) , "%d", s->year ); |
2098 | 585 |
586 if(s->title[0]) totlen += 11 + strlen(s->title); | |
587 if(s->author[0]) totlen += 11 + strlen(s->author); | |
588 if(s->album[0]) totlen += 11 + strlen(s->album); | |
589 if(s->genre[0]) totlen += 11 + strlen(s->genre); | |
590 if(s->copyright[0]) totlen += 11 + strlen(s->copyright); | |
591 if(s->track) totlen += 11 + strlen(tracktxt); | |
2735 | 592 if(s->year) totlen += 11 + strlen(yeartxt); |
2098 | 593 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
594 totlen += strlen(LIBAVFORMAT_IDENT) + 11; | |
595 | |
596 if(totlen == 0) | |
597 return 0; | |
598 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
599 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
600 put_byte(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
601 put_byte(s->pb, 0); /* flags */ |
2098 | 602 |
603 id3v2_put_size(s, totlen); | |
604 | |
605 if(s->title[0]) id3v2_put_ttag(s, s->title, MKBETAG('T', 'I', 'T', '2')); | |
606 if(s->author[0]) id3v2_put_ttag(s, s->author, MKBETAG('T', 'P', 'E', '1')); | |
607 if(s->album[0]) id3v2_put_ttag(s, s->album, MKBETAG('T', 'A', 'L', 'B')); | |
608 if(s->genre[0]) id3v2_put_ttag(s, s->genre, MKBETAG('T', 'C', 'O', 'N')); | |
609 if(s->copyright[0]) id3v2_put_ttag(s, s->copyright, MKBETAG('T', 'C', 'O', 'P')); | |
610 if(s->track) id3v2_put_ttag(s, tracktxt, MKBETAG('T', 'R', 'C', 'K')); | |
2735 | 611 if(s->year) id3v2_put_ttag(s, yeartxt, MKBETAG('T', 'Y', 'E', 'R')); |
2098 | 612 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
613 id3v2_put_ttag(s, LIBAVFORMAT_IDENT, MKBETAG('T', 'E', 'N', 'C')); | |
234 | 614 return 0; |
615 } | |
616 | |
468 | 617 static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
234 | 618 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
619 put_buffer(s->pb, pkt->data, pkt->size); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
620 put_flush_packet(s->pb); |
234 | 621 return 0; |
622 } | |
623 | |
624 static int mp3_write_trailer(struct AVFormatContext *s) | |
625 { | |
2096 | 626 uint8_t buf[ID3v1_TAG_SIZE]; |
234 | 627 |
2096 | 628 /* write the id3v1 tag */ |
234 | 629 if (s->title[0] != '\0') { |
2096 | 630 id3v1_create_tag(s, buf); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
631 put_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
632 put_flush_packet(s->pb); |
234 | 633 } |
634 return 0; | |
635 } | |
4206 | 636 #endif /* CONFIG_MP2_MUXER || CONFIG_MP3_MUXER */ |
234 | 637 |
4206 | 638 #if CONFIG_MP3_DEMUXER |
1167 | 639 AVInputFormat mp3_demuxer = { |
234 | 640 "mp3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
641 NULL_IF_CONFIG_SMALL("MPEG audio"), |
234 | 642 0, |
1107 | 643 mp3_read_probe, |
234 | 644 mp3_read_header, |
645 mp3_read_packet, | |
1756 | 646 .flags= AVFMT_GENERIC_INDEX, |
814 | 647 .extensions = "mp2,mp3,m2a", /* XXX: use probe */ |
234 | 648 }; |
1169 | 649 #endif |
4206 | 650 #if CONFIG_MP2_MUXER |
1167 | 651 AVOutputFormat mp2_muxer = { |
234 | 652 "mp2", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
653 NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), |
234 | 654 "audio/x-mpeg", |
4206 | 655 #if CONFIG_LIBMP3LAME |
814 | 656 "mp2,m2a", |
234 | 657 #else |
814 | 658 "mp2,mp3,m2a", |
234 | 659 #endif |
660 0, | |
661 CODEC_ID_MP2, | |
3289 | 662 CODEC_ID_NONE, |
2306
d045cbcf37a3
do not write id3v2 header when writing .mp2 files
bcoudurier
parents:
2274
diff
changeset
|
663 NULL, |
234 | 664 mp3_write_packet, |
665 mp3_write_trailer, | |
666 }; | |
1169 | 667 #endif |
4206 | 668 #if CONFIG_MP3_MUXER |
1167 | 669 AVOutputFormat mp3_muxer = { |
234 | 670 "mp3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
671 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"), |
234 | 672 "audio/x-mpeg", |
673 "mp3", | |
674 0, | |
675 CODEC_ID_MP3, | |
3289 | 676 CODEC_ID_NONE, |
234 | 677 mp3_write_header, |
678 mp3_write_packet, | |
679 mp3_write_trailer, | |
680 }; | |
681 #endif |