Michael Niedermayer
							
						 
						
							
							
							
								
							
								df91af140c 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Consume more than 0 bytes in case of the unsupported mp3adu case  
							
							 
							
							 
							
							
								
							
							
							Fixes: Timeout
Fixes: 10966/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADU_fuzzer-5348695024336896
Fixes: 10969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5691669402877952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						7 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								0f4c3b0b8e 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Initialize poutbuf*  
							
							 
							
							 
							
							
								
							
							
							Possibly fixes: null pointer dereference
Possibly fixes: 9352/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5146068961460224
Fixes: Heap-use-after-free
Fixes: 9453/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5137954375729152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						7 years ago  
					 
				
					
						
							
							
								   Dale Curtis
							
						 
						
							
							
							
								
							
								42323c3e3a 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Skip APE tags when parsing mp3 packets.  
							
							 
							
							 
							
							
								
							
							
							Otherwise the decoder will throw "Missing header" errors when the
packets are sent for decoding.
This is similar to 89a420b71b .
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						7 years ago  
					 
				
					
						
							
							
								   Andreas Cadhalpun
							
						 
						
							
							
							
								
							
								5249706e9d 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: don't return AVERROR_PATCHWELCOME  
							
							 
							
							 
							
							
								
							
							
							The API does not allow returning AVERROR codes.
It triggers an assert in av_parser_parse2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> 
							
						 
						9 years ago  
					 
				
					
						
							
							
								   Anton Khirnov
							
						 
						
							
							
							
								
							
								de9e199a03 
								
							
								 
							
						 
						
							
							
								
								lavc: make avpriv_mpa_decode_header private on next bump  
							
							 
							
							 
							
							
								
							
							
							It's not used by anything outside of lavc anymore. 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								fb4d350ff3 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Update comment to match code  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								89a420b71b 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Discard ID3v1 tag at the end  
							
							 
							
							 
							
							
								
							
							
							Ideally this should be discarded by the demuxer but this is not
possible without fully parsing which would be then very similar
to this. The current ID3v1 discard code in the demuxer does not work
and will be removed in a subsequent commit
The discard code could be adjusted if needed to also discard tags at
other locations than the end or to limit this possibly to input
from the mp3 demuxer or even to move the discarding to the
decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Gilles Chanteperdrix
							
						 
						
							
							
							
								
							
								5cbae5651d 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: add MP3 ADU headers parser  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Martin Storsjö <martin@martin.st> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Gilles Chanteperdrix
							
						 
						
							
							
							
								
							
								8ca098f444 
								
							
								 
							
						 
						
							
							
								
								avcocdec/mpegaudio_parser: add MP3 ADU headers parser  
							
							 
							
							 
							
							
								
							
							
							Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						10 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								817663897e 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation  
							
							 
							
							 
							
							
								
							
							
							Fixes Ticket3918
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								c33351f3e7 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong  
							
							 
							
							 
							
							
								
							
							
							Fixes mp1/mp3 in mp4 misdetection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								5669ae8401 
								
							
								 
							
						 
						
							
							
								
								avcodec/mpegaudio_parser: treat codec_id like the other parameters  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						11 years ago  
					 
				
					
						
							
							
								   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
							
						 
						
							
							
							
								
							
								d30ee5ef59 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: Don't ignore information from the first frame  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						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
							
						 
						
							
							
							
								
							
								93b240f4a5 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: reset state to prevent it to be random  
							
							 
							
							 
							
							
								
							
							
							Fixes Ticket1718
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						13 years ago  
					 
				
					
						
							
							
								   Martin Storsjö
							
						 
						
							
							
							
								
							
								1d9c2dc89a 
								
							
								 
							
						 
						
							
							
								
								Don't include common.h from avutil.h  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Martin Storsjö <martin@martin.st> 
							
						 
						13 years ago  
					 
				
					
						
							
							
								   Anton Khirnov
							
						 
						
							
							
							
								
							
								36ef5369ee 
								
							
								 
							
						 
						
							
							
								
								Replace all CODEC_ID_* with AV_CODEC_ID_*  
							
							 
							
							
								
							
							
						 
						13 years ago  
					 
				
					
						
							
							
								   Justin Ruggles
							
						 
						
							
							
							
								
							
								0b8b7db01b 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: do not ignore information from the first parsed frame  
							
							 
							
							 
							
							
								
							
							
							Update some demuxing and seeking fate tests. 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								6776a8f189 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: be less picky about the start position  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Justin Ruggles
							
						 
						
							
							
							
								
							
								7575ffac8a 
								
							
								 
							
						 
						
							
							
								
								mpegaudio parser: set duration instead of frame_size  
							
							 
							
							
								
							
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Anton Khirnov
							
						 
						
							
							
							
								
							
								5511ad14fe 
								
							
								 
							
						 
						
							
							
								
								lavc: use designated initialisers for parsers.  
							
							 
							
							
								
							
							
						 
						14 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. 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								b37dfe181c 
								
							
								 
							
						 
						
							
							
								
								mpegaudio_parser: be less picky on the start position  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Mans Rullgard
							
						 
						
							
							
							
								
							
								f255a28d14 
								
							
								 
							
						 
						
							
							
								
								mpegaudio: clean up #includes  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Mans Rullgard <mans@mansr.com> 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Mans Rullgard
							
						 
						
							
							
							
								
							
								0199e00bc8 
								
							
								 
							
						 
						
							
							
								
								mpegaudio: move all header parsing to mpegaudiodecheader.[ch]  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Mans Rullgard <mans@mansr.com> 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Mans Rullgard
							
						 
						
							
							
							
								
							
								c2a16e44f8 
								
							
								 
							
						 
						
							
							
								
								mpegaudio: remove unused version of SAME_HEADER_MASK  
							
							 
							
							 
							
							
								
							
							
							Signed-off-by: Mans Rullgard <mans@mansr.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  
					 
				
					
						
							
							
								   Diego Elio Pettenò
							
						 
						
							
							
							
								
							
								e7e2df27f8 
								
							
								 
							
						 
						
							
							
								
								Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.  
							
							 
							
							 
							
							
								
							
							
							None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69 ) 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Diego Elio Pettenò
							
						 
						
							
							
							
								
							
								d36beb3f69 
								
							
								 
							
						 
						
							
							
								
								Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.  
							
							 
							
							 
							
							
								
							
							
							None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com> 
							
						 
						14 years ago  
					 
				
					
						
							
							
								   Art Clarke
							
						 
						
							
							
							
								
							
								bda1ad1e73 
								
							
								 
							
						 
						
							
							
								
								Cleanup properly at the end of MPEG Audio parsing.  
							
							 
							
							 
							
							
								
							
							
							Patch by Art Clarke (aclarke AT xuggle com)
