aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacsbr.c
Commit message (Collapse)AuthorAgeFilesLines
* aacsbr: break infinite loop in sbr_hf_calc_npatchesAndreas Cadhalpun2015-05-071-1/+7
| | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/aacsbr: Replace impossible condition by assertMichael Niedermayer2015-03-171-1/+2
| | | | | | bits can have a value of 0 or 1 they are never -1 or otherwise negative Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'Michael Niedermayer2015-03-171-4/+4
|\ | | | | | | | | | | | | | | * commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0': aacsbr: Fix type for index variable See: a15adabdd32c8736c143fcbef36a0f4a75f772f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: Fix type for index variableVittorio Giovara2015-03-171-3/+3
| | | | | | | | | | | | Prevents unsigned overflow and variable truncation. Bug-Id: CID 603186
| * aacsbr: silence message for SBR extension "padding".Reimar Döffinger2015-02-031-1/+3
| | | | | | | | | | | | | | | | | | Some files contain a few additional, all-0 bits. Check for that case and don't print incorrect "not supported" message. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | avcodec/aacdec: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-12-021-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '208f3abb917757743313da0da714e525e03159d2'Michael Niedermayer2014-11-241-1/+1
|\| | | | | | | | | | | | | | | * commit '208f3abb917757743313da0da714e525e03159d2': aacsbr: always initialize max_qmf_subbands See: c6d3b3be1555257ff3f88da6b8dca2158dad2a85 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: always initialize max_qmf_subbandsVittorio Giovara2014-11-241-1/+1
| | | | | | | | Fixes a wordly warning from clang -Wsometimes-uninitialized.
* | Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'Michael Niedermayer2014-11-041-1/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '930ffd46e1e742674aa7cc1c2450020c63b5015b': aacsbr: change order of operation to prevent out of array read Conflicts: libavcodec/aacsbr.c See: c2340831b8e9032716acb0aab4893d3cc500213a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: change order of operation to prevent out of array readMichael Niedermayer2014-11-041-1/+2
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732250
* | Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'Michael Niedermayer2014-11-041-2/+8
|\| | | | | | | | | | | | | * commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1': aacsbr: treat 1-d arrays as such Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: treat 1-d arrays as suchVittorio Giovara2014-11-031-2/+8
| | | | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238802 / CID 1238793 / CID 1238785 CID 1238808 / CID 1238809
* | aacsbr: support hardcoding tables.Reimar Döffinger2014-09-061-8/+2
| | | | | | | | | | | | | | | | For sbr_qmf_window_us there is even a question if it maybe should be fully hardcoded all the time. Since half of it is coded, it ends up in .data and not .bss. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-261-7/+14
|\| | | | | | | | | | | | | | | | | | | * qatar/master: aacsbr: Add some const casts to silence warnings in ff_sbr_apply() Conflicts: libavcodec/aacsbr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: Add some const casts to silence warnings in ff_sbr_apply()Diego Biurrun2013-11-251-7/+14
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-041-0/+1
|\| | | | | | | | | | | | | * qatar/master: aacdec: Set the profile during decoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Set the profile during decodingGian-Carlo Pascutto2013-11-041-0/+1
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()Diego Biurrun2013-03-131-1/+1
| |
* | Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'Michael Niedermayer2013-03-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * 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>
| * av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun2013-03-131-1/+1
| |
* | Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer2013-03-081-7/+6
| | | | | | | | | | | | | | | | pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
* | aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer2013-03-081-3/+19
| | | | | | | | | | | | | | | | | | | | This prevents various values from becoming stuck at NAN and output to become silent If someone knows a cleaner solution, thats welcome! Fixes Ticket2335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: Reconfigure output as needed, disable pop_output_configuration()Michael Niedermayer2013-03-071-6/+7
| | | | | | | | | | | | Fixes Ticket1694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this ↵Michael Niedermayer2013-02-261-0/+2
| | | | | | | | | | | | function Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: optimization for float aac decoder (sbr module)Mirjana Vulin2013-02-211-4/+26
| | | | | | | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer2013-02-091-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '218aefce4472dc02ee3f12830a9a894bf7916da9': dsputil: Move LOCAL_ALIGNED macros to libavutil Conflicts: libavcodec/dvdec.c libavcodec/imc.c libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move LOCAL_ALIGNED macros to libavutilDiego Biurrun2013-02-081-0/+1
| |
* | Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer2013-01-231-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '42d324694883cdf1fff1612ac70fa403692a1ad4': floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp. Conflicts: libavcodec/arm/dsputil_init_vfp.c libavcodec/arm/dsputil_vfp.S libavcodec/dsputil.c libavcodec/ppc/float_altivec.c libavcodec/x86/dsputil.asm libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.Ronald S. Bultje2013-01-221-2/+2
| | | | | | | | | | | | Now, nellymoserenc and aacenc no longer depends on dsputil. Independent of this patch, wmaprodec also does not depend on dsputil, so I removed it from there also.
* | Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'Michael Niedermayer2013-01-231-5/+5
|\| | | | | | | | | | | | | | | | | | | | | * commit '55aa03b9f8f11ebb7535424cc0e5635558590f49': floatdsp: move vector_fmul_add from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * floatdsp: move vector_fmul_add from dsputil to avfloatdsp.Ronald S. Bultje2013-01-221-5/+5
| |
* | Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'Michael Niedermayer2012-12-071-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152': fate: dpcm: Add dependencies SBR DSP x86: implement SSE sbr_hf_gen AAC SBR: use AVFloatDSPContext's vector_fmul fate: image: Add dependencies Changelog: add an entry for deprecating the avconv -vol option x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32 Conflicts: Changelog libavutil/x86/float_dsp.asm tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AAC SBR: use AVFloatDSPContext's vector_fmulChristophe Gisquet2012-12-071-5/+6
| | | | | | | | | | | | Around 5% speedup on the code block using 'vector_fmul_add's. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'Michael Niedermayer2012-12-031-10/+11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16': h264: error out on unset current_picture_ptr for h->current_slice > 0 avprobe: report per stream bit rate if set by the decoder aac: avoid a memcpy in sbr_qmf_analysis Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: avoid a memcpy in sbr_qmf_analysisChristophe Gisquet2012-12-021-10/+11
| | | | | | | | | | | | | | Swapping buffer indices allows saving one memcpy that accounts for 1% of the runtime, according to oprofile. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'Michael Niedermayer2012-11-261-4/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa': aacdec: use float planar sample format for output Conflicts: libavcodec/aacdec.c libavcodec/aacsbr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: use float planar sample format for outputJustin Ruggles2012-11-251-4/+2
| |
* | aacsbr: check sample_rate before using it, fix division by 0Michael Niedermayer2012-11-201-3/+3
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: fix integer overflowMichael Niedermayer2012-11-041-1/+1
| | | | | | | | | | Fixes CID603186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer2012-10-231-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b8899ac3233b4f7af83ded0dc032fad8902d714': fate: Declare avcodec/avformat deps in the respective Makefile snippets fate: Add dependencies for WMA and WavPack tests Improve wording and spelling of av_log_missing_feature messages. lavu: remove disabled FF_API_AV_FIFO_PEEK cruft Conflicts: libavcodec/aacsbr.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Improve wording and spelling of av_log_missing_feature messages.Diego Biurrun2012-10-231-2/+2
| |
* | Fix various uses of av_log_missing_feature()Michael Niedermayer2012-10-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: change order of operation to prevent out of array readMichael Niedermayer2012-10-131-1/+1
| | | | | | | | | | Fixes CID732250 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: remove unused variablesMans Rullgard2012-06-031-5/+0
| |
* | aacsbr: optimize sine level additionMichael Niedermayer2012-06-031-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Based-on commit by Måns Rullgård <mans@mansr.com> original: 1424 decicycles in phi, 1024 runs, 0 skips mans code: 1104 decicycles in phi, 1024 runs, 0 skips this change: 734 decicycles in phi, 1024 runs, 0 skips mans code: 1 file changed, 20 insertions(+), 10 deletions(-) this change: 1 file changed, 10 insertions(+), 6 deletions(-) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-181-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix issues with huge values of bit_rate. dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit(). proresenc: multithreaded quantiser search riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header avconv: only set the "channels" option when it exists for the specified input format avplay: update get_buffer to be inline with avconv aacdec: More robust output configuration. faac: Fix multi-channel ordering faac: Add .channel_layouts rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier rtmp: Support 'rtmp_app', an option which overrides the name of application avutil: add better documentation for AVSampleFormat Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/aacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: More robust output configuration.Alex Converse2012-04-161-6/+6
| | | | | | | | | | | | Save the old output configuration (if it has been used successfully) when trying a new configuration. If the new configuration fails to decode, restore the last successful configuration.
* | aacsbr: silence message for SBR extension "padding".Reimar Döffinger2012-04-101-1/+3
| | | | | | | | | | | | | | | | | | Some files contain a few additional, all-0 bits. Check for that case and don't print incorrect "not supported" message. Fixes trac issue #836. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-241-15/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv34: error out on size changes with frame threading aacsbr: Add a debug check to sbr_mapping. aac: Reset some state variables when turning SBR off aac: Reset PS parameters on header decode failure. fate: add wmalossless test. aacsbr: handle m_max values smaller than 4. Conflicts: libavcodec/aacsbr.c tests/fate/lossless-audio.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>