FFmpeg

Commit Graph

Author	SHA1	Message	Date
Alexander Kojevnikov	eae0879d96	mp3dec: Fix VBR bit rate parsing When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>	12 years ago
Alexander Kojevnikov	29d8cd265a	mp3dec: Fix VBR bit rate parsing When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	7a84664ffe	mp3_read_probe: make buffer related pointers const Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	91295f03d4	mp3dec: remove unused variable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	b6267901c4	mp3demux: Rewrite xing TOC based seeking The libav code depends on mp3 startcodes only occuring at the start of frames. But there is nothing in mp3 that prevents them occuring elsewhere by chance. Thus the code would fail randomly, the new code searches for 3 consecutive valid frames. If this turns out to be still insufficient the number can be raised further, or additional checks added. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Michael Niedermayer	6d87781758	mp3dec: fix seeking without xing TOC fixes regression from the xing toc support Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Anton Khirnov	50d1f4437b	mp3dec: read Xing frame TOC index	12 years ago
Anton Khirnov	2d1a1a7f62	mp3dec: use named constants for Xing header flags	12 years ago
Anton Khirnov	36ef5369ee	Replace all CODEC_ID_* with AV_CODEC_ID_*	12 years ago
Diego Biurrun	0177b7d23a	Improve descriptiveness of a number of codec and container long names	12 years ago
Anton Khirnov	f73e3938ac	mp3dec: forward errors for av_get_packet(). Don't invent a bogus EIO error. The code now doesn't check for ret == 0, but that check is redundant, av_get_packet() never returns 0.	12 years ago
Anton Khirnov	67b1156fe8	mp3dec: remove a pointless local variable.	12 years ago
Anton Khirnov	61f8bb74f3	mp3dec: remove commented out cruft.	12 years ago
Michael Niedermayer	ea8c12c90f	mp3dec: mark as AVSTREAM_PARSE_FULL_RAW Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Michael Niedermayer	57d5a224ce	mp3enc: add lame tag with start padding info Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Michael Niedermayer	19ff479f69	mp3dec: parse initial silence padding information from lame tag And pass the information on to the lavf core. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	13 years ago
Ronald S. Bultje	64bde80563	mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.	13 years ago
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

1 2

55 Commits (85f115b5d8d7d8f39d9a2934242b108f5b7c891e)