Originally committed as revision 19327 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						16 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								2073fc84ff 
								
							
								 
							
						 
						
							
							
								
								Rewrite mp3 parser. New code is much simpler and does not drop  
							
							 
							
							 
							
							
								
							
							
							stuff at random.
Originally committed as revision 19300 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						16 years ago  
					 
				
					
						
							
							
								   Carl Eugen Hoyos
							
						 
						
							
							
							
								
							
								ee273f98e8 
								
							
								 
							
						 
						
							
							
								
								Cosmetics: Fix indentation after r18741.  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 18742 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						16 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								266c1d901f 
								
							
								 
							
						 
						
							
							
								
								Do not discard mp3 frames in the parser after a broken frame.  
							
							 
							
							 
							
							
								
							
							
							Fixes issue1044.
This may cause regressions with broken streams, if you find any, please report!
Originally committed as revision 18741 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						16 years ago  
					 
				
					
						
							
							
								   Daniel Verkamp
							
						 
						
							
							
							
								
							
								5ef251e504 
								
							
								 
							
						 
						
							
							
								
								Add missing av_cold in static init/close functions.  
							
							 
							
							 
							
							
								
							
							
							Patch by Daniel Verkamp daniel at drv dot nu.
Originally committed as revision 17526 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 
							
						 
						17 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 
							
						 
						17 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								a14d138cb8 
								
							
								 
							
						 
						
							
							
								
								Let the mpeg audio parser correct the codec_id.  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 16582 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						17 years ago  
					 
				
					
						
							
							
								   Michael Niedermayer
							
						 
						
							
							
							
								
							
								cb595b7f02 
								
							
								 
							
						 
						
							
							
								
								Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						17 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 
							
						 
						17 years ago  
					 
				
					
						
							
							
								   Måns Rullgård
							
						 
						
							
							
							
								
							
								d8e76049d6 
								
							
								 
							
						 
						
							
							
								
								indent  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 9553 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Måns Rullgård
							
						 
						
							
							
							
								
							
								5ffcb1be1f 
								
							
								 
							
						 
						
							
							
								
								set sample rate in more logical place, kill warning  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 9552 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Ramiro Polla
							
						 
						
							
							
							
								
							
								2c124cb65c 
								
							
								 
							
						 
						
							
							
								
								Use AV_xx throughout libavcodec  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Aurelien Jacobs
							
						 
						
							
							
							
								
							
								ca6e50afc1 
								
							
								 
							
						 
						
							
							
								
								add a ff_ prefix to some mpegaudio funcs  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Aurelien Jacobs
							
						 
						
							
							
							
								
							
								4bd8e17c8d 
								
							
								 
							
						 
						
							
							
								
								loosen dependencies over mpegaudiodec  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Aurelien Jacobs
							
						 
						
							
							
							
								
							
								c53d2d9042 
								
							
								 
							
						 
						
							
							
								
								make some parser parameters const to avoid casting const to non-const  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 8921 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Aurelien Jacobs
							
						 
						
							
							
							
								
							
								89550b2d68 
								
							
								 
							
						 
						
							
							
								
								avoid a 'discards qualifiers from pointer' warning  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 8900 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago  
					 
				
					
						
							
							
								   Aurelien Jacobs
							
						 
						
							
							
							
								
							
								0cb4172803 
								
							
								 
							
						 
						
							
							
								
								move mpegaudio_parser in it's own file  
							
							 
							
							 
							
							
								
							
							
							Originally committed as revision 8899 to svn://svn.ffmpeg.org/ffmpeg/trunk 
							
						 
						18 years ago