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