Mercurial > libavformat.hg
annotate mp3.c @ 4900:d24b4e25db8d libavformat
Require 4 instead of 3 frames for detecting mp3,
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)
| author | michael |
|---|---|
| date | Wed, 22 Apr 2009 02:58:20 +0000 |
| parents | fbe515ed10fd |
| children | eb6dd7717805 |
| 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 | |
| 4354 | 170 static void id3v2_read_ttag(AVFormatContext *s, int taglen, const char *key) |
| 2097 | 171 { |
| 4354 | 172 char *q, dst[512]; |
|
4357
10e0d8797a43
simplify usage of dstlen as it is not a parameter anymore
aurel
parents:
4356
diff
changeset
|
173 int len, dstlen = sizeof(dst) - 1; |
| 4354 | 174 unsigned genre; |
| 2097 | 175 |
| 4358 | 176 dst[0]= 0; |
| 2097 | 177 if(taglen < 1) |
| 178 return; | |
| 179 | |
| 180 taglen--; /* account for encoding type byte */ | |
| 181 | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
182 switch(get_byte(s->pb)) { /* encoding type */ |
| 2097 | 183 |
| 184 case 0: /* ISO-8859-1 (0 - 255 maps directly into unicode) */ | |
| 185 q = dst; | |
| 186 while(taglen--) { | |
| 187 uint8_t tmp; | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
188 PUT_UTF8(get_byte(s->pb), tmp, if (q - dst < dstlen - 1) *q++ = tmp;) |
| 2097 | 189 } |
| 190 *q = '\0'; | |
| 191 break; | |
| 192 | |
| 193 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
|
194 len = FFMIN(taglen, dstlen-1); |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
195 get_buffer(s->pb, dst, len); |
| 2097 | 196 dst[len] = 0; |
| 197 break; | |
| 198 } | |
| 4354 | 199 |
| 200 if (!strcmp(key, "genre") | |
| 4787 | 201 && (sscanf(dst, "(%d)", &genre) == 1 || sscanf(dst, "%d", &genre) == 1) |
| 202 && genre <= ID3v1_GENRE_MAX) | |
| 4354 | 203 av_strlcpy(dst, id3v1_genre_str[genre], sizeof(dst)); |
| 204 | |
| 205 if (*dst) | |
| 206 av_metadata_set(&s->metadata, key, dst); | |
| 2097 | 207 } |
| 208 | |
| 209 /** | |
| 210 * ID3v2 parser | |
| 211 * | |
| 212 * Handles ID3v2.2, 2.3 and 2.4. | |
| 213 * | |
| 214 */ | |
| 215 | |
| 216 static void id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t flags) | |
| 217 { | |
| 218 int isv34, tlen; | |
| 219 uint32_t tag; | |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
220 int64_t next; |
| 2097 | 221 int taghdrlen; |
| 222 const char *reason; | |
| 223 | |
| 224 switch(version) { | |
| 225 case 2: | |
| 226 if(flags & 0x40) { | |
| 227 reason = "compression"; | |
| 228 goto error; | |
| 229 } | |
| 230 isv34 = 0; | |
| 231 taghdrlen = 6; | |
| 232 break; | |
| 233 | |
|
2231
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2222
diff
changeset
|
234 case 3: |
|
7ad682f38b9a
* Getting rid of the use of GCC language extensions
romansh
parents:
2222
diff
changeset
|
235 case 4: |
| 2097 | 236 isv34 = 1; |
| 237 taghdrlen = 10; | |
| 238 break; | |
| 239 | |
| 240 default: | |
| 241 reason = "version"; | |
| 242 goto error; | |
| 243 } | |
| 244 | |
| 245 if(flags & 0x80) { | |
| 246 reason = "unsynchronization"; | |
| 247 goto error; | |
| 248 } | |
| 249 | |
| 250 if(isv34 && flags & 0x40) /* Extended header present, just skip over it */ | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
251 url_fskip(s->pb, id3v2_get_size(s->pb, 4)); |
| 2097 | 252 |
| 253 while(len >= taghdrlen) { | |
| 254 if(isv34) { | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
255 tag = get_be32(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
256 tlen = id3v2_get_size(s->pb, 4); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
257 get_be16(s->pb); /* flags */ |
| 2097 | 258 } else { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
259 tag = get_be24(s->pb); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
260 tlen = id3v2_get_size(s->pb, 3); |
| 2097 | 261 } |
| 262 len -= taghdrlen + tlen; | |
| 263 | |
| 264 if(len < 0) | |
| 265 break; | |
| 266 | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
267 next = url_ftell(s->pb) + tlen; |
| 2097 | 268 |
| 269 switch(tag) { | |
| 270 case MKBETAG('T', 'I', 'T', '2'): | |
| 271 case MKBETAG(0, 'T', 'T', '2'): | |
| 4354 | 272 id3v2_read_ttag(s, tlen, "title"); |
| 2097 | 273 break; |
| 274 case MKBETAG('T', 'P', 'E', '1'): | |
| 275 case MKBETAG(0, 'T', 'P', '1'): | |
| 4354 | 276 id3v2_read_ttag(s, tlen, "author"); |
| 2097 | 277 break; |
| 278 case MKBETAG('T', 'A', 'L', 'B'): | |
| 279 case MKBETAG(0, 'T', 'A', 'L'): | |
| 4354 | 280 id3v2_read_ttag(s, tlen, "album"); |
| 2097 | 281 break; |
| 282 case MKBETAG('T', 'C', 'O', 'N'): | |
| 283 case MKBETAG(0, 'T', 'C', 'O'): | |
| 4354 | 284 id3v2_read_ttag(s, tlen, "genre"); |
| 2097 | 285 break; |
| 286 case MKBETAG('T', 'C', 'O', 'P'): | |
| 287 case MKBETAG(0, 'T', 'C', 'R'): | |
| 4354 | 288 id3v2_read_ttag(s, tlen, "copyright"); |
| 2097 | 289 break; |
| 290 case MKBETAG('T', 'R', 'C', 'K'): | |
| 291 case MKBETAG(0, 'T', 'R', 'K'): | |
| 4354 | 292 id3v2_read_ttag(s, tlen, "track"); |
| 2097 | 293 break; |
| 294 case 0: | |
| 295 /* padding, skip to end */ | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
296 url_fskip(s->pb, len); |
| 2097 | 297 len = 0; |
| 298 continue; | |
| 299 } | |
| 300 /* Skip to end of tag */ | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
301 url_fseek(s->pb, next, SEEK_SET); |
| 2097 | 302 } |
| 303 | |
| 304 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
|
305 url_fskip(s->pb, 10); |
| 2097 | 306 return; |
| 307 | |
| 308 error: | |
| 309 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
|
310 url_fskip(s->pb, len); |
| 2097 | 311 } |
| 312 | |
| 4354 | 313 static void id3v1_get_string(AVFormatContext *s, const char *key, |
| 2096 | 314 const uint8_t *buf, int buf_size) |
| 234 | 315 { |
| 316 int i, c; | |
| 4354 | 317 char *q, str[512]; |
| 234 | 318 |
| 319 q = str; | |
| 320 for(i = 0; i < buf_size; i++) { | |
| 321 c = buf[i]; | |
| 322 if (c == '\0') | |
| 323 break; | |
| 4354 | 324 if ((q - str) >= sizeof(str) - 1) |
| 234 | 325 break; |
| 326 *q++ = c; | |
| 327 } | |
| 328 *q = '\0'; | |
| 4354 | 329 |
| 330 if (*str) | |
| 331 av_metadata_set(&s->metadata, key, str); | |
| 234 | 332 } |
| 333 | |
| 2096 | 334 /* 'buf' must be ID3v1_TAG_SIZE byte long */ |
| 335 static int id3v1_parse_tag(AVFormatContext *s, const uint8_t *buf) | |
| 234 | 336 { |
| 337 char str[5]; | |
| 338 int genre; | |
| 885 | 339 |
| 234 | 340 if (!(buf[0] == 'T' && |
| 341 buf[1] == 'A' && | |
| 342 buf[2] == 'G')) | |
| 343 return -1; | |
| 4354 | 344 id3v1_get_string(s, "title", buf + 3, 30); |
| 345 id3v1_get_string(s, "author", buf + 33, 30); | |
| 346 id3v1_get_string(s, "album", buf + 63, 30); | |
| 347 id3v1_get_string(s, "year", buf + 93, 4); | |
| 348 id3v1_get_string(s, "comment", buf + 97, 30); | |
| 349 if (buf[125] == 0 && buf[126] != 0) { | |
| 350 snprintf(str, sizeof(str), "%d", buf[126]); | |
| 351 av_metadata_set(&s->metadata, "track", str); | |
| 352 } | |
| 234 | 353 genre = buf[127]; |
| 2096 | 354 if (genre <= ID3v1_GENRE_MAX) |
| 4354 | 355 av_metadata_set(&s->metadata, "genre", id3v1_genre_str[genre]); |
| 234 | 356 return 0; |
| 357 } | |
| 358 | |
| 359 /* mp3 read */ | |
| 1107 | 360 |
| 361 static int mp3_read_probe(AVProbeData *p) | |
| 362 { | |
|
2234
2bc002540a9b
kill uninitialised variable warning in mp3_read_probe()
mru
parents:
2231
diff
changeset
|
363 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
|
364 int fsize, frames, sample_rate; |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
365 uint32_t header; |
| 4254 | 366 uint8_t *buf, *buf0, *buf2, *end; |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
367 AVCodecContext avctx; |
| 1107 | 368 |
| 4254 | 369 buf0 = p->buf; |
| 370 if(ff_id3v2_match(buf0)) { | |
| 371 buf0 += ff_id3v2_tag_len(buf0); | |
| 372 } | |
| 1107 | 373 |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
374 max_frames = 0; |
| 4254 | 375 buf = buf0; |
|
4258
35c8abd32d93
Fix a read past end of buffer crash in the mp3 probe
alexc
parents:
4254
diff
changeset
|
376 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
|
377 |
| 2797 | 378 for(; buf < end; buf= buf2+1) { |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
379 buf2 = buf; |
| 1107 | 380 |
| 1312 | 381 for(frames = 0; buf2 < end; frames++) { |
| 2222 | 382 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
|
383 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
|
384 if(fsize < 0) |
|
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
385 break; |
|
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
386 buf2 += fsize; |
|
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
387 } |
|
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
388 max_frames = FFMAX(max_frames, frames); |
| 4254 | 389 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
|
390 first_frames= frames; |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
391 } |
|
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
|
392 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
|
393 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; |
| 4900 | 394 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
|
395 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
|
396 else if(max_frames>=1) return 1; |
|
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
397 else return 0; |
| 4900 | 398 //mpegps_mp3_unrecognized_format.mpg has max_frames=3 |
| 1107 | 399 } |
| 400 | |
|
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
401 /** |
|
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
402 * 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
|
403 */ |
|
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
404 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
|
405 { |
|
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
406 uint32_t v, spf; |
|
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
407 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
|
408 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; |
| 4274 | 409 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
|
410 int vbrtag_size = 0; |
|
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
411 |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
412 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
|
413 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
|
414 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
|
415 |
|
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
416 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
|
417 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
|
418 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
|
419 return -1; |
|
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
420 |
|
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
421 /* Check for Xing / Info tag */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
422 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
|
423 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
|
424 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
|
425 v = get_be32(s->pb); |
| 2664 | 426 if(v & 0x1) |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
427 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
|
428 } |
|
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
429 |
|
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
430 /* 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
|
431 url_fseek(s->pb, base + 4 + 32, SEEK_SET); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
432 v = get_be32(s->pb); |
|
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
433 if(v == MKBETAG('V', 'B', 'R', 'I')) { |
|
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
434 /* Check tag version */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
435 if(get_be16(s->pb) == 1) { |
|
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
436 /* skip delay, quality and total bytes */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
437 url_fseek(s->pb, 8, SEEK_CUR); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
438 frames = get_be32(s->pb); |
|
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
439 } |
|
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
440 } |
|
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
441 |
|
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
442 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
|
443 return -1; |
|
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
444 |
|
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
445 /* 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
|
446 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
|
447 |
|
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
448 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
|
449 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
|
450 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
|
451 return 0; |
|
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
452 } |
|
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
453 |
| 234 | 454 static int mp3_read_header(AVFormatContext *s, |
| 455 AVFormatParameters *ap) | |
| 456 { | |
| 457 AVStream *st; | |
| 2096 | 458 uint8_t buf[ID3v1_TAG_SIZE]; |
| 234 | 459 int len, ret, filesize; |
|
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
460 int64_t off; |
| 234 | 461 |
| 462 st = av_new_stream(s, 0); | |
| 463 if (!st) | |
|
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2234
diff
changeset
|
464 return AVERROR(ENOMEM); |
| 234 | 465 |
|
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
466 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
|
467 st->codec->codec_id = CODEC_ID_MP3; |
| 2023 | 468 st->need_parsing = AVSTREAM_PARSE_FULL; |
| 2622 | 469 st->start_time = 0; |
| 885 | 470 |
| 234 | 471 /* try to get the TAG */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
472 if (!url_is_streamed(s->pb)) { |
| 234 | 473 /* XXX: change that */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
474 filesize = url_fsize(s->pb); |
| 234 | 475 if (filesize > 128) { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
476 url_fseek(s->pb, filesize - 128, SEEK_SET); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
477 ret = get_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
| 2096 | 478 if (ret == ID3v1_TAG_SIZE) { |
| 479 id3v1_parse_tag(s, buf); | |
| 234 | 480 } |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
481 url_fseek(s->pb, 0, SEEK_SET); |
| 234 | 482 } |
| 483 } | |
| 484 | |
| 2096 | 485 /* if ID3v2 header found, skip it */ |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
486 ret = get_buffer(s->pb, buf, ID3v2_HEADER_SIZE); |
| 2096 | 487 if (ret != ID3v2_HEADER_SIZE) |
| 234 | 488 return -1; |
|
4221
55f448c99135
Factorise id3v2 header parsing from mp3.c to be shared
superdump
parents:
4206
diff
changeset
|
489 if (ff_id3v2_match(buf)) { |
| 2097 | 490 /* parse ID3v2 header */ |
| 234 | 491 len = ((buf[6] & 0x7f) << 21) | |
| 492 ((buf[7] & 0x7f) << 14) | | |
| 493 ((buf[8] & 0x7f) << 7) | | |
| 494 (buf[9] & 0x7f); | |
| 2097 | 495 id3v2_parse(s, len, buf[3], buf[5]); |
| 234 | 496 } else { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
497 url_fseek(s->pb, 0, SEEK_SET); |
| 234 | 498 } |
| 499 | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
500 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
|
501 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
|
502 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
|
503 |
| 234 | 504 /* the parameters will be extracted from the compressed bitstream */ |
| 505 return 0; | |
| 506 } | |
| 507 | |
| 508 #define MP3_PACKET_SIZE 1024 | |
| 509 | |
| 510 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) | |
| 511 { | |
| 512 int ret, size; | |
| 513 // AVStream *st = s->streams[0]; | |
| 885 | 514 |
| 234 | 515 size= MP3_PACKET_SIZE; |
| 516 | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
517 ret= av_get_packet(s->pb, pkt, size); |
| 234 | 518 |
| 519 pkt->stream_index = 0; | |
| 520 if (ret <= 0) { | |
|
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
521 return AVERROR(EIO); |
| 234 | 522 } |
| 523 /* note: we need to modify the packet size here to handle the last | |
| 524 packet */ | |
| 525 pkt->size = ret; | |
| 526 return ret; | |
| 527 } | |
| 528 | |
| 4206 | 529 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER |
| 4355 | 530 static int id3v1_set_string(AVFormatContext *s, const char *key, |
| 531 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
|
532 { |
| 4355 | 533 AVMetadataTag *tag; |
| 534 if ((tag = av_metadata_get(s->metadata, key, NULL, 0))) | |
| 535 strncpy(buf, tag->value, buf_size); | |
| 536 return !!tag; | |
| 537 } | |
| 538 | |
| 539 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf) | |
| 540 { | |
| 541 AVMetadataTag *tag; | |
| 542 int i, count = 0; | |
|
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
543 |
|
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
544 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
|
545 buf[0] = 'T'; |
|
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
546 buf[1] = 'A'; |
|
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
547 buf[2] = 'G'; |
| 4355 | 548 count += id3v1_set_string(s, "title", buf + 3, 30); |
| 549 count += id3v1_set_string(s, "author", buf + 33, 30); | |
| 550 count += id3v1_set_string(s, "album", buf + 63, 30); | |
| 551 count += id3v1_set_string(s, "year", buf + 93, 4); | |
| 552 count += id3v1_set_string(s, "comment", buf + 97, 30); | |
| 553 if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) { | |
| 554 buf[125] = 0; | |
| 555 buf[126] = atoi(tag->value); | |
| 556 count++; | |
|
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
557 } |
| 4355 | 558 if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) { |
| 4356 | 559 for(i = 0; i <= ID3v1_GENRE_MAX; i++) { |
| 560 if (!strcasecmp(tag->value, id3v1_genre_str[i])) { | |
| 561 buf[127] = i; | |
| 562 count++; | |
| 563 break; | |
| 564 } | |
|
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
565 } |
|
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
566 } |
| 4355 | 567 return count; |
|
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
568 } |
|
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
569 |
| 234 | 570 /* simple formats */ |
| 2098 | 571 |
| 572 static void id3v2_put_size(AVFormatContext *s, int size) | |
| 573 { | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
574 put_byte(s->pb, size >> 21 & 0x7f); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
575 put_byte(s->pb, size >> 14 & 0x7f); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
576 put_byte(s->pb, size >> 7 & 0x7f); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
577 put_byte(s->pb, size & 0x7f); |
| 2098 | 578 } |
| 579 | |
| 3008 | 580 static void id3v2_put_ttag(AVFormatContext *s, const char *string, uint32_t tag) |
| 2098 | 581 { |
| 582 int len = strlen(string); | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
583 put_be32(s->pb, tag); |
| 2098 | 584 id3v2_put_size(s, len + 1); |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
585 put_be16(s->pb, 0); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
586 put_byte(s->pb, 3); /* UTF-8 */ |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
587 put_buffer(s->pb, string, len); |
| 2098 | 588 } |
| 589 | |
| 590 | |
| 591 /** | |
| 592 * Write an ID3v2.4 header at beginning of stream | |
| 593 */ | |
| 594 | |
| 234 | 595 static int mp3_write_header(struct AVFormatContext *s) |
| 596 { | |
| 4355 | 597 AVMetadataTag *title, *author, *album, *genre, *copyright, *track, *year; |
| 2098 | 598 int totlen = 0; |
| 599 | |
| 4355 | 600 title = av_metadata_get(s->metadata, "title", NULL, 0); |
| 601 author = av_metadata_get(s->metadata, "author", NULL, 0); | |
| 602 album = av_metadata_get(s->metadata, "album", NULL, 0); | |
| 603 genre = av_metadata_get(s->metadata, "genre", NULL, 0); | |
| 604 copyright = av_metadata_get(s->metadata, "copyright", NULL, 0); | |
| 605 track = av_metadata_get(s->metadata, "track", NULL, 0); | |
| 606 year = av_metadata_get(s->metadata, "year", NULL, 0); | |
| 2098 | 607 |
| 4355 | 608 if(title) totlen += 11 + strlen(title->value); |
| 609 if(author) totlen += 11 + strlen(author->value); | |
| 610 if(album) totlen += 11 + strlen(album->value); | |
| 611 if(genre) totlen += 11 + strlen(genre->value); | |
| 612 if(copyright) totlen += 11 + strlen(copyright->value); | |
| 613 if(track) totlen += 11 + strlen(track->value); | |
| 614 if(year) totlen += 11 + strlen(year->value); | |
| 2098 | 615 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
| 616 totlen += strlen(LIBAVFORMAT_IDENT) + 11; | |
| 617 | |
| 618 if(totlen == 0) | |
| 619 return 0; | |
| 620 | |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
621 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */ |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
622 put_byte(s->pb, 0); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
623 put_byte(s->pb, 0); /* flags */ |
| 2098 | 624 |
| 625 id3v2_put_size(s, totlen); | |
| 626 | |
| 4355 | 627 if(title) id3v2_put_ttag(s, title->value, MKBETAG('T', 'I', 'T', '2')); |
| 628 if(author) id3v2_put_ttag(s, author->value, MKBETAG('T', 'P', 'E', '1')); | |
| 629 if(album) id3v2_put_ttag(s, album->value, MKBETAG('T', 'A', 'L', 'B')); | |
| 630 if(genre) id3v2_put_ttag(s, genre->value, MKBETAG('T', 'C', 'O', 'N')); | |
| 631 if(copyright) id3v2_put_ttag(s, copyright->value, MKBETAG('T', 'C', 'O', 'P')); | |
| 632 if(track) id3v2_put_ttag(s, track->value, MKBETAG('T', 'R', 'C', 'K')); | |
| 633 if(year) id3v2_put_ttag(s, year->value, MKBETAG('T', 'Y', 'E', 'R')); | |
| 2098 | 634 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
| 635 id3v2_put_ttag(s, LIBAVFORMAT_IDENT, MKBETAG('T', 'E', 'N', 'C')); | |
| 234 | 636 return 0; |
| 637 } | |
| 638 | |
| 468 | 639 static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
| 234 | 640 { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
641 put_buffer(s->pb, pkt->data, pkt->size); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
642 put_flush_packet(s->pb); |
| 234 | 643 return 0; |
| 644 } | |
| 645 | |
| 646 static int mp3_write_trailer(struct AVFormatContext *s) | |
| 647 { | |
| 2096 | 648 uint8_t buf[ID3v1_TAG_SIZE]; |
| 234 | 649 |
| 2096 | 650 /* write the id3v1 tag */ |
| 4355 | 651 if (id3v1_create_tag(s, buf) > 0) { |
|
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
652 put_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
|
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
653 put_flush_packet(s->pb); |
| 234 | 654 } |
| 655 return 0; | |
| 656 } | |
| 4206 | 657 #endif /* CONFIG_MP2_MUXER || CONFIG_MP3_MUXER */ |
| 234 | 658 |
| 4206 | 659 #if CONFIG_MP3_DEMUXER |
| 1167 | 660 AVInputFormat mp3_demuxer = { |
| 234 | 661 "mp3", |
|
4627
2119994c15ba
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
4383
diff
changeset
|
662 NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"), |
| 234 | 663 0, |
| 1107 | 664 mp3_read_probe, |
| 234 | 665 mp3_read_header, |
| 666 mp3_read_packet, | |
| 1756 | 667 .flags= AVFMT_GENERIC_INDEX, |
| 814 | 668 .extensions = "mp2,mp3,m2a", /* XXX: use probe */ |
| 234 | 669 }; |
| 1169 | 670 #endif |
| 4206 | 671 #if CONFIG_MP2_MUXER |
| 1167 | 672 AVOutputFormat mp2_muxer = { |
| 234 | 673 "mp2", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
674 NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), |
| 234 | 675 "audio/x-mpeg", |
| 814 | 676 "mp2,m2a", |
| 234 | 677 0, |
| 678 CODEC_ID_MP2, | |
| 3289 | 679 CODEC_ID_NONE, |
|
2306
d045cbcf37a3
do not write id3v2 header when writing .mp2 files
bcoudurier
parents:
2274
diff
changeset
|
680 NULL, |
| 234 | 681 mp3_write_packet, |
| 682 mp3_write_trailer, | |
| 683 }; | |
| 1169 | 684 #endif |
| 4206 | 685 #if CONFIG_MP3_MUXER |
| 1167 | 686 AVOutputFormat mp3_muxer = { |
| 234 | 687 "mp3", |
|
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
688 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"), |
| 234 | 689 "audio/x-mpeg", |
| 690 "mp3", | |
| 691 0, | |
| 692 CODEC_ID_MP3, | |
| 3289 | 693 CODEC_ID_NONE, |
| 234 | 694 mp3_write_header, |
| 695 mp3_write_packet, | |
| 696 mp3_write_trailer, | |
| 697 }; | |
| 698 #endif |
