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
2017-03-29avcodec/ac3dsp: add special-case handling for the C downmix_fixed functionJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-22Merge commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb'Clément Bœsch
* commit 'b57e38f52cc3f31a27105c28887d57cd6812c3eb': ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asm Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22Merge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'Clément Bœsch
* commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8': ac3dsp: Add some special-case handling for the C downmix function Merged-by: Clément Bœsch <u@pkh.me>
2017-03-22Merge commit '43717469f9daa402f6acb48997255827a56034e9'Clément Bœsch
* commit '43717469f9daa402f6acb48997255827a56034e9': ac3dsp: Reverse matrix in/out order in downmix() Merged-by: Clément Bœsch <u@pkh.me>
2016-10-01ac3dsp: x86: Replace inline asm for in-decoder downmixing with standalone asmJustin Ruggles
Adds a wrapper function for downmixing which detects channel count changes and updates the selected downmix function accordingly. Simplification and porting to current x86inc infrastructure by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-10-01ac3dsp: Add some special-case handling for the C downmix functionJustin Ruggles
This is about 200% faster for in-decoder downmixing of 5.0 and 5.1 content. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-10-01ac3dsp: Reverse matrix in/out order in downmix()Justin Ruggles
Also use (float **) instead of (float (*)[2]). This matches the matrix layout in libavresample so we can reuse assembly code between the two. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-06-21Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'Clément Bœsch
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4': Drop pointless assert.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-05-03Drop pointless assert.h #includesDiego Biurrun
2015-02-21Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'Michael Niedermayer
* commit '9abc80f1ed673141326341e26a05c3e1f78576d0': libavcodec: Make use of av_clip functions Conflicts: libavcodec/takdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21libavcodec: Make use of av_clip functionsPeter Meerwald
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-01libavcodec: Implementation of AC3 fixedpoint decoderNedeljko Babic
Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14Merge commit '831a1180785a786272cdcefb71566a770bfb879e'Michael Niedermayer
* 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>
2014-03-13Update dsputil- and SIMD-related comments to match reality more closelyDiego Biurrun
2013-12-09Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'Michael Niedermayer
* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3': dsputil: Move apply_window_int16 to ac3dsp Conflicts: libavcodec/arm/ac3dsp_init_arm.c libavcodec/arm/ac3dsp_neon.S libavcodec/x86/ac3dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08dsputil: Move apply_window_int16 to ac3dspDiego Biurrun
The (optimized) functions are used nowhere else.
2012-12-10Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'Michael Niedermayer
* commit '30b39164256999efc8d77edc85e2e0b963c24834': ac3dec: make downmix() take array of pointers to channel data Conflicts: libavcodec/ac3dsp.c libavcodec/ac3dsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09ac3dec: make downmix() take array of pointers to channel dataMans Rullgard
2012-11-20mips: Optimization of AC3 FP encoder and EAC3 FP decoderBojan Zivkovic
Signed-off-by: Bojan Zivkovic <bojan@mips.com> Reveiwed-by: Vitor Sessak <vitor1001@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08x86: call most of the x86 dsp init functions under if (ARCH_X86)Janne Grunau
Rename the called dsp init functions to *_init_x86.
2012-09-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: os_support: Choose between direct.h and io.h using a configure check os_support: Include io.h instead of direct.h on mingw32ce x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared swscale: Remove two bogus asserts ac3: move ac3_downmix() from dsputil to ac3dsp lavr/audio_mix_matrix: acknowledge the existence of LFE2. mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. lavu/audioconvert: add a second low frequency channel. Conflicts: doc/APIchanges libavcodec/ac3dsp.c libavcodec/ac3dsp.h libavcodec/mlp_parser.c libavutil/audioconvert.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13ac3: move ac3_downmix() from dsputil to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-02-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) frwu: Employ more meaningful return values. fraps: Use av_fast_padded_malloc() instead of av_realloc() mjpegdec: use av_fast_padded_malloc() eatqi: use av_fast_padded_malloc() asv1: use av_fast_padded_malloc() avcodec: Add av_fast_padded_malloc(). swscale: enable dithering in MMX functions. swscale: make rgb24 function macros slightly smaller. avcodec.h: Remove some disabled cruft. swscale: remove obsolete comment. swscale-test: Drop unused argc and argv arguments from main(). zmbv: Employ more meaningful return values. zmbvenc: Employ more meaningful return values. vc1: prevent null pointer dereference on broken files zmbv: check av_realloc() return values and avoid memleaks on ENOMEM truespeech: align buffer ac3: Do not read past the end of ff_ac3_band_start_tab. dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936. dv: Fix null pointer dereference due to ach=0 dv: check stype ... Conflicts: doc/APIchanges libavcodec/asv1.c libavcodec/avcodec.h libavcodec/eatqi.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/zmbv.c libavformat/dv.c libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-01ac3: Do not read past the end of ff_ac3_band_start_tab.Mans Rullgard
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-10-22Merge remote-tracking branch 'mans/ac3'Michael Niedermayer
* mans/ac3: ac3enc: slightly faster quantize_mantissas_blk_ch() ac3enc: NEON optimised sum_square_butterfly_float ac3enc: neon optimised sum_square_butterfly_int32 ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp Conflicts: libavcodec/ac3enc_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-06ac3enc: move inner loop of compute_rematrixing_strategy to ac3dspMans Rullgard
2011-07-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: get_bits: remove x86 inline asm in A32 bitstream reader doc: Remove outdated information about our issue tracker avidec: Factor out the sync fucntionality. fate-aac: Expand coverage. ac3dsp: add x86-optimized versions of ac3dsp.extract_exponents(). ac3dsp: simplify extract_exponents() now that it does not need to do clipping. ac3enc: clip coefficients after MDCT. ac3enc: add int32_t array clipping function to DSPUtil, including x86 versions. swscale: for >8bit scaling, read in native bit-depth. matroskadec: matroska_read_seek after after EBML_STOP leads to failure. doxygen: fix usage of @file directive in libavutil/{dict,file}.h doxygen: Help doxygen parser to understand the DECLARE_ALIGNED and offsetof macros Conflicts: doc/issue_tracker.txt libavformat/avidec.c libavutil/dict.h libswscale/swscale.c libswscale/utils.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-01ac3dsp: simplify extract_exponents() now that it does not need to do clipping.Justin Ruggles
2011-05-29Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer
* qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-28ac3dsp: fix loop condition in ac3_update_bap_counts_c()Justin Ruggles
2011-05-28ac3enc: modify mantissa bit counting to keep bap counts for all values of bapJustin Ruggles
instead of just 0 to 4. This does all the actual bit counting as a final step.
2011-05-02Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: ALPHA: Replace sized int_fast integer types with plain int/unsigned. Duplicate DPX image encoder Duplicate DPX decoder: read sample aspect ratio Duplciate DPX decoder: add buffer size checks. ac3enc: clip large coefficient values and negative exponents rather than using av_assert2(). ac3enc: do not store a bandwidth code for each channel. ac3enc: remove bandwidth reduction as fallback for bit allocation failure. ac3enc: merge compute_exp_strategy_ch() into compute_exp_strategy() ac3enc: return error if frame+exponent bits are too large instead of using av_assert2(). ac3enc: differentiate between current block and reference block in bit_alloc() ac3enc: simplify exponent_init() by calculating exponent_group_tab[] based on exponent group sizes. ac3enc: simplify stereo rematrixing decision options Include both URLs: Update URL to fate samples Conflicts: Changelog doc/fate.txt libavcodec/ac3enc.c libavcodec/dpxenc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-01ac3enc: clip large coefficient values and negative exponents rather than usingJustin Ruggles
av_assert2().
2011-04-05Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04ac3enc: move extract_exponents inner loop to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-30Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: ac3enc: move compute_mantissa_size() to ac3dsp ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext Remove support for stripping executables ac3enc: NEON optimised float_to_fixed24 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp dfa: protect pointer range checks against overflows. Duplicate: mimic: implement multithreading. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-30ac3enc: move compute_mantissa_size() to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-29ac3: move ff_ac3_bit_alloc_calc_bap to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-25Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: matroskadec: set default duration for simple block When building for MinGW32 disable strict ANSI compliancy. ARM: fix ff_apply_window_int16_neon() prototype configure: check for --as-needed support early ARM: NEON optimised apply_window_int16() ac3enc: NEON optimised shift functions ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_min mpeg12.c: fix slice threading for mpeg2 field picture mode. ffmetadec.c: fix compiler warnings. configure: Don't explicitly disable ffplay or in/outdevices on dos configure: Remove the explicit disabling of ffserver configure: Add fork as a dependency to ffserver Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24ac3enc: NEON optimised ac3_max_msb_abs_int16 and ac3_exponent_minMans Rullgard
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17ac3enc: add float_to_fixed24() with x86-optimized versions to AC3DSPContextJustin Ruggles
and use in scale_coefficients() for the floating-point AC-3 encoder.
2011-03-14ac3enc: add SIMD-optimized shifting functions for use with the fixed-point ↵Justin Ruggles
AC3 encoder.
2011-02-14ac3enc: Add x86-optimized function to speed up log2_tab().Justin Ruggles
AC3DSPContext.ac3_max_msb_abs_int16() finds the maximum MSB of the absolute value of each element in an array of int16_t. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10Add x86-optimized versions of exponent_min().Justin Ruggles
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>