summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
Commit message (Collapse)AuthorAge
* Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'Michael Niedermayer2015-02-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee964145b5d229571e00bf6883a44189d02babe2': lavc: remove unused traces of fmtconvert usage Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/atrac3.c libavcodec/vorbisdec.c libavcodec/wma.c libavcodec/wma.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove unused traces of fmtconvert usageAnton Khirnov2015-02-28
| | | | | | | | | | Those decoders have been switched to float output and so do not use fmtconvert anymore.
* | Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | | | | | | | * commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e': aacdec: Support for ER AAC ELD 480. Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Support for ER AAC ELD 480.Alex Converse2015-02-03
| | | | | | | | Based in part on work from Niel van der Westhuizen <espes@pequalsnp.com>.
* | Merge commit '7640c4a371a97899dfb443d980fd0bf8ac587754'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | * commit '7640c4a371a97899dfb443d980fd0bf8ac587754': aacdec: Tables for length 480 AAC ELD. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Tables for length 480 AAC ELD.Niel van der Westhuizen2015-02-03
| |
* | Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | | | | | | | * commit '0ee2573347ecdb9cb5656001f7201d819eec16d8': aacdec: Support for ER AAC in LATM Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Support for ER AAC in LATMNiel van der Westhuizen2015-02-03
| |
* | Merge commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | * commit 'edd9ea3ffba1d5873dead1c57c74b1e3cc912167': aacdec: Refactor aac_er_decode_frame. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Refactor aac_er_decode_frame.Alex Converse2015-02-03
| |
* | Merge commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53'Michael Niedermayer2015-02-04
|\| | | | | | | | | | | | | * commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53': aacdec: Refactor decode_ics_info. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Refactor decode_ics_info.Alex Converse2015-02-03
| |
* | avcodec/aacdec: remove unneeded #include, theres no assert() in aacdecMichael Niedermayer2015-01-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: reduce noisiness of missing channel elementsMichael Niedermayer2014-12-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | * commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a': aac: Simplify decode_mid_side_stereo Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Simplify decode_mid_side_stereoLuca Barbato2014-12-02
| | | | | | | | | | Might spare few cycles if the compiler is naive and makes the function more readable.
| * aacdec: avoid an out-of-bounds writeVittorio Giovara2014-11-24
| | | | | | | | | | | | | | Also move the check in the case it is actually used. CC: libav-stable@libav.org Bug-Id: CID 1087090
* | avcodec/aacdec: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-12-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: Skip processing channel elements which have not been presentMichael Niedermayer2014-11-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: Add table of profile namesMichael Niedermayer2014-11-07
| | | | | | | | | | | | based on tables of aac encoders from libavcodec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: print extension type when startcode debugging is onMichael Niedermayer2014-11-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'Michael Niedermayer2014-11-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2': aacdec: add default case in channel layout Conflicts: libavcodec/aacdec.c Note, the default case is currently unreachable See: a48b890392aa22033f182421ba9e3f3b3256461d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: add default case in channel layoutVittorio Giovara2014-11-04
| | | | | | | | Bug-Id: CID 732291
* | avcodec/aacdec: warn user when remapping streams.Benoit Fouet2014-10-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: print element types when debug startcode is setMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio.Benoit Fouet2014-10-13
| | | | | | | | | | | | Fixes ticket #3930 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '831a1180785a786272cdcefb71566a770bfb879e'Michael Niedermayer2014-03-13
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * Update dsputil- and SIMD-related comments to match reality more closelyDiego Biurrun2014-03-13
| |
| * latm: Always reconfigure if no extradata was set previouslyHendrik Leppkes2014-02-28
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6': aacdec: set AVFrame sample_rate Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: set AVFrame sample_rateJohn Stebbins2014-02-12
| | | | | | | | | | | | 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.
* | avcodec/aacdec: Fix pulse position checks in decode_pulses()Michael Niedermayer2014-02-03
| | | | | | | | | | | | | | 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>
* | avcodec/aacdec: Dont fail if channels arent known yetMichael Niedermayer2014-01-19
| | | | | | | | | | | | Fixes Ticket3312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | * commit '7f29644108c5fbd80f160930b31b78b8704c1a49': aac: Fix low delay windowing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Fix low delay windowing.Alex Converse2014-01-04
| | | | | | | | AAC LD uses a low overlap sine window instead of a KBD window.
* | Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * aac: Fix TNS decoding for the 512 sample window family.Alex Converse2014-01-04
| |
* | avcodec/aacdec: default to non-wide 7.1 in non-strict modeAnssi Hannula2013-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun2013-11-23
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-04
|\| | | | | | | | | | | | | * qatar/master: aacdec: Set the profile during decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Set the profile during decodingGian-Carlo Pascutto2013-11-04
| | | | | | | | | | | | | | 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>
| * aacdec: Fix calls to avpriv_report_missing_feature().Alex Converse2013-10-25
| | | | | | | | It does not take log level as an argument.
* | aacdec: fix small comment, update decoder features commentCompn2013-10-31
| |
* | avcodec/aacdec: fix more avpriv_report_missing_feature() argumentsMichael Niedermayer2013-10-23
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacdec: fix avpriv_report_missing_feature() argumentsMichael Niedermayer2013-10-23
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).Alex Converse2013-10-23
| | | | | | | | | | This does not include support for LD SBR, epTool, data resilience, nor the 960 transform family.
* | Merge commit 'f457edb69794c7e13b3630456d72f7942fff19f7'Michael Niedermayer2013-10-23
|\| | | | | | | | | | | | | * commit 'f457edb69794c7e13b3630456d72f7942fff19f7': aacdec: Use avpriv_report_missing_feature() instead of custom logging. Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 15:20:33 +0000