Mercurial > libavformat.hg
annotate mp3.c @ 6449:3a28e6827095 libavformat
Solving memory leak and initialization problem with prev_pkt / pkt.
author | bindhammer |
---|---|
date | Tue, 31 Aug 2010 07:15:11 +0000 |
parents | 83cd11644ff1 |
children |
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" |
5318
fb4f4b61c8ce
Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32.
diego
parents:
5266
diff
changeset
|
24 #include "libavutil/intreadwrite.h" |
234 | 25 #include "avformat.h" |
4221
55f448c99135
Factorise id3v2 header parsing from mp3.c to be shared
superdump
parents:
4206
diff
changeset
|
26 #include "id3v2.h" |
5016
eb6dd7717805
Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
diego
parents:
4900
diff
changeset
|
27 #include "id3v1.h" |
2097 | 28 |
5226 | 29 #if CONFIG_MP3_DEMUXER |
30 | |
31 #include "libavcodec/mpegaudio.h" | |
32 #include "libavcodec/mpegaudiodecheader.h" | |
33 | |
234 | 34 /* mp3 read */ |
1107 | 35 |
36 static int mp3_read_probe(AVProbeData *p) | |
37 { | |
2234
2bc002540a9b
kill uninitialised variable warning in mp3_read_probe()
mru
parents:
2231
diff
changeset
|
38 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
|
39 int fsize, frames, sample_rate; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
40 uint32_t header; |
4254 | 41 uint8_t *buf, *buf0, *buf2, *end; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
42 AVCodecContext avctx; |
1107 | 43 |
4254 | 44 buf0 = p->buf; |
6121
81614e9b541b
Generalize ID3v2 functions to support ID3v2-like ID headers with a
cehoyos
parents:
5965
diff
changeset
|
45 if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) { |
4254 | 46 buf0 += ff_id3v2_tag_len(buf0); |
47 } | |
5727
74142991b333
Many mp3s seem to contain padding after id3 tags that is not considered in the
michael
parents:
5661
diff
changeset
|
48 end = p->buf + p->buf_size - sizeof(uint32_t); |
74142991b333
Many mp3s seem to contain padding after id3 tags that is not considered in the
michael
parents:
5661
diff
changeset
|
49 while(buf0 < end && !*buf0) |
74142991b333
Many mp3s seem to contain padding after id3 tags that is not considered in the
michael
parents:
5661
diff
changeset
|
50 buf0++; |
1107 | 51 |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
52 max_frames = 0; |
4254 | 53 buf = buf0; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
54 |
2797 | 55 for(; buf < end; buf= buf2+1) { |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
56 buf2 = buf; |
1107 | 57 |
1312 | 58 for(frames = 0; buf2 < end; frames++) { |
2222 | 59 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
|
60 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
|
61 if(fsize < 0) |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
62 break; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
63 buf2 += fsize; |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
64 } |
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
65 max_frames = FFMAX(max_frames, frames); |
4254 | 66 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
|
67 first_frames= frames; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
68 } |
5238
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5236
diff
changeset
|
69 // keep this in sync with ac3 probe, both need to avoid |
c872818a8e1f
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents:
5236
diff
changeset
|
70 // issues with MPEG-files! |
5186
cbaefd9135ac
Slighty tweak mp3 probe threshold to prevent probetest from complaining.
michael
parents:
5045
diff
changeset
|
71 if (first_frames>=4) 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
|
72 else if(max_frames>500)return AVPROBE_SCORE_MAX/2; |
4900 | 73 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
|
74 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
|
75 else if(max_frames>=1) return 1; |
1308
866d43ed0a67
allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents:
1169
diff
changeset
|
76 else return 0; |
4900 | 77 //mpegps_mp3_unrecognized_format.mpg has max_frames=3 |
1107 | 78 } |
79 | |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
80 /** |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
81 * 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
|
82 */ |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
83 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
|
84 { |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
85 uint32_t v, spf; |
6325 | 86 unsigned frames = 0; /* Total number of frames in file */ |
6324 | 87 unsigned size = 0; /* Total number of bytes in the stream */ |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
88 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; |
4274 | 89 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
|
90 int vbrtag_size = 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
91 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
92 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
|
93 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
|
94 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
|
95 |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
96 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
|
97 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
|
98 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
|
99 return -1; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
100 |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
101 /* Check for Xing / Info tag */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
102 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
|
103 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
|
104 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
|
105 v = get_be32(s->pb); |
2664 | 106 if(v & 0x1) |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
107 frames = get_be32(s->pb); |
6324 | 108 if(v & 0x2) |
109 size = get_be32(s->pb); | |
2663
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
110 } |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
111 |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
112 /* 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
|
113 url_fseek(s->pb, base + 4 + 32, SEEK_SET); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
114 v = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
115 if(v == MKBETAG('V', 'B', 'R', 'I')) { |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
116 /* Check tag version */ |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
117 if(get_be16(s->pb) == 1) { |
6324 | 118 /* skip delay and quality */ |
119 url_fseek(s->pb, 4, SEEK_CUR); | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
120 frames = get_be32(s->pb); |
6324 | 121 size = get_be32(s->pb); |
2667
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
122 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
123 } |
e896ac505ec6
add support for reading duration from VBRI-tag in mp3 files
andoma
parents:
2664
diff
changeset
|
124 |
6325 | 125 if(!frames && !size) |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
126 return -1; |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
127 |
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
128 /* 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
|
129 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
|
130 |
be889462edfc
cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents:
2662
diff
changeset
|
131 spf = c.lsf ? 576 : 1152; /* Samples per frame, layer 3 */ |
6325 | 132 if(frames) |
6324 | 133 st->duration = av_rescale_q(frames, (AVRational){spf, c.sample_rate}, |
134 st->time_base); | |
135 if(size) | |
136 st->codec->bit_rate = av_rescale(size, 8 * c.sample_rate, frames * (int64_t)spf); | |
137 | |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
138 return 0; |
2662
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
139 } |
08b1ac852321
add support for reading duration from Xing-tag in mp3 files
andoma
parents:
2622
diff
changeset
|
140 |
234 | 141 static int mp3_read_header(AVFormatContext *s, |
142 AVFormatParameters *ap) | |
143 { | |
144 AVStream *st; | |
3973
549a09cf23fe
Remove offset_t typedef and use int64_t directly instead.
diego
parents:
3871
diff
changeset
|
145 int64_t off; |
234 | 146 |
147 st = av_new_stream(s, 0); | |
148 if (!st) | |
2273
7eb456c4ed8a
Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents:
2234
diff
changeset
|
149 return AVERROR(ENOMEM); |
234 | 150 |
5910
536e5527c1e0
Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents:
5727
diff
changeset
|
151 st->codec->codec_type = AVMEDIA_TYPE_AUDIO; |
820
feca73904e67
changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents:
814
diff
changeset
|
152 st->codec->codec_id = CODEC_ID_MP3; |
2023 | 153 st->need_parsing = AVSTREAM_PARSE_FULL; |
2622 | 154 st->start_time = 0; |
885 | 155 |
5380
7a06194c23af
set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
bcoudurier
parents:
5319
diff
changeset
|
156 // lcm of all mp3 sample rates |
7a06194c23af
set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
bcoudurier
parents:
5319
diff
changeset
|
157 av_set_pts_info(st, 64, 1, 14112000); |
7a06194c23af
set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
bcoudurier
parents:
5319
diff
changeset
|
158 |
6121
81614e9b541b
Generalize ID3v2 functions to support ID3v2-like ID headers with a
cehoyos
parents:
5965
diff
changeset
|
159 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC); |
5641
980dc98901d9
mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
andoma
parents:
5618
diff
changeset
|
160 off = url_ftell(s->pb); |
980dc98901d9
mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
andoma
parents:
5618
diff
changeset
|
161 |
5266
73615b247438
Only read ID3v1 tag if ID3v2 isn't present or is empty.
cehoyos
parents:
5265
diff
changeset
|
162 if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX)) |
73615b247438
Only read ID3v1 tag if ID3v2 isn't present or is empty.
cehoyos
parents:
5265
diff
changeset
|
163 ff_id3v1_read(s); |
234 | 164 |
4148
33f55d10246d
If we find a VBR tag at the beginning of the file don't attempt to
michael
parents:
4126
diff
changeset
|
165 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
|
166 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
|
167 |
234 | 168 /* the parameters will be extracted from the compressed bitstream */ |
169 return 0; | |
170 } | |
171 | |
172 #define MP3_PACKET_SIZE 1024 | |
173 | |
174 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt) | |
175 { | |
176 int ret, size; | |
177 // AVStream *st = s->streams[0]; | |
885 | 178 |
234 | 179 size= MP3_PACKET_SIZE; |
180 | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
181 ret= av_get_packet(s->pb, pkt, size); |
234 | 182 |
183 pkt->stream_index = 0; | |
184 if (ret <= 0) { | |
2274
b21c2af60bc9
Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents:
2273
diff
changeset
|
185 return AVERROR(EIO); |
234 | 186 } |
187 /* note: we need to modify the packet size here to handle the last | |
188 packet */ | |
189 pkt->size = ret; | |
190 return ret; | |
191 } | |
192 | |
5226 | 193 AVInputFormat mp3_demuxer = { |
194 "mp3", | |
195 NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"), | |
196 0, | |
197 mp3_read_probe, | |
198 mp3_read_header, | |
199 mp3_read_packet, | |
200 .flags= AVFMT_GENERIC_INDEX, | |
201 .extensions = "mp2,mp3,m2a", /* XXX: use probe */ | |
5265
79be5a6fd62f
id3v2: Export all text information frames with correct names.
ramiro
parents:
5264
diff
changeset
|
202 .metadata_conv = ff_id3v2_metadata_conv, |
5226 | 203 }; |
204 #endif | |
205 | |
4206 | 206 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER |
4355 | 207 static int id3v1_set_string(AVFormatContext *s, const char *key, |
208 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
|
209 { |
4355 | 210 AVMetadataTag *tag; |
211 if ((tag = av_metadata_get(s->metadata, key, NULL, 0))) | |
212 strncpy(buf, tag->value, buf_size); | |
213 return !!tag; | |
214 } | |
215 | |
216 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf) | |
217 { | |
218 AVMetadataTag *tag; | |
219 int i, count = 0; | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
220 |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
221 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
|
222 buf[0] = 'T'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
223 buf[1] = 'A'; |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
224 buf[2] = 'G'; |
6250 | 225 count += id3v1_set_string(s, "TIT2", buf + 3, 30); //title |
226 count += id3v1_set_string(s, "TPE1", buf + 33, 30); //author|artist | |
227 count += id3v1_set_string(s, "TALB", buf + 63, 30); //album | |
228 count += id3v1_set_string(s, "TDRL", buf + 93, 4); //date | |
4355 | 229 count += id3v1_set_string(s, "comment", buf + 97, 30); |
6250 | 230 if ((tag = av_metadata_get(s->metadata, "TRCK", NULL, 0))) { //track |
4355 | 231 buf[125] = 0; |
232 buf[126] = atoi(tag->value); | |
233 count++; | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
234 } |
5198
7838e959a646
10l: set genre default immediately before reading genre tag
jbr
parents:
5197
diff
changeset
|
235 buf[127] = 0xFF; /* default to unknown genre */ |
6250 | 236 if ((tag = av_metadata_get(s->metadata, "TCON", NULL, 0))) { //genre |
4356 | 237 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
|
238 if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) { |
4356 | 239 buf[127] = i; |
240 count++; | |
241 break; | |
242 } | |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
243 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
244 } |
4355 | 245 return count; |
3561
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
246 } |
bc473761b9e7
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents:
3540
diff
changeset
|
247 |
234 | 248 /* simple formats */ |
2098 | 249 |
250 static void id3v2_put_size(AVFormatContext *s, int size) | |
251 { | |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
252 put_byte(s->pb, size >> 21 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
253 put_byte(s->pb, size >> 14 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
254 put_byte(s->pb, size >> 7 & 0x7f); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
255 put_byte(s->pb, size & 0x7f); |
2098 | 256 } |
257 | |
5264 | 258 static void id3v2_put_ttag(AVFormatContext *s, const char *buf, int len, |
259 uint32_t tag) | |
2098 | 260 { |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
261 put_be32(s->pb, tag); |
2098 | 262 id3v2_put_size(s, len + 1); |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
263 put_be16(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
264 put_byte(s->pb, 3); /* UTF-8 */ |
5264 | 265 put_buffer(s->pb, buf, len); |
2098 | 266 } |
267 | |
268 | |
5319
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
269 static int mp3_write_packet(struct AVFormatContext *s, AVPacket *pkt) |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
270 { |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
271 put_buffer(s->pb, pkt->data, pkt->size); |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
272 put_flush_packet(s->pb); |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
273 return 0; |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
274 } |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
275 |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
276 static int mp3_write_trailer(struct AVFormatContext *s) |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
277 { |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
278 uint8_t buf[ID3v1_TAG_SIZE]; |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
279 |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
280 /* write the id3v1 tag */ |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
281 if (id3v1_create_tag(s, buf) > 0) { |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
282 put_buffer(s->pb, buf, ID3v1_TAG_SIZE); |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
283 put_flush_packet(s->pb); |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
284 } |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
285 return 0; |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
286 } |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
287 #endif /* CONFIG_MP2_MUXER || CONFIG_MP3_MUXER */ |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
288 |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
289 #if CONFIG_MP2_MUXER |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
290 AVOutputFormat mp2_muxer = { |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
291 "mp2", |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
292 NULL_IF_CONFIG_SMALL("MPEG audio layer 2"), |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
293 "audio/x-mpeg", |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
294 "mp2,m2a", |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
295 0, |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
296 CODEC_ID_MP2, |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
297 CODEC_ID_NONE, |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
298 NULL, |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
299 mp3_write_packet, |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
300 mp3_write_trailer, |
6250 | 301 .metadata_conv = ff_id3v2_metadata_conv, |
5319
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
302 }; |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
303 #endif |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
304 |
86c32a27f69a
Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents:
5318
diff
changeset
|
305 #if CONFIG_MP3_MUXER |
2098 | 306 /** |
307 * Write an ID3v2.4 header at beginning of stream | |
308 */ | |
309 | |
234 | 310 static int mp3_write_header(struct AVFormatContext *s) |
311 { | |
5264 | 312 AVMetadataTag *t = NULL; |
2098 | 313 int totlen = 0; |
5264 | 314 int64_t size_pos, cur_pos; |
2098 | 315 |
2771
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
316 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */ |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
317 put_byte(s->pb, 0); |
d52c718e83f9
Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents:
2746
diff
changeset
|
318 put_byte(s->pb, 0); /* flags */ |
2098 | 319 |
5264 | 320 /* reserve space for size */ |
321 size_pos = url_ftell(s->pb); | |
322 put_be32(s->pb, 0); | |
323 | |
324 while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) { | |
325 uint32_t tag = 0; | |
326 | |
5661
6d530eb42996
Set lavf identification string globally in av_write_header(), rather
rbultje
parents:
5641
diff
changeset
|
327 if (t->key[0] == 'T' && strlen(t->key) == 4) { |
5264 | 328 int i; |
329 for (i = 0; *ff_id3v2_tags[i]; i++) | |
330 if (AV_RB32(t->key) == AV_RB32(ff_id3v2_tags[i])) { | |
331 int len = strlen(t->value); | |
332 tag = AV_RB32(t->key); | |
333 totlen += len + ID3v2_HEADER_SIZE + 2; | |
334 id3v2_put_ttag(s, t->value, len + 1, tag); | |
335 break; | |
336 } | |
337 } | |
2098 | 338 |
5264 | 339 if (!tag) { /* unknown tag, write as TXXX frame */ |
340 int len = strlen(t->key), len1 = strlen(t->value); | |
341 char *buf = av_malloc(len + len1 + 2); | |
342 if (!buf) | |
343 return AVERROR(ENOMEM); | |
344 tag = MKBETAG('T', 'X', 'X', 'X'); | |
345 strcpy(buf, t->key); | |
346 strcpy(buf + len + 1, t->value); | |
347 id3v2_put_ttag(s, buf, len + len1 + 2, tag); | |
348 totlen += len + len1 + ID3v2_HEADER_SIZE + 3; | |
349 av_free(buf); | |
350 } | |
351 } | |
352 | |
353 cur_pos = url_ftell(s->pb); | |
354 url_fseek(s->pb, size_pos, SEEK_SET); | |
355 id3v2_put_size(s, totlen); | |
356 url_fseek(s->pb, cur_pos, SEEK_SET); | |
357 | |
234 | 358 return 0; |
359 } | |
360 | |
1167 | 361 AVOutputFormat mp3_muxer = { |
234 | 362 "mp3", |
3424
7a0230981402
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents:
3289
diff
changeset
|
363 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"), |
234 | 364 "audio/x-mpeg", |
365 "mp3", | |
366 0, | |
367 CODEC_ID_MP3, | |
3289 | 368 CODEC_ID_NONE, |
234 | 369 mp3_write_header, |
370 mp3_write_packet, | |
371 mp3_write_trailer, | |
5965 | 372 AVFMT_NOTIMESTAMPS, |
5236
1403c88b1ce7
Add id3v2 metadata conversion table and use it in mp3 muxer.
cehoyos
parents:
5226
diff
changeset
|
373 .metadata_conv = ff_id3v2_metadata_conv, |
234 | 374 }; |
375 #endif |