Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
AgeCommit message (Collapse)Author
2014-06-03fix various typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14Merge commit '831a1180785a786272cdcefb71566a770bfb879e'Michael Niedermayer
* commit '831a1180785a786272cdcefb71566a770bfb879e': Update dsputil- and SIMD-related comments to match reality more closely Conflicts: libavcodec/x86/hpeldsp.asm libavutil/arm/float_dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13Update dsputil- and SIMD-related comments to match reality more closelyDiego Biurrun
2014-02-28latm: Always reconfigure if no extradata was set previouslyHendrik Leppkes
AAC LOAS can have new audio config objects in the stream itself. Make sure the decoder reconfigures itself when the first one arrives midstream. Bug-Id: 644 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-12Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'Michael Niedermayer
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6': aacdec: set AVFrame sample_rate Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12aacdec: set AVFrame sample_rateJohn Stebbins
AVFrame.sample_rate is set in ff_get_buffer, but aacdec calls ff_get_buffer before the samplerate is known. So it needs to be set again before returning the frame.
2014-02-03avcodec/aacdec: Fix pulse position checks in decode_pulses()Michael Niedermayer
Fixes out of array read Fixes: asan_static-oob_1efed25_1887_cov_2013541199_HeyYa_RA10_AAC_192K_30s.rm Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-19avcodec/aacdec: Dont fail if channels arent known yetMichael Niedermayer
Fixes Ticket3312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'Michael Niedermayer
* commit '7f29644108c5fbd80f160930b31b78b8704c1a49': aac: Fix low delay windowing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'Michael Niedermayer
* commit 'b2212dec0f011893ec68eecaa990170fa24050d7': aac: Fix TNS decoding for the 512 sample window family. also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit causes a mismatch with the reference pcm file The test will be reenabled after all fixes and with a new pcm reference Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05aac: Fix low delay windowing.Alex Converse
AAC LD uses a low overlap sine window instead of a KBD window.
2014-01-05aac: Fix TNS decoding for the 512 sample window family.Alex Converse
2013-12-18avcodec/aacdec: default to non-wide 7.1 in non-strict modeAnssi Hannula
AAC specification has 7.1(wide) as a default layout for 8-channel streams (channel config 7). However, at least Nero AAC encoder encodes non-wide 7.1 streams using the default channel config 7, mapping the side channels of the original audio stream to the second AAC_CHANNEL_FRONT pair in the AAC stream. Similarly, e.g. FAAD decodes the second AAC_CHANNEL_FRONT pair as side channels, therefore decoding the incorrect streams as if they were correct (and as the encoder intended). FFmpeg currently decodes such files by-the-spec, i.e. after decoding the original front pair will be in AV_CH_FRONT_x_OF_CENTER and the original side pair will be in AV_CH_FRONT_x. As actual intended 7.1(wide) streams are very rare while misencoded 7.1 files actually exist in the wild, default to assuming a 7.1 layout was intended unless in strict mode. Fixes playback of e.g. 8_Channel_ID.m4a in samples. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacdec: Set the profile during decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04aacdec: Set the profile during decodingGian-Carlo Pascutto
Previously the profile would not be set if the bitstream needs to be decoded to know the profile. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31aacdec: fix small comment, update decoder features commentCompn
2013-10-25aacdec: Fix calls to avpriv_report_missing_feature().Alex Converse
It does not take log level as an argument.
2013-10-23avcodec/aacdec: fix more avpriv_report_missing_feature() argumentsMichael Niedermayer
Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23avcodec/aacdec: fix avpriv_report_missing_feature() argumentsMichael Niedermayer
Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aac: Add support for Enhanced AAC Low Delay (ER AAC ELD). Conflicts: Changelog libavcodec/aacdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'Michael Niedermayer
* commit 'f457edb69794c7e13b3630456d72f7942fff19f7': aacdec: Use avpriv_report_missing_feature() instead of custom logging. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).Alex Converse
This does not include support for LD SBR, epTool, data resilience, nor the 960 transform family.
2013-10-23aacdec: Use avpriv_report_missing_feature() instead of custom logging.Alex Converse
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-09-19Merge commit '1914e6f010b3320025c7b692aaea51d9b9a992a8'Michael Niedermayer
* commit '1914e6f010b3320025c7b692aaea51d9b9a992a8': aacdec: Add support for LD (Low Delay) AAC Conflicts: Changelog libavcodec/aacdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-19Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'Michael Niedermayer
* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734': aacdec: Add support for Error Resilience syntax. Conflicts: Changelog libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18aacdec: Add support for LD (Low Delay) AACAlex Converse
2013-09-18aacdec: Add support for Error Resilience syntax.Alex Converse
This does not add support for any error resilience tools.
2013-08-05Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'Michael Niedermayer
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'Michael Niedermayer
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65': aac: Check init_get_bits return value Conflicts: libavcodec/aacdec.c See: 73abc3a634d84e4cc8951787323b594c5476e4a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-04aac: Forward errors properly in aac_decode_frame_intLuca Barbato
Incidentally also remove a warning.
2013-08-04aac: Check init_get_bits return valueLuca Barbato
Some code paths can call it with invalid length. CC: libav-stable@libav.org
2013-07-26Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'Michael Niedermayer
* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3': cosmetics: Add '0' to float constants ending in '.'. Conflicts: libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-25cosmetics: Add '0' to float constants ending in '.'.Diego Biurrun
2013-06-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aac: return meaningful errors Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'Michael Niedermayer
* commit '6d8629aac13692447b54eac795bf74007ebf8987': aac: K&R formatting cosmetics Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-27aac: return meaningful errorsLuca Barbato
2013-06-27aac: K&R formatting cosmeticsLuca Barbato
2013-05-04aacdec: free frame buffer if no audio was decodedHendrik Leppkes
If no decoding error was detected, but still no audio was decoded, the frame needs to be free'ed, or it will leak. Fixes part of ticket #2095 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aac: check the maximum number of channels Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28aac: check the maximum number of channelsLuca Barbato
Broken bitstreams could report a larger than specified number of channels and cause outbound writes. CC:libav-stable@libav.org
2013-03-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: av_log_missing_feature(1) ---> avpriv_request_sample() Conflicts: libavcodec/aacsbr.c libavcodec/amrnbdec.c libavcodec/takdec.c libavcodec/tta.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'Michael Niedermayer
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605': avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() rsodec: Use avpriv_report_missing_feature() where appropriate Conflicts: libavcodec/anm.c libavcodec/mlpdec.c libavcodec/pictordec.c libavcodec/sunrast.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'Michael Niedermayer
* commit '63d744e2be39466e3a734c2987cd713e0bac101e': av_log_missing_feature() ---> avpriv_report_missing_feature() Conflicts: libavcodec/aacdec.c libavcodec/tta.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()Diego Biurrun
2013-03-14avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()Diego Biurrun
2013-03-13av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 07:38:09 +0300