summaryrefslogtreecommitdiff
path: root/libavcodec/aacsbr.c
Commit message (Collapse)AuthorAge
* mips: optimization for float aac decoder (sbr module)Mirjana Vulin2013-02-21
| | | | | Signed-off-by: Mirjana Vulin <mvulin@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'Michael Niedermayer2013-02-09
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-08
| |
* | Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-22
| | | | | | | | | | | | 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-23
|\| | | | | | | | | | | | | | | | | | | | | * 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-22
| |
* | Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'Michael Niedermayer2012-12-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07
| | | | | | | | | | | | 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-03
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-02
| | | | | | | | | | | | | | 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-26
|\| | | | | | | | | | | | | | | | | | | | | * 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-25
| |
* | aacsbr: check sample_rate before using it, fix division by 0Michael Niedermayer2012-11-20
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: fix integer overflowMichael Niedermayer2012-11-04
| | | | | | | | | | Fixes CID603186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer2012-10-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-23
| |
* | Fix various uses of av_log_missing_feature()Michael Niedermayer2012-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: change order of operation to prevent out of array readMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID732250 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: remove unused variablesMans Rullgard2012-06-03
| |
* | aacsbr: optimize sine level additionMichael Niedermayer2012-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-16
| | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | | | 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-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aacsbr: Add a debug check to sbr_mapping.Alex Converse2012-03-23
| | | | | | | | | | | | | | | | There have been multiple bugs caused by inconsistencies here. Based on an idea from Michael Niedermayer. CC: libav-stable@libav.org
| * aac: Reset some state variables when turning SBR offAlex Converse2012-03-23
| | | | | | | | | | | | | | | | 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
| * Revert "AAC SBR: group some writes."Ronald S. Bultje2012-03-07
| | | | | | | | | | This reverts commit ba36f14e5d34bcca6ecf77ba1c7512d1b51a9740. It broke decoding on x86-32 on some systems.
| * AAC SBR: group some writes.Christophe Gisquet2012-03-07
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aacsbr: use a swap index for the Y matrix rather than copy buffers.Christophe Gisquet2012-03-01
| | | | | | | | Signed-off-by: Alex Converse <alex.converse@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aacsbr: align some arraysMans Rullgard2012-01-28
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aacsbr: move some simdable loops to function pointersMans Rullgard2012-01-28
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * aacsbr: prevent out of bounds memcpy().Alex Converse2012-01-10
| | | | | | | | | | | | | | | | | | | | | | 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>
* | aacsbr: Fix memory corruption.Michael Niedermayer2011-12-15
| | | | | | | | | | | | | | Fixes Ticket760 and Ticket761 Bug Found by: Diana Elena Muscalu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: prevent multiple ff_aac_sbr_ctx_init()Michael Niedermayer2011-09-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacsbr: add a assert0 to check for a inconsistency thatMichael Niedermayer2011-09-23
| | | | | | | | | | | | | | occurd during debug. I dont know if this can happen normally but if so it would be quite bad. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. Conflicts: libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/dca.c libavcodec/h264.c libavcodec/mdec.c libavcodec/mpeg12.c libavcodec/options.c libavcodec/version.h libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbisJustin Ruggles2011-05-18
| | | | | | | | | | | | decoders. Based on patches by clsid2 in ffdshow-tryout.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: add headers needed for log2f()Michael Niedermayer2011-04-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | aac: add math.h needed for log2f()Michael Niedermayer2011-04-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-21
|\| | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-19
| | | | | | | | | | | | | | This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aac: remove dead SBR input scalingAlex Converse2011-02-14
| | | | | | | | | | | | It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-28
| |
* | aac: remove dead SBR input scalingAlex Converse2011-02-14
| | | | | | | | | | | | | | It has been unused since 9d06d7bce3babb82ed650c13ed13a57f6f626a71 Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 916dee9f45dab85cfc20b6bf63ce8722746e6508)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-22 19:08:34 +0000