summaryrefslogtreecommitdiffstats
path: root/libswresample/rematrix.c
Commit message (Collapse)AuthorAgeFilesLines
* swresample: slightly nicer debug output for auto matrixwm42015-10-151-2/+7
| | | | This is the matrix that will be used for up/downmixing.
* libswresample/rematrix: Check for malloc errorsMichael Niedermayer2015-06-041-0/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Allow reinitialization without ever setting channel layoutsMichael Niedermayer2015-04-121-2/+2
|
* swresample/x86/rematrix_init: Check av_malloc* return codes, forward errorsMichael Niedermayer2015-02-091-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libswresample: move condition to start of loop.Reimar Döffinger2014-09-071-4/+6
| | | | | | | | | This avoids several issue like calculating sum/maxcoef incorrectly due to adding up matrix entries that will be overwritten, as well as out-of-range writes to s->matrix if the maximum allowed number of channels is used. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Remove pointless if.Reimar Döffinger2014-09-071-3/+1
| | | | | | A branch to avoid some calculation seems unlikely to have any benefits. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* libswresample: Avoid needlessly large on-stack array.Reimar Döffinger2014-09-071-5/+9
| | | | | | | | We only actually need to use a tiny part of it. Unfortunately we seem to have no real test coverage on the code, so this is a bit risky. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX inputMichael Niedermayer2014-04-241-0/+5
| | | | | | Fixes Ticket 3542 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lswr: fix assert failure on unknown layouts.Nicolas George2013-11-031-2/+2
|
* swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX outputMichael Niedermayer2013-08-201-3/+5
| | | | | | | | | | Fixes Ticket2859 Note, testcases related to the downmix channels are welcome. (id like to make sure this is working correctly now, as obviously it didnt work before ...) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: clean layouts before checking sanityMichael Niedermayer2013-08-201-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: fix negative rematrix volumnsMichael Niedermayer2013-07-221-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Make rematrix maxvalue user settableMichael Niedermayer2013-07-221-2/+11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add native_simd_oneMichael Niedermayer2013-06-041-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/rematrix: add S32 mixing codeMichael Niedermayer2013-06-041-0/+15
| | | | | | Needed for dithering S32 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/rematrix: use av_calloc()Michael Niedermayer2013-04-151-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/rematrix: move templating parameters to template itself.Clément Bœsch2012-11-151-33/+8
|
* Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol2012-11-131-1/+1
| | | | | | Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swr/rematrix: fix C99 left shift overflowMichael Niedermayer2012-10-141-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add av_cold to init/free functionsMichael Niedermayer2012-09-091-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: treat a single channel as mono instead of failingMichael Niedermayer2012-09-081-0/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: treat stereo downmix like stereo.Michael Niedermayer2012-09-081-0/+2
| | | | | Based on code by John Stebbins Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: add clean layout functionMichael Niedermayer2012-09-081-1/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: move layouts to local variablesMichael Niedermayer2012-09-081-35/+37
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add Dolby/DPLII downmix support to libswresampleMichael Niedermayer2012-09-071-6/+42
| | | | | | Based on code by John Stebbins <jstebbins.hb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update rematrix coeffs to match AC-3Michael Niedermayer2012-09-071-2/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix warning: passing argument 2 of s->mix_any_f from incompatible ↵Michael Niedermayer2012-07-021-1/+1
| | | | | | pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix mix* related function pointer warningsMichael Niedermayer2012-07-021-9/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lswr/rematrix: specify explicitly the name of the unsupported channel layoutsStefano Sabatini2012-06-211-2/+5
| | | | Help debugging.
* swr: mix_2_1_int16_mmx/sseMichael Niedermayer2012-06-121-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: mix_1_1 int16 MMXMichael Niedermayer2012-06-121-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: SIMD rematrixing and SSE/AVX mix_1_1 floatMichael Niedermayer2012-06-121-2/+20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add native matrix for SIMDMichael Niedermayer2012-06-121-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: skip memset(0) in rematrix when the array is known to be already 0Michael Niedermayer2012-06-091-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: 5.1->stereo double, float and s16Michael Niedermayer2012-06-081-0/+3
| | | | | | 2.5 times faster than the generic code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add all in one rematrixing function ptrMichael Niedermayer2012-06-081-0/+7
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add inrermediate sample type for rematrixingMichael Niedermayer2012-06-081-0/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add double precision support to the rematrix codeMichael Niedermayer2012-05-021-0/+30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add lfe_mix_levelJustin Ruggles2012-05-021-0/+11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update side to back mixing.Justin Ruggles2012-05-021-2/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add and use function pointers for rematrixMichael Niedermayer2012-05-011-18/+13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add native matrix for rematrixingMichael Niedermayer2012-05-011-0/+23
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: change sample format representation so as to maintain the planer/packed ↵Michael Niedermayer2012-04-281-6/+6
| | | | | | distinction. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: simplify code by using av_get_bytes_per_sample()Michael Niedermayer2012-04-111-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: use assert in swri_sum2 to check that only supported formats are used.Michael Niedermayer2012-04-101-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add dither support.Michael Niedermayer2012-04-101-9/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update copyright year for rematrixMichael Niedermayer2012-04-101-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: special case for empty channels in rematrix.Nicolas George2012-03-071-0/+3
| | | | Speed += 10% overall for pan=stereo:FL=FL+FR from wav to null.
* libswr: allow to set custom matrices.Nicolas George2012-02-201-9/+42
|
* swr: use "swri_" prefix instead of "swr_" for the private API.Clément Bœsch2011-11-171-2/+2
|
OpenPOWER on IntegriCloud