annotate mp3.c @ 5711:1481fbffd30b libavformat

low-complexity Bink file seeking
author pross
date Wed, 24 Feb 2010 11:43:33 +0000
parents 6d530eb42996
children 74142991b333
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
15 * Lesser General Public License for more details.
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
16 *
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
20 */
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
21
3714
3790cb6c893d strcasecmp() requires #include <strings.h>
aurel
parents: 3561
diff changeset
22 #include <strings.h>
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3278
diff changeset
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
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
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
cab3fcb34077 id3v2 reader
benoit
parents: 2096
diff changeset
28
5226
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
29 #if CONFIG_MP3_DEMUXER
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
30
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
31 #include "libavcodec/mpegaudio.h"
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
32 #include "libavcodec/mpegaudiodecheader.h"
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
33
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
34 /* mp3 read */
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
35
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
36 static int mp3_read_probe(AVProbeData *p)
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
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
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
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
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
43
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
44 buf0 = p->buf;
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
45 if(ff_id3v2_match(buf0)) {
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
46 buf0 += ff_id3v2_tag_len(buf0);
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
47 }
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
48
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
49 max_frames = 0;
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
50 buf = buf0;
4258
35c8abd32d93 Fix a read past end of buffer crash in the mp3 probe
alexc
parents: 4254
diff changeset
51 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
52
2797
428c1678b21f ensure that the probe code runs in O(n)
michael
parents: 2796
diff changeset
53 for(; buf < end; buf= buf2+1) {
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
54 buf2 = buf;
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
55
1312
24f1d6a50117 10l typo
michael
parents: 1308
diff changeset
56 for(frames = 0; buf2 < end; frames++) {
2222
3427d0c63a32 Use AV_RB* macros where appropriate.
diego
parents: 2189
diff changeset
57 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
58 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
59 if(fsize < 0)
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
60 break;
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
61 buf2 += fsize;
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
62 }
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
63 max_frames = FFMAX(max_frames, frames);
4254
d05b13327b07 Fix probing of files with ID3v2 tags. Discussed at
alexc
parents: 4251
diff changeset
64 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
65 first_frames= frames;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
66 }
5238
c872818a8e1f Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
reimar
parents: 5236
diff changeset
67 // 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
68 // issues with MPEG-files!
5186
cbaefd9135ac Slighty tweak mp3 probe threshold to prevent probetest from complaining.
michael
parents: 5045
diff changeset
69 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
70 else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
4900
d24b4e25db8d Require 4 instead of 3 frames for detecting mp3,
michael
parents: 4787
diff changeset
71 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
72 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
73 else if(max_frames>=1) return 1;
1308
866d43ed0a67 allow ffmpeg to read mp3s beginning with partial frames
gpoirier
parents: 1169
diff changeset
74 else return 0;
4900
d24b4e25db8d Require 4 instead of 3 frames for detecting mp3,
michael
parents: 4787
diff changeset
75 //mpegps_mp3_unrecognized_format.mpg has max_frames=3
1107
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
76 }
921c8af78310 probe for mpeg audio
mru
parents: 896
diff changeset
77
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
78 /**
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
79 * 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
80 */
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
81 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
82 {
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
83 uint32_t v, spf;
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
84 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
85 const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
4274
39f62ce83e5a Avoid allocating MPADecodeContext on stack.
andoma
parents: 4258
diff changeset
86 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
87 int vbrtag_size = 0;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
88
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
89 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
90 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
91 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
92
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
93 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
94 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
95 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
96 return -1;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
97
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
98 /* Check for Xing / Info tag */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
99 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
100 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
101 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
102 v = get_be32(s->pb);
2664
33122df98824 fix indent
andoma
parents: 2663
diff changeset
103 if(v & 0x1)
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
104 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
105 }
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
106
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
107 /* 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
108 url_fseek(s->pb, base + 4 + 32, SEEK_SET);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
109 v = get_be32(s->pb);
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
110 if(v == MKBETAG('V', 'B', 'R', 'I')) {
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
111 /* Check tag version */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
112 if(get_be16(s->pb) == 1) {
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
113 /* skip delay, quality and total bytes */
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
114 url_fseek(s->pb, 8, SEEK_CUR);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
115 frames = get_be32(s->pb);
2667
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
116 }
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
117 }
e896ac505ec6 add support for reading duration from VBRI-tag in mp3 files
andoma
parents: 2664
diff changeset
118
2663
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
119 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
120 return -1;
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
121
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
122 /* 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
123 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
124
be889462edfc cosmetical change of mp3_parse_xing() to prepare for upcoming VBRI tag support
andoma
parents: 2662
diff changeset
125 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
126 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
127 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
128 return 0;
2662
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
129 }
08b1ac852321 add support for reading duration from Xing-tag in mp3 files
andoma
parents: 2622
diff changeset
130
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
131 static int mp3_read_header(AVFormatContext *s,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
132 AVFormatParameters *ap)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
133 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
134 AVStream *st;
3973
549a09cf23fe Remove offset_t typedef and use int64_t directly instead.
diego
parents: 3871
diff changeset
135 int64_t off;
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
136
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
137 st = av_new_stream(s, 0);
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
138 if (!st)
2273
7eb456c4ed8a Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
takis
parents: 2234
diff changeset
139 return AVERROR(ENOMEM);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
140
820
feca73904e67 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
michael
parents: 814
diff changeset
141 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
142 st->codec->codec_id = CODEC_ID_MP3;
2023
a3e79d6e4e3c add an enum for need_parsing
aurel
parents: 2001
diff changeset
143 st->need_parsing = AVSTREAM_PARSE_FULL;
2622
c63b1bd7be16 set start_time to 0 to enable seeking in mp3-files
andoma
parents: 2306
diff changeset
144 st->start_time = 0;
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
145
5380
7a06194c23af set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
bcoudurier
parents: 5319
diff changeset
146 // 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
147 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
148
5045
9ed3c88ed9ba Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
diego
parents: 5016
diff changeset
149 ff_id3v2_read(s);
5641
980dc98901d9 mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
andoma
parents: 5618
diff changeset
150 off = url_ftell(s->pb);
980dc98901d9 mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
andoma
parents: 5618
diff changeset
151
5266
73615b247438 Only read ID3v1 tag if ID3v2 isn't present or is empty.
cehoyos
parents: 5265
diff changeset
152 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
153 ff_id3v1_read(s);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
154
4148
33f55d10246d If we find a VBR tag at the beginning of the file don't attempt to
michael
parents: 4126
diff changeset
155 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
156 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
157
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
158 /* the parameters will be extracted from the compressed bitstream */
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
159 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
160 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
161
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
162 #define MP3_PACKET_SIZE 1024
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
163
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
164 static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
165 {
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
166 int ret, size;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
167 // AVStream *st = s->streams[0];
885
da1d5db0ce5c COSMETICS: Remove all trailing whitespace.
diego
parents: 858
diff changeset
168
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
169 size= MP3_PACKET_SIZE;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
170
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
171 ret= av_get_packet(s->pb, pkt, size);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
172
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
173 pkt->stream_index = 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
174 if (ret <= 0) {
2274
b21c2af60bc9 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
takis
parents: 2273
diff changeset
175 return AVERROR(EIO);
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
176 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
177 /* note: we need to modify the packet size here to handle the last
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
178 packet */
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
179 pkt->size = ret;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
180 return ret;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
181 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
182
5226
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
183 AVInputFormat mp3_demuxer = {
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
184 "mp3",
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
185 NULL_IF_CONFIG_SMALL("MPEG audio layer 2/3"),
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
186 0,
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
187 mp3_read_probe,
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
188 mp3_read_header,
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
189 mp3_read_packet,
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
190 .flags= AVFMT_GENERIC_INDEX,
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
191 .extensions = "mp2,mp3,m2a", /* XXX: use probe */
5265
79be5a6fd62f id3v2: Export all text information frames with correct names.
ramiro
parents: 5264
diff changeset
192 .metadata_conv = ff_id3v2_metadata_conv,
5226
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
193 };
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
194 #endif
0d65bc05d4ac Place MP3 demuxer code under appropriate #ifdefs.
diego
parents: 5198
diff changeset
195
4206
c3102b189cb6 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 4148
diff changeset
196 #if CONFIG_MP2_MUXER || CONFIG_MP3_MUXER
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
197 static int id3v1_set_string(AVFormatContext *s, const char *key,
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
198 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
199 {
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
200 AVMetadataTag *tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
201 if ((tag = av_metadata_get(s->metadata, key, NULL, 0)))
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
202 strncpy(buf, tag->value, buf_size);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
203 return !!tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
204 }
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
205
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
206 static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
207 {
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
208 AVMetadataTag *tag;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
209 int i, count = 0;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
210
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
211 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
212 buf[0] = 'T';
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
213 buf[1] = 'A';
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
214 buf[2] = 'G';
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
215 count += id3v1_set_string(s, "title", buf + 3, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
216 count += id3v1_set_string(s, "author", buf + 33, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
217 count += id3v1_set_string(s, "album", buf + 63, 30);
5618
27fd77f20a89 Add a list of generic tags and change demuxers to follow it.
pross
parents: 5380
diff changeset
218 count += id3v1_set_string(s, "date", buf + 93, 4);
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
219 count += id3v1_set_string(s, "comment", buf + 97, 30);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
220 if ((tag = av_metadata_get(s->metadata, "track", NULL, 0))) {
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
221 buf[125] = 0;
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
222 buf[126] = atoi(tag->value);
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
223 count++;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
224 }
5198
7838e959a646 10l: set genre default immediately before reading genre tag
jbr
parents: 5197
diff changeset
225 buf[127] = 0xFF; /* default to unknown genre */
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
226 if ((tag = av_metadata_get(s->metadata, "genre", NULL, 0))) {
4356
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
227 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
228 if (!strcasecmp(tag->value, ff_id3v1_genre_str[i])) {
4356
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
229 buf[127] = i;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
230 count++;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
231 break;
459c0242194e cosmetics: indentation
aurel
parents: 4355
diff changeset
232 }
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
233 }
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
234 }
4355
d8a6a01679be use new metadata API in the mp3 muxer
aurel
parents: 4354
diff changeset
235 return count;
3561
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
236 }
bc473761b9e7 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
diego
parents: 3540
diff changeset
237
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
238 /* simple formats */
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
239
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
240 static void id3v2_put_size(AVFormatContext *s, int size)
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
241 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
242 put_byte(s->pb, size >> 21 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
243 put_byte(s->pb, size >> 14 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
244 put_byte(s->pb, size >> 7 & 0x7f);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
245 put_byte(s->pb, size & 0x7f);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
246 }
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
247
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
248 static void id3v2_put_ttag(AVFormatContext *s, const char *buf, int len,
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
249 uint32_t tag)
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
250 {
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
251 put_be32(s->pb, tag);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
252 id3v2_put_size(s, len + 1);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
253 put_be16(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
254 put_byte(s->pb, 3); /* UTF-8 */
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
255 put_buffer(s->pb, buf, len);
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
256 }
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
257
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
258
5319
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
259 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
260 {
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
261 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
262 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
263 return 0;
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
264 }
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
265
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
266 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
267 {
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
268 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
269
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
270 /* write the id3v1 tag */
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
271 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
272 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
273 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
274 }
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
275 return 0;
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
276 }
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
277 #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
278
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
279 #if CONFIG_MP2_MUXER
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
280 AVOutputFormat mp2_muxer = {
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
281 "mp2",
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
282 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
283 "audio/x-mpeg",
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
284 "mp2,m2a",
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
285 0,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
286 CODEC_ID_MP2,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
287 CODEC_ID_NONE,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
288 NULL,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
289 mp3_write_packet,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
290 mp3_write_trailer,
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
291 };
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
292 #endif
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
293
86c32a27f69a Move function that is only used by the MP3 muxer below the corresponding #if.
diego
parents: 5318
diff changeset
294 #if CONFIG_MP3_MUXER
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
295 /**
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
296 * Write an ID3v2.4 header at beginning of stream
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
297 */
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
298
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
299 static int mp3_write_header(struct AVFormatContext *s)
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
300 {
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
301 AVMetadataTag *t = NULL;
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
302 int totlen = 0;
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
303 int64_t size_pos, cur_pos;
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
304
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
305 put_be32(s->pb, MKBETAG('I', 'D', '3', 0x04)); /* ID3v2.4 */
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
306 put_byte(s->pb, 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2746
diff changeset
307 put_byte(s->pb, 0); /* flags */
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
308
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
309 /* reserve space for size */
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
310 size_pos = url_ftell(s->pb);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
311 put_be32(s->pb, 0);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
312
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
313 while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
314 uint32_t tag = 0;
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
315
5661
6d530eb42996 Set lavf identification string globally in av_write_header(), rather
rbultje
parents: 5641
diff changeset
316 if (t->key[0] == 'T' && strlen(t->key) == 4) {
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
317 int i;
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
318 for (i = 0; *ff_id3v2_tags[i]; i++)
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
319 if (AV_RB32(t->key) == AV_RB32(ff_id3v2_tags[i])) {
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
320 int len = strlen(t->value);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
321 tag = AV_RB32(t->key);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
322 totlen += len + ID3v2_HEADER_SIZE + 2;
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
323 id3v2_put_ttag(s, t->value, len + 1, tag);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
324 break;
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
325 }
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
326 }
2098
b51b57909b5f id3v2 writer
benoit
parents: 2097
diff changeset
327
5264
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
328 if (!tag) { /* unknown tag, write as TXXX frame */
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
329 int len = strlen(t->key), len1 = strlen(t->value);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
330 char *buf = av_malloc(len + len1 + 2);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
331 if (!buf)
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
332 return AVERROR(ENOMEM);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
333 tag = MKBETAG('T', 'X', 'X', 'X');
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
334 strcpy(buf, t->key);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
335 strcpy(buf + len + 1, t->value);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
336 id3v2_put_ttag(s, buf, len + len1 + 2, tag);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
337 totlen += len + len1 + ID3v2_HEADER_SIZE + 3;
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
338 av_free(buf);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
339 }
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
340 }
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
341
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
342 cur_pos = url_ftell(s->pb);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
343 url_fseek(s->pb, size_pos, SEEK_SET);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
344 id3v2_put_size(s, totlen);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
345 url_fseek(s->pb, cur_pos, SEEK_SET);
323fc801aa57 MP3 muxer: Write all metadata.
ramiro
parents: 5238
diff changeset
346
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
347 return 0;
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
348 }
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
349
1167
d89d7ef290da give AVInput/OutputFormat structs consistent names
mru
parents: 1107
diff changeset
350 AVOutputFormat mp3_muxer = {
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
351 "mp3",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3289
diff changeset
352 NULL_IF_CONFIG_SMALL("MPEG audio layer 3"),
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
353 "audio/x-mpeg",
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
354 "mp3",
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
355 0,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
356 CODEC_ID_MP3,
3289
811c78fac294 Replace some occurrences of 0 with CODEC_ID_NONE.
cehoyos
parents: 3286
diff changeset
357 CODEC_ID_NONE,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
358 mp3_write_header,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
359 mp3_write_packet,
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
360 mp3_write_trailer,
5236
1403c88b1ce7 Add id3v2 metadata conversion table and use it in mp3 muxer.
cehoyos
parents: 5226
diff changeset
361 .metadata_conv = ff_id3v2_metadata_conv,
234
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
362 };
b99548e3ab84 ID3 parsing and generation in MP3 format
bellard
parents:
diff changeset
363 #endif