Anton Khirnov
d08928bbea
Split mp3 demuxer and muxer into separate files.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Michael Niedermayer
7cf0472e6a
Fix assertion failure due to frames being 0 in mp3 vbr bitrate calculation.
...
Fixes issue 2442.
Originally committed as revision 26121 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
b72daad062
Remove hack in MP3 probe that was meant as a work-around for large
...
ID3v2 tags which no longer works since ID3v2 handling was moved to
generic code.
In addition, in caused false-positives for all files starting with
one or more 0-bytes.
Originally committed as revision 25929 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
ad7768f4c4
add ff_ prefix to metadata_conv()
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
6612d8cf31
Move handling of ID3v2 to common utils.c code, reducing code duplication
...
and supporting it for more formats, fixing issue 2258.
Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alexander Kojevnikov
2a758efe31
Make frames unsigned.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24540 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Alexander Kojevnikov
49d7ef282d
Show correct bitrate for VBR MP3 files.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
James Darnley
90d9d97d4d
Fix ID3v1 tags in mp3 files
...
Patch by James Darnley, james dot darnley at gmail
Originally committed as revision 24189 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Karcher
3a1350e8d9
Generalize ID3v2 functions to support ID3v2-like ID headers with a
...
different magic in the header (mainly targeted to Sony's .oma/.aa3
format).
Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de
Originally committed as revision 23583 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
2293a2e67f
Set AVFMT_NOTIMESTAMPS flag for mp3 muxer
...
Fixes issue 1026
Originally committed as revision 22916 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
5692ed3ad4
Many mp3s seem to contain padding after id3 tags that is not considered in the
...
tag size. Skip this to make the format probing quicker.
Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Anton Khirnov
ed7694d8cf
Set lavf identification string globally in av_write_header(), rather
...
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Andreas Öman
80242f9bdb
mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
...
Originally committed as revision 21737 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Anton Khirnov
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
15 years ago
Baptiste Coudurier
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
15 years ago
Diego Biurrun
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
15 years ago
Diego Biurrun
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
15 years ago
Anton Khirnov
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
15 years ago
Anton Khirnov
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
15 years ago
Anton Khirnov
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
15 years ago
Reimar Döffinger
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
15 years ago
Anton Khirnov
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
15 years ago
Diego Biurrun
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
15 years ago
Justin Ruggles
ea25c063c3
10l: set genre default immediately before reading genre tag
...
Originally committed as revision 19867 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Justin Ruggles
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
15 years ago
Michael Niedermayer
1ac9563075
Slighty tweak mp3 probe threshold to prevent probetest from complaining.
...
Originally committed as revision 19849 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Patrick Dehne
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
16 years ago
Patrick Dehne
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
16 years ago
Michael Niedermayer
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
16 years ago
Aurelien Jacobs
bd51c0138a
handle id3v2 'genre' tag formated as '%d'
...
Originally committed as revision 18145 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
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
16 years ago
Alex Converse
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
16 years ago
Aurelien Jacobs
b3a9e50c10
cosmetics: indentation
...
Originally committed as revision 16957 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
3b1c4a06f6
simplify usage of dstlen as it is not a parameter anymore
...
Originally committed as revision 16956 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
ee56cab3f3
cosmetics: indentation
...
Originally committed as revision 16955 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
b182eeb08b
use new metadata API in the mp3 muxer
...
Originally committed as revision 16954 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
9d98535ceb
use new metadata API in the mp3 demuxer
...
Originally committed as revision 16953 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
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
16 years ago
Andreas Öman
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
16 years ago
Alex Converse
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
16 years ago
Alex Converse
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
16 years ago
Diego Biurrun
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Alex Converse
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
16 years ago
Aurelien Jacobs
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
16 years ago
Yoav Steinberg
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
16 years ago
Michael Niedermayer
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
16 years ago
Diego Biurrun
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
16 years ago
Diego Biurrun
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
16 years ago