Michael Niedermayer
7da0a07283
mp3demux: fix id3 discard code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
f46185c289
mp3demux: fix off by 1 error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Reimar Döffinger
7effbee66c
Mark truncated packets as corrupt in av_get_packet.
...
Manually remove that flag again for formats that read an arbitrary
amount of data and thus truncation is not an error.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Martin Storsjö
20234a4bd7
cosmetics: Align muxer/demuxer declarations
...
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Michael Niedermayer
2b07f572af
mp3_probe: consider id3 tags to be low scoring mp3.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Ingo Brückl
c05e2be9a2
mp3dec: Fix reading file size and frames in VBRI headers
...
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
13 years ago
Clément Bœsch
6a3cc21242
mp3dec: fix truncating packet error message while decoding a complete MP3.
...
The MP3 demuxer split the data in packets of 1024B which are later split
in MP3 frames by the MPEG audio parser. The last read is "truncated",
but this should not raise any error.
Solution-by: Michael Niedermayer
13 years ago
Anton Khirnov
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Michael Niedermayer
b51eaf3b8c
mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
...
on mp3 streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
82ab61f901
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
...
Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
ff_mpegaudio_decode_header.
13 years ago
Anton Khirnov
3b3bbdd3e6
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
...
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
13 years ago
Michael Niedermayer
c83442b057
mp3demux: pass on error code on packet read.
...
Reported-by: Tanami, Ohad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Ingo Brückl
5d305c9398
Correct determination of file size and frames in VBRI headers
...
The fields "Number of Bytes" and "Number of Frames" are mixed up. "Bytes"
come first, "Frames" behind.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
14 years ago
Mans Rullgard
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
d2d67e424f
Remove all uses of now deprecated metadata functions.
14 years ago
Anton Khirnov
e42500cb4f
lavf: replace some more avio_seek(SEEK_CUR) with avio_skip
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
)
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
)
14 years ago
Anton Khirnov
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Diego Elio Pettenò
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
)
14 years ago
Diego Elio Pettenò
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
14 years ago
Clément Bœsch
204a18151c
Move ID3v1 skip from decoder to demuxer
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 045b80e52d
)
14 years ago
Clément Bœsch
045b80e52d
Move ID3v1 skip from decoder to demuxer
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
Anton Khirnov
baa69f8a84
Split mp3 demuxer and muxer into separate files.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d08928bbea
)
14 years ago
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