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/aacsbr.c
AgeCommit message (Collapse)Author
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>
2012-04-18Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-04-17aacdec: More robust output configuration.Alex Converse
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.
2012-04-10aacsbr: 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. Fixes trac issue #836. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-03-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-03-24aacsbr: Add a debug check to sbr_mapping.Alex Converse
There have been multiple bugs caused by inconsistencies here. Based on an idea from Michael Niedermayer. CC: libav-stable@libav.org
2012-03-24aac: Reset some state variables when turning SBR offAlex Converse
This makes sure the reset flag gets set when SBR gets turned back on and sets control variables for unguided mode back to their defaults. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2012-03-08Revert "AAC SBR: group some writes."Ronald S. Bultje
This reverts commit ba36f14e5d34bcca6ecf77ba1c7512d1b51a9740. It broke decoding on x86-32 on some systems.
2012-03-07AAC SBR: group some writes.Christophe Gisquet
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-03-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: h264: error out on invalid bitdepth. aacsbr: use a swap index for the Y matrix rather than copy buffers. huffyuv: do not abort on unknown pix_fmt; instead, return an error. lcl: return negative error codes on decode_init() errors. rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 h263enc: Add an option for outputting info about MBs as side data avpacket: Add a function for shrinking already allocated side data nellymoserdec: Saner and faster IMDCT windowing Conflicts: doc/APIchanges libavcodec/avpacket.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-01aacsbr: use a swap index for the Y matrix rather than copy buffers.Christophe Gisquet
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2012-01-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28aacsbr: align some arraysMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-01-28aacsbr: move some simdable loops to function pointersMans Rullgard
This prepares for assembly optimisations by moving the most time-consuming loops to functions called through pointers in a new context. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-01-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) rv34: frame-level multi-threading mpegvideo: claim ownership of referenced pictures aacsbr: prevent out of bounds memcpy(). ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM sierravmd: fix audio pts bethsoftvideo: Use bytestream2 functions to prevent buffer overreads. bmpenc: support for PIX_FMT_RGB444 swscale: fix crash in fast_bilinear code when compiled with -mred-zone. swscale: specify register type. rv34: use get_bits_left() avconv: reinitialize the filtergraph on resolution change. vsrc_buffer: error on changing frame parameters. avconv: fix -copyinkf. fate: Update file checksums after the mov muxer change in a78dbada55d6 movenc: Don't store a nonzero creation time if nothing was set by the caller bmpdec: support for rgb444 with bitfields compression rgb2rgb: allow conversion for <15 bpp doc: fix stray reference to FFmpeg v4l2: use C99 struct initializer v4l2: poll the file descriptor ... Conflicts: avconv.c libavcodec/aacsbr.c libavcodec/bethsoftvideo.c libavcodec/kmvc.c libavdevice/v4l2.c libavfilter/vsrc_buffer.c libswscale/swscale_unscaled.c libswscale/x86/input.asm tests/ref/acodec/alac tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov tests/ref/vsynth1/dnxhd_1080i tests/ref/vsynth1/mpeg4 tests/ref/vsynth1/qtrle tests/ref/vsynth1/svq1 tests/ref/vsynth2/dnxhd_1080i tests/ref/vsynth2/mpeg4 tests/ref/vsynth2/qtrle tests/ref/vsynth2/svq1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-11aacsbr: prevent out of bounds memcpy().Alex Converse
Fixes Libav Bug 195. This doesn't make the code handle sample rate or upsample/downsample change properly but this is still a good sanity check. Based on change by Michael Niedermayer. Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-12-15aacsbr: Fix memory corruption.Michael Niedermayer
Fixes Ticket760 and Ticket761 Bug Found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24aacsbr: prevent multiple ff_aac_sbr_ctx_init()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 10:01:20 +0300