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
AgeCommit message (Collapse)Author
2015-07-20avcodec: Implementation of AAC_fixed_decoder (SBR-module)Djordje Pesut
Add fixed poind code. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20avcodec: Template creation for AAC decoder (SBR-module)Djordje Pesut
Move the existing code to a new template file. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-01avcodec/aacsbr: Assert that bs_num_env is positiveMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01avcodec/aacsbr: check that the element type matches before applying SBRMichael Niedermayer
Fixes out of array access Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07aacsbr: break infinite loop in sbr_hf_calc_npatchesAndreas Cadhalpun
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-18avcodec/aacsbr: Replace impossible condition by assertMichael Niedermayer
bits can have a value of 0 or 1 they are never -1 or otherwise negative Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'Michael Niedermayer
* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0': aacsbr: Fix type for index variable See: a15adabdd32c8736c143fcbef36a0f4a75f772f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17aacsbr: Fix type for index variableVittorio Giovara
Prevents unsigned overflow and variable truncation. Bug-Id: CID 603186
2015-02-04aacsbr: silence message for SBR extension "padding".Reimar Döffinger
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>
2014-12-02avcodec/aacdec: Use avpriv_float_dsp_alloc()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24Merge commit '208f3abb917757743313da0da714e525e03159d2'Michael Niedermayer
* commit '208f3abb917757743313da0da714e525e03159d2': aacsbr: always initialize max_qmf_subbands See: c6d3b3be1555257ff3f88da6b8dca2158dad2a85 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24aacsbr: always initialize max_qmf_subbandsVittorio Giovara
Fixes a wordly warning from clang -Wsometimes-uninitialized.
2014-11-05Merge commit '930ffd46e1e742674aa7cc1c2450020c63b5015b'Michael Niedermayer
* 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>
2014-11-04Merge commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1'Michael Niedermayer
* commit '9f6f407463ff8b7681befd04b6655bb7c6d9b3e1': aacsbr: treat 1-d arrays as such Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-04aacsbr: change order of operation to prevent out of array readMichael Niedermayer
CC: libav-stable@libav.org Bug-Id: CID 732250
2014-11-03aacsbr: treat 1-d arrays as suchVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1238802 / CID 1238793 / CID 1238785 CID 1238808 / CID 1238809
2014-09-06aacsbr: support hardcoding tables.Reimar Döffinger
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>
2013-11-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-11-26aacsbr: Add some const casts to silence warnings in ff_sbr_apply()Diego 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-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 '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-13av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun
2013-03-08Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer
pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
2013-03-08aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer
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>
2013-03-07aacdec: Reconfigure output as needed, disable pop_output_configuration()Michael Niedermayer
Fixes Ticket1694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-26aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this ↵Michael Niedermayer
function Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-22mips: optimization for float aac decoder (sbr module)Mirjana Vulin
Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer
* 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>
2013-02-09dsputil: Move LOCAL_ALIGNED macros to libavutilDiego Biurrun
2013-01-23Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer
* 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>
2013-01-23Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'Michael Niedermayer
* 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>
2013-01-22floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.Ronald S. Bultje
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.
2013-01-22floatdsp: move vector_fmul_add from dsputil to avfloatdsp.Ronald S. Bultje
2012-12-07Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'Michael Niedermayer
* 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>
2012-12-07AAC SBR: use AVFloatDSPContext's vector_fmulChristophe Gisquet
Around 5% speedup on the code block using 'vector_fmul_add's. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-12-03Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'Michael Niedermayer
* 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>
2012-12-03aac: avoid a memcpy in sbr_qmf_analysisChristophe Gisquet
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>
2012-11-26Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'Michael Niedermayer
* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa': aacdec: use float planar sample format for output Conflicts: libavcodec/aacdec.c libavcodec/aacsbr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26aacdec: use float planar sample format for outputJustin Ruggles
2012-11-20aacsbr: check sample_rate before using it, fix division by 0Michael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-04aacsbr: fix integer overflowMichael Niedermayer
Fixes CID603186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer
* 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>
2012-10-23Improve wording and spelling of av_log_missing_feature messages.Diego Biurrun
2012-10-22Fix various uses of av_log_missing_feature()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13aacsbr: change order of operation to prevent out of array readMichael Niedermayer
Fixes CID732250 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-03aacsbr: remove unused variablesMans Rullgard
2012-06-03aacsbr: optimize sine level additionMichael Niedermayer
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>