Mercurial > libavformat.hg
annotate mp3.c @ 5076:e07fb352a12c libavformat
id3v2.4.0 uses syncsafe integers for sizes of frames.
Fixes issue1234
Fixes regression introduced in r19275
author | michael |
---|---|
date | Mon, 29 Jun 2009 18:36:49 +0000 |
parents | 9ed3c88ed9ba |
children | cbaefd9135ac |
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" |
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 | 29 |
234 | 30 /* mp3 read */ |
1107 | 31 |
32 static int mp3_read_probe(AVProbeData *p) | |
33 { | |
2234
2bc002540a9b
kill uninitialised variable warning in mp3_read_probe()
mru
parents:
2231
diff
changeset
|
34 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
|
35 int fsize, frames, sample_rate; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
36 uint32_t header; |
4254 | 37 uint8_t *buf, *buf0, *buf2, *end; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
38 AVCodecContext avctx; |
1107 | 39 |
4254 | 40 buf0 = p->buf; |
41 if(ff_id3v2_match(buf0)) { | |
42 buf0 += ff_id3v2_tag_len(buf0); | |
43 } | |
1107 | 44 |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
45 max_frames = 0; |
4254 | 46 buf = buf0; |
4258
35c8abd32d93
Fix a read past end of buffer crash in the mp3 probe
alexc
parents:
4254
diff
changeset
|
47 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
|
48 |
2797 | 49 for(; buf < end; buf= buf2+1) { |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
50 buf2 = buf; |
1107 | 51 |
1312 | 52 for(frames = 0; buf2 < end; frames++) { |
2222 | 53 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
|
54 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
|
55 if(fsize < 0) |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
56 break; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
57 buf2 += fsize; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
58 } |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
59 max_frames = FFMAX(max_frames, frames); |
4254 | 60 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
|
61 first_frames= frames; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
62 } |
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
|
63 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
|
64 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; |
4900 | 65 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
|
66 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
|
67 else if(max_frames>=1) return 1; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
68 else return 0; |
4900 | 69 //mpegps_mp3_unrecognized_format.mpg has max_frames=3 |
1107 | 70 } |
71 | |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
72 /** |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
73 * 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
|
74 */ |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
75 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
|
76 { |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
77 uint32_t v, spf; |
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
78 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
|
79 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; |
4274 | 80 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
|
81 int vbrtag_size = 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
82 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
83 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
|
84 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
|
85 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
|
86 |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
87 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
|
88 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
|
89 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
|
90 return -1; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
91 |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
92 /* Check for Xing / Info tag */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
93 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
|
94 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
|
95 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
|
96 v = get_be32(s->pb); |
2664 | 97 if(v & 0x1) |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
98 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
|
99 } |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
100 |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
101 /* 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
|
102 url_fseek(s->pb, base + 4 + 32, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
103 v = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
104 if(v == MKBETAG('V', 'B', 'R', 'I')) { |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
105 /* Check tag version */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
106 if(get_be16(s->pb) == 1) { |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
107 /* skip delay, quality and total bytes */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
108 url_fseek(s->pb, 8, SEEK_CUR); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
109 frames = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
110 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
111 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
112 |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
113 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
|
114 return -1; |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
115 |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
116 /* 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
|
117 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
|
118 |
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
119 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
|
120 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
|
121 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
|
122 return 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
123 } |
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
124 |
234 | 125 static int mp3_read_header(AVFormatContext *s, |
126 AVFormatParameters *ap) | |
127 { | |
128 AVStream *st; | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
129 int64_t off; |
234 | 130 |
131 st = av_new_stream(s, 0); | |
132 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2234
diff
changeset
|
133 return AVERROR(ENOMEM); |
234 | 134 |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
135 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
|
136 st->codec->codec_id = CODEC_ID_MP3; |
2023 | 137 st->need_parsing = AVSTREAM_PARSE_FULL; |
2622 | 138 st->start_time = 0; |
885 | 139 |
5045
9ed3c88ed9ba
Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
diego
parents:
5016
diff
changeset
|
140 ff_id3v1_read(s); |
9ed3c88ed9ba
Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
diego
parents:
5016
diff
changeset
|
141 ff_id3v2_read(s); |
234 | 142 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
143 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
|
144 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
|
145 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
|
146 |
234 | 147 /* the parameters will be extracted from the compressed bitstream */ |
148 return 0; | |
149 } | |
150 | |
151 #define MP3_PACKET_SIZE 1024 | |
152 | |
153 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) | |
154 { | |
155 int ret, size; | |
156 // AVStream *st = s->streams[0]; | |
885 | 157 |
234 | 158 size= MP3_PACKET_SIZE; |
159 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
160 ret= av_get_packet(s->pb, pkt, size); |
234 | 161 |
162 pkt->stream_index = 0; | |
163 if (ret <= 0) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
164 return AVERROR(EIO); |
234 | 165 } |
166 /* note: we need to modify the packet size here to handle the last | |
167 packet */ | |
168 pkt->size = ret; | |
169 return ret; | |
170 } | |
171 | |
4206 | 172 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER |
4355 | 173 static int id3v1_set_string(AVFormatContext *s, const char *key, |
174 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
|
175 { |
4355 | 176 AVMetadataTag *tag; |
177 if ((tag = av_metadata_get(s->metadata, key, NULL, 0))) | |
178 strncpy(buf, tag->value, buf_size); | |
179 return !!tag; | |
180 } | |
181 | |
182 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf) | |
183 { | |
184 AVMetadataTag *tag; | |
185 int i, count = 0; | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
186 |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
187 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
|
188 buf[0] = 'T'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
189 buf[1] = 'A'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
190 buf[2] = 'G'; |
4355 | 191 count += id3v1_set_string(s, "title", buf + 3, 30); |
192 count += id3v1_set_string(s, "author", buf + 33, 30); | |
193 count += id3v1_set_string(s, "album", buf + 63, 30); | |
194 count += id3v1_set_string(s, "year", buf + 93, 4); | |
195 count += id3v1_set_string(s, "comment", buf + 97, 30); | |
196 if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) { | |
197 buf[125] = 0; | |
198 buf[126] = atoi(tag->value); | |
199 count++; | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
200 } |
4355 | 201 if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) { |
4356 | 202 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
|
203 if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) { |
4356 | 204 buf[127] = i; |
205 count++; | |
206 break; | |
207 } | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
208 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
209 } |
4355 | 210 return count; |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
211 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
212 |
234 | 213 /* simple formats */ |
2098 | 214 |
215 static void id3v2_put_size(AVFormatContext *s, int size) | |
216 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
217 put_byte(s->pb, size >> 21 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
218 put_byte(s->pb, size >> 14 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
219 put_byte(s->pb, size >> 7 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
220 put_byte(s->pb, size & 0x7f); |
2098 | 221 } |
222 | |
3008 | 223 static void id3v2_put_ttag(AVFormatContext *s, const char *string, uint32_t tag) |
2098 | 224 { |
225 int len = strlen(string); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
226 put_be32(s->pb, tag); |
2098 | 227 id3v2_put_size(s, len + 1); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
228 put_be16(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
229 put_byte(s->pb, 3); /* UTF-8 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
230 put_buffer(s->pb, string, len); |
2098 | 231 } |
232 | |
233 | |
234 /** | |
235 * Write an ID3v2.4 header at beginning of stream | |
236 */ | |
237 | |
234 | 238 static int mp3_write_header(struct AVFormatContext *s) |
239 { | |
4355 | 240 AVMetadataTag *title, *author, *album, *genre, *copyright, *track, *year; |
2098 | 241 int totlen = 0; |
242 | |
4355 | 243 title = av_metadata_get(s->metadata, "title", NULL, 0); |
244 author = av_metadata_get(s->metadata, "author", NULL, 0); | |
245 album = av_metadata_get(s->metadata, "album", NULL, 0); | |
246 genre = av_metadata_get(s->metadata, "genre", NULL, 0); | |
247 copyright = av_metadata_get(s->metadata, "copyright", NULL, 0); | |
248 track = av_metadata_get(s->metadata, "track", NULL, 0); | |
249 year = av_metadata_get(s->metadata, "year", NULL, 0); | |
2098 | 250 |
4355 | 251 if(title) totlen += 11 + strlen(title->value); |
252 if(author) totlen += 11 + strlen(author->value); | |
253 if(album) totlen += 11 + strlen(album->value); | |
254 if(genre) totlen += 11 + strlen(genre->value); | |
255 if(copyright) totlen += 11 + strlen(copyright->value); | |
256 if(track) totlen += 11 + strlen(track->value); | |
257 if(year) totlen += 11 + strlen(year->value); | |
2098 | 258 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
259 totlen += strlen(LIBAVFORMAT_IDENT) + 11; | |
260 | |
261 if(totlen == 0) | |
262 return 0; | |
263 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
264 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
265 put_byte(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
266 put_byte(s->pb, 0); /* flags */ |
2098 | 267 |
268 id3v2_put_size(s, totlen); | |
269 | |
4355 | 270 if(title) id3v2_put_ttag(s, title->value, MKBETAG('T', 'I', 'T', '2')); |
271 if(author) id3v2_put_ttag(s, author->value, MKBETAG('T', 'P', 'E', '1')); | |
272 if(album) id3v2_put_ttag(s, album->value, MKBETAG('T', 'A', 'L', 'B')); | |
273 if(genre) id3v2_put_ttag(s, genre->value, MKBETAG('T', 'C', 'O', 'N')); | |
274 if(copyright) id3v2_put_ttag(s, copyright->value, MKBETAG('T', 'C', 'O', 'P')); | |
275 if(track) id3v2_put_ttag(s, track->value, MKBETAG('T', 'R', 'C', 'K')); | |
276 if(year) id3v2_put_ttag(s, year->value, MKBETAG('T', 'Y', 'E', 'R')); | |
2098 | 277 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT)) |
278 id3v2_put_ttag(s, LIBAVFORMAT_IDENT, MKBETAG('T', 'E', 'N', 'C')); | |
234 | 279 return 0; |
280 } | |
281 | |
468 | 282 static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
234 | 283 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
284 put_buffer(s->pb, pkt->data, pkt->size); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
285 put_flush_packet(s->pb); |
234 | 286 return 0; |
287 } | |
288 | |
289 static int mp3_write_trailer(struct AVFormatContext *s) | |
290 { | |
2096 | 291 uint8_t buf[ID3v1_TAG_SIZE]; |
234 | 292 |
2096 | 293 /* write the id3v1 tag */ |
4355 | 294 if (id3v1_create_tag(s, buf) > 0) { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
295 put_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
296 put_flush_packet(s->pb); |
234 | 297 } |
298 return 0; | |
299 } | |
4206 | 300 #endif /* CONFIG_MP2_MUXER || CONFIG_MP3_MUXER */ |
234 | 301 |
4206 | 302 #if CONFIG_MP3_DEMUXER |
1167 | 303 AVInputFormat mp3_demuxer = { |
234 | 304 "mp3", |
4627
2119994c15ba
Change a bunch of codec long_names to be more consistent and descriptive.
diego
parents:
4383
diff
changeset
|
305 NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"), |
234 | 306 0, |
1107 | 307 mp3_read_probe, |
234 | 308 mp3_read_header, |
309 mp3_read_packet, | |
1756 | 310 .flags= AVFMT_GENERIC_INDEX, |
814 | 311 .extensions = "mp2,mp3,m2a", /* XXX: use probe */ |
234 | 312 }; |
1169 | 313 #endif |
4206 | 314 #if CONFIG_MP2_MUXER |
1167 | 315 AVOutputFormat mp2_muxer = { |
234 | 316 "mp2", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
317 NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), |
234 | 318 "audio/x-mpeg", |
814 | 319 "mp2,m2a", |
234 | 320 0, |
321 CODEC_ID_MP2, | |
3289 | 322 CODEC_ID_NONE, |
2306
d045cbcf37a3
do not write id3v2 header when writing .mp2 files
bcoudurier
parents:
2274
diff
changeset
|
323 NULL, |
234 | 324 mp3_write_packet, |
325 mp3_write_trailer, | |
326 }; | |
1169 | 327 #endif |
4206 | 328 #if CONFIG_MP3_MUXER |
1167 | 329 AVOutputFormat mp3_muxer = { |
234 | 330 "mp3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
331 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"), |
234 | 332 "audio/x-mpeg", |
333 "mp3", | |
334 0, | |
335 CODEC_ID_MP3, | |
3289 | 336 CODEC_ID_NONE, |
234 | 337 mp3_write_header, |
338 mp3_write_packet, | |
339 mp3_write_trailer, | |
340 }; | |
341 #endif |