ca76a11948
Add a list of generic tags and change demuxers to follow it.
...
Patch by Anton Khirnov, wyskas at gmail dot com
Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
9c5a9e6b48
set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
...
Originally committed as revision 20579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 21:04:18 +00:00
0cd0a22488
Move function that is only used by the MP3 muxer below the corresponding #if.
...
This removes the dependency of the MP2 muxer on the id3v2 object file.
Originally committed as revision 20329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 23:22:23 +00:00
ff06d76acd
Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32.
...
This fixes the build with demuxers disabled.
Originally committed as revision 20327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-19 22:36:57 +00:00
7fd5aeb3e5
Only read ID3v1 tag if ID3v2 isn't present or is empty.
...
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.
Patch by Anton Khirnov, wyskas gmail
Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 21:36:56 +00:00
41770abf86
id3v2: Export all text information frames with correct names.
...
Patch by Anton Khirnov <wyskas at gmail dot com>
Originally committed as revision 20171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 20:10:07 +00:00
078d89a2b0
MP3 muxer: Write all metadata.
...
Patch by Anton Khirnov <wyskas at gmail dot com>
Originally committed as revision 20170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 16:06:00 +00:00
4b4ac5c7a8
Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
...
This fixes ffmpeg-generated files with -acodec ac3 being detected as raw ac3
instead of MPEG.
Originally committed as revision 20075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 10:23:47 +00:00
6378b06208
Add id3v2 metadata conversion table and use it in mp3 muxer.
...
Patch by Anton Khirnov, wyskas gmail
Originally committed as revision 20073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 07:05:03 +00:00
de653ba3bb
Place MP3 demuxer code under appropriate #ifdefs.
...
Fixes compilation with --disable-optimizations --disable-demuxers.
Originally committed as revision 19964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 12:39:19 +00:00
ea25c063c3
10l: set genre default immediately before reading genre tag
...
Originally committed as revision 19867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 23:40:10 +00:00
d891cbb444
Set ID3v1 genre to 0xFF (unknown) by default instead of 0 (Blues).
...
Originally committed as revision 19866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 23:37:54 +00:00
1ac9563075
Slighty tweak mp3 probe threshold to prevent probetest from complaining.
...
Originally committed as revision 19849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 23:03:33 +00:00
50fcd5be36
Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
...
patch by Patrick Dehne, patrick mysonicweb com
Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:03:35 +00:00
7541118286
Move id3v2 parsing code from mp3.c to id3v2.h and id3v2.c.
...
patch by Patrick Dehne, patrick mysonicweb com
Originally committed as revision 19155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 15:26:57 +00:00
f9f2ab8229
Require 4 instead of 3 frames for detecting mp3,
...
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)
Originally committed as revision 18657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 02:58:20 +00:00
bd51c0138a
handle id3v2 'genre' tag formated as '%d'
...
Originally committed as revision 18145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 16:10:37 +00:00
0ffbc258aa
Change a bunch of codec long_names to be more consistent and descriptive.
...
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +00:00
d0f89acf60
Make the MP3 probe weakly claim all files with ID3v2 tags to fix regressions on
...
files with very large tags.
Originally committed as revision 17008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:41:06 +00:00
b3a9e50c10
cosmetics: indentation
...
Originally committed as revision 16957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:26 +00:00
3b1c4a06f6
simplify usage of dstlen as it is not a parameter anymore
...
Originally committed as revision 16956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:17:14 +00:00
ee56cab3f3
cosmetics: indentation
...
Originally committed as revision 16955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:14:28 +00:00
b182eeb08b
use new metadata API in the mp3 muxer
...
Originally committed as revision 16954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:13:03 +00:00
9d98535ceb
use new metadata API in the mp3 demuxer
...
Originally committed as revision 16953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 22:11:56 +00:00
9f5aca8fec
don't support the mp3 extension in the mp2 muxer
...
especially not under any conditionnal
Originally committed as revision 16922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 21:22:12 +00:00
cf92cec7d8
Avoid allocating MPADecodeContext on stack.
...
Instead move relevant fields into MPADecodeHeader and use it
where appropriate.
Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-23 12:09:32 +00:00
38cef58404
Fix a read past end of buffer crash in the mp3 probe
...
Originally committed as revision 16693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 08:00:39 +00:00
ac3ef4a41b
Fix probing of files with ID3v2 tags. Discussed at
...
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-January/059302.html
Originally committed as revision 16688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 21:54:06 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
2ea512a6c2
Factorise id3v2 header parsing from mp3.c to be shared
...
Patch by Alex Converse ( alex converse gmail com )
Originally committed as revision 16615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 12:23:03 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
853a97530e
If we find a VBR tag at the beginning of the file don't attempt to
...
parse it as a valid frame.
patch by (Yoav Steinberg yoav out monfort in co in il)
Originally committed as revision 16421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-04 16:23:18 +00:00
c96bd21227
Change mpeg audio parser so it only sets frame_size, channels and bit_rate
...
after it has a few valid frames.
Fixes issue762
Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 23:50:16 +00:00
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
8212568a1c
Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
...
CONFIG_FOO_MUXER conditionals where appropriate.
Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:45:13 +00:00
1bef65f4fe
Make the id3v1_genre_str array const, not just the strings it points to.
...
Originally committed as revision 14942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 12:45:15 +00:00
ea452b54f0
strcasecmp() requires #include <strings.h>
...
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
58607ca7d2
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
...
Originally committed as revision 14164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:41:11 +00:00
0328995893
All mp3 parsers are buggy fix 2 of n (out of array write, i suspect not exploitable)
...
Originally committed as revision 14070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:04:41 +00:00
d5ae45841f
All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
...
and found by reimar) fix is from reimar + cosmetics by me.
Originally committed as revision 14069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:00:35 +00:00
9b64a036c0
remove useless close funcs
...
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 23:25:04 +00:00
bde15e74de
Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
d9133126d3
Replace some occurrences of 0 with CODEC_ID_NONE.
...
Fixes icc warning #188 : enumerated type mixed with another type
Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 10:30:40 +00:00
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
ccd425e799
Remove unnecessary parentheses from return calls.
...
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 09:16:36 +00:00
8df94c73dc
Another const found by -Wwrite-strings.
...
Originally committed as revision 11847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:01:52 +00:00
2db971135a
return a slightly larger score if we find more than 500 valid mp3 frames in a row
...
Originally committed as revision 11148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 09:26:44 +00:00
5ef5501b71
ensure that the probe code runs in O(n)
...
Originally committed as revision 11147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 08:27:04 +00:00
890d2799c1
remove arbitrary 4096 limit for probing
...
Originally committed as revision 11145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 04:50:01 +00:00
5110d151b6
prevent O(n^2) execution of ff_mpa_decode_header() for valid mp3 files
...
Originally committed as revision 11144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 04:49:01 +00:00
Anton Khirnov
Baptiste Coudurier
Diego Biurrun
Reimar Döffinger
Justin Ruggles
Michael Niedermayer
Patrick Dehne
Aurelien Jacobs
Alex Converse
Andreas Öman
Yoav Steinberg
Stefano Sabatini
Carl Eugen Hoyos