summaryrefslogtreecommitdiff
path: root/libswresample
Commit message (Collapse)AuthorAge
* swr/resample: use av_clip_int16 instead of av_clipGanesh Ajjanagadde2015-12-24
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample: use AV_OPT_TYPE_BOOL for linear_interp and cheby optionsClément Bœsch2015-12-04
|
* swresample/resample: remove redundant L for floating literalGanesh Ajjanagadde2015-11-15
| | | | | | | It is inherently double precision, and 1.0 is perfectly represented anyway. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/resample: increase precision for compensationMichael Niedermayer2015-11-11
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample: speed up Blackman Nuttall filterGanesh Ajjanagadde2015-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may be a slightly surprising optimization, but is actually based on an understanding of how math libraries compute trigonometric functions. Explanation is given here so that future development uses libm more effectively across the codebase. All libm's essentially compute transcendental functions via some kind of polynomial approximation, be it Taylor-Maclaurin or Chebyshev. Correction terms are added via polynomial correction factors when needed to squeeze out the last bits of accuracy. Lookup tables are also inserted strategically. In the case of trigonometric functions, periodicity is exploited via first doing a range reduction to an interval around zero, and then using some polynomial approximation. This range reduction is the most natural way of doing things - else one would need polynomials for ranges in different periods which makes no sense whatsoever. To avoid the need for the range reduction, it is helpful to feed in arguments as close to the origin as possible for the trigonometric functions. In fact, this also makes sense from an accuracy point of view: IEEE floating point has far more resolution for small numbers than big ones. This patch does this for the Blackman-Nuttall filter, and yields a non-negligible speedup. Sample benchmark (x86-64, Haswell, GNU/Linux) test: fate-swr-resample-dblp-2626-44100 old: 18893514 decicycles in build_filter (loop 1000), 256 runs, 0 skips 18599863 decicycles in build_filter (loop 1000), 512 runs, 0 skips 18445574 decicycles in build_filter (loop 1000), 1000 runs, 24 skips new: 16290697 decicycles in build_filter (loop 1000), 256 runs, 0 skips 16267172 decicycles in build_filter (loop 1000), 512 runs, 0 skips 16251105 decicycles in build_filter (loop 1000), 1000 runs, 24 skips Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/resample: speed up upsampling by precomputing sinesGanesh Ajjanagadde2015-11-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When upsampling, factor is set to 1 and sines need to be evaluated only once for each phase, and the complexity should not depend on the number of filter taps. This does the desired precomputation, yielding significant speedups. Hard guarantees on the gain are not possible, but gains themselves are obvious and are illustrated below. Sample benchmark (x86-64, Haswell, GNU/Linux) test: fate-swr-resample-dblp-2626-44100 old: 29161085 decicycles in build_filter (loop 1000), 256 runs, 0 skips 28821467 decicycles in build_filter (loop 1000), 512 runs, 0 skips 28668201 decicycles in build_filter (loop 1000), 1000 runs, 24 skips new: 14351936 decicycles in build_filter (loop 1000), 256 runs, 0 skips 14306652 decicycles in build_filter (loop 1000), 512 runs, 0 skips 14299923 decicycles in build_filter (loop 1000), 1000 runs, 24 skips Note that this does not statically allocate the sin lookup table. This may be done for the default 1024 phases, yielding a 512*8 = 4kB array which should be small enough. This should yield a small improvement. Nevertheless, this is separate from this patch, is more ambiguous due to the binary increase, and requires a lut to be generated offline. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/resample: improve bessel function accuracy and speedGanesh Ajjanagadde2015-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves accuracy for the bessel function at large arguments, and this in turn should improve the quality of the Kaiser window. It also improves the performance of the bessel function and hence build_filter by ~ 20%. Details are given below. Algorithm: taken from the Boost project, who have done a detailed investigation of the accuracy of their method, as compared with e.g the GNU Scientific Library (GSL): http://www.boost.org/doc/libs/1_52_0/libs/math/doc/sf_and_dist/html/math_toolkit/special/bessel/mbessel.html. Boost source code (also cited and licensed in the code): https://searchcode.com/codesearch/view/14918379/. Accuracy: sample values may be obtained as follows. i0 denotes the old bessel code, i0_boost the approach here, and i0_real an arbitrary precision result (truncated) from Wolfram Alpha: type "bessel i0(6.0)" to reproduce. These are evaluation points that occur for the default kaiser_beta = 9. Some illustrations: bessel(8.0) i0 (8.000000) = 427.564115721804739678191254 i0_boost(8.000000) = 427.564115721804796521610115 i0_real (8.000000) = 427.564115721804785177396791 bessel(6.0) i0 (6.000000) = 67.234406976477956163762428 i0_boost(6.000000) = 67.234406976477970374617144 i0_real (6.000000) = 67.234406976477975326188025 Reason for accuracy: Main accuracy benefits come at larger bessel arguments, where the Taylor-Maclaurin method is not that good: 23+ iterations (at large arguments, since the series is about 0) can cause significant floating point error accumulation. Benchmarks: Obtained on x86-64, Haswell, GNU/Linux via a loop calling build_filter 1000 times: test: fate-swr-resample-dblp-44100-2626 new: 995894468 decicycles in build_filter(loop 1000), 256 runs, 0 skips 1029719302 decicycles in build_filter(loop 1000), 512 runs, 0 skips 984101131 decicycles in build_filter(loop 1000), 1024 runs, 0 skips old: 1250020763 decicycles in build_filter(loop 1000), 256 runs, 0 skips 1246353282 decicycles in build_filter(loop 1000), 512 runs, 0 skips 1220017565 decicycles in build_filter(loop 1000), 1024 runs, 0 skips A further ~ 5% may be squeezed by enabling -ftree-vectorize. However, this is a separate issue from this patch. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample: allow double precision beta value for the Kaiser windowGanesh Ajjanagadde2015-11-08
| | | | | | | | | | | | | Kaiser windows inherently don't require beta to be an integer. This was an arbitrary restriction. Moreover, soxr does not require it, and in fact often estimates beta to a non-integral value. Thus, this patch allows greater flexibility for swresample clients. Micro version is updated. Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/resample: speed up build_filter for Blackman-Nuttall filterGanesh Ajjanagadde2015-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses the trigonometric double and triple angle formulae to avoid repeated (expensive) evaluation of libc's cos(). Sample benchmark (x86-64, Haswell, GNU/Linux) test: fate-swr-resample-dblp-44100-2626 old: 1104466600 decicycles in build_filter(loop 1000), 256 runs, 0 skips 1096765286 decicycles in build_filter(loop 1000), 512 runs, 0 skips 1070479590 decicycles in build_filter(loop 1000), 1024 runs, 0 skips new: 588861423 decicycles in build_filter(loop 1000), 256 runs, 0 skips 591262754 decicycles in build_filter(loop 1000), 512 runs, 0 skips 577355145 decicycles in build_filter(loop 1000), 1024 runs, 0 skips This results in small differences with the old expression: difference (worst case on [0, 2*M_PI]), argmax 0.008: max diff (relative): 0.000000000000157289807188 blackman_old(0.008): 0.000363951585488813192382 blackman_new(0.008): 0.000363951585488755946507 These are judged to be insignificant for the performance gain. PSNR to reference file is unchanged up to second decimal point for instance. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/resample: speed up build_filter by 50%Ganesh Ajjanagadde2015-11-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up build_filter by ~ 50%. This gain should be pretty consistent across all architectures and platforms. Essentially, this relies on a observation that the filters have some even/odd symmetry that may be exploited during the construction of the polyphase filter bank. In particular, phases (scaled to [0, 1]) in [0.5, 1] are easily derived from [0, 0.5] and expensive reevaluation of function points are unnecessary. This requires some rather annoying even/odd bookkeeping as can be seen from the patch. I vaguely recall from signal processing theory more general symmetries allowing even greater optimization of the construction. At a high level, "even functions" correspond to 2, and one can imagine variations. Nevertheless, for the sake of some generality and because of existing filters, this is all that is being exploited. Currently, this patch relies on phase_count being even or (trivially) 1, though this is not an inherent limitation to the approach. This assumption is safe as phase_count is 1 << phase_bits, and is hence a power of two. There is no way for user API to set it to a nontrivial odd number. This assumption has been placed as an assert in the code. To repeat, this assumes even symmetry of the filters, which is the most common way to get generalized linear phase anyway and is true of all currently supported filters. As a side note, accuracy should be identical or perhaps slightly better due to this "forcing" filter symmetries leading to a better phase characteristic. As before, I can't test this claim easily, though it may be of interest. Patch tested with FATE. Sample benchmark (x86-64, Haswell, GNU/Linux): test: swr-resample-dblp-44100-2626 new: 527376779 decicycles in build_filter(loop 1000), 256 runs, 0 skips 524361765 decicycles in build_filter(loop 1000), 512 runs, 0 skips 516552574 decicycles in build_filter(loop 1000), 1024 runs, 0 skips old: 974178658 decicycles in build_filter(loop 1000), 256 runs, 0 skips 972794408 decicycles in build_filter(loop 1000), 512 runs, 0 skips 954350046 decicycles in build_filter(loop 1000), 1024 runs, 0 skips Note that lower level optimizations are entirely possible, I focussed on getting the high level semantics correct. In any case, this should provide a good foundation. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swr: do not reject channel layouts that use channel 63wm42015-10-28
| | | | Channel layouts are essentially uint64_t, and every value is valid.
* all: add const-correctness to qsort comparatorsGanesh Ajjanagadde2015-10-25
| | | | | | | This adds const-correctness when needed for the comparators. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avfilter,swresample,swscale: use fabs, fabsf instead of FFABSGanesh Ajjanagadde2015-10-22
| | | | | | | | | | | | | | | | | | | | | | | | It is well known that fabs and fabsf are at least as fast and sometimes faster than the FFABS macro, at least on the gcc+glibc combination. For instance, see the reference: http://patchwork.sourceware.org/patch/6735/. This was a patch to glibc in order to remove their usages of a macro. The reason essentially boils down to fabs using the __builtin_fabs of the compiler, while FFABS needs to infer to not use a branch and to simply change the sign bit. Usually the inference works, but sometimes it does not. This may be easily checked by looking at the asm. This also has the added benefit of reducing macro usage, which has problems with side-effects. Note that avcodec is not handled here, as it is huge and most things there are integer arithmetic anyway. Tested with FATE. Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample/swresample_internal: add av_warn_unused_resultGanesh Ajjanagadde2015-10-15
| | | | | | | This will trigger a few warnings that need to be fixed. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* swresample: slightly nicer debug output for auto matrixwm42015-10-15
| | | | This is the matrix that will be used for up/downmixing.
* doc/resampler, swresample/options: use proper capitalizationGanesh Ajjanagadde2015-10-10
| | | | | | | | | | | | | | Proper names should be capitalized in all user facing API as far as possible. The option names themselves have not been changed since: 1. We consistently keep option names in lower case. 2. Changing them would break existing scripts. 3. I suspect that we want to be similar to Sox and its relevant options. The converse is also true: improper names should not be capitalized generally. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample: manually unroll the main loop in bessel()Michael Niedermayer2015-10-07
| | | | | | About 10% faster Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample: merge first iteration into init in bessel()Michael Niedermayer2015-10-07
| | | | | | speedup of about 1% Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* x86/audio_convert: fix clobbering of xmm registersJames Almer2015-10-01
| | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* swresample/dither_template: Add missing license headerMichael Niedermayer2015-09-27
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249'Hendrik Leppkes2015-09-05
| | | | | | | * commit 'e88103a7f92cf27a2868b50acc8a9912f6088249': Bump major versions of all libraries Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* swresample/swresample: Fix integer overflow in seed calculationMichael Niedermayer2015-09-03
| | | | | | Fixes CID1322333 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/swresample-test: Make layouts static constMichael Niedermayer2015-08-30
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/dither: use integer arithmeticGanesh Ajjanagadde2015-08-23
| | | | | | | | This fixes a -Wabsolute-value reported by clang 3.5+ complaining about misuse of fabs() for integer absolute value. An additional benefit is the removal of floating point calculations. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* x86: move XOP emulation code back to x86incJames Almer2015-08-03
| | | | | | | | | | Only two functions that use xop multiply-accumulate instructions where the first operand is the same as the fourth actually took advantage of the macros. This further reduces differences with x264's x86inc. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* swresample/x86: add missing colon to labelsJames Almer2015-07-26
| | | | | | Silences warnings with Nasm Signed-off-by: James Almer <jamrial@gmail.com>
* lswr: Allow 64 channels internally.Carl Eugen Hoyos2015-07-17
|
* swr: Remember previously set int_sample_format from userMichael Niedermayer2015-06-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/swresample: Clear delayed_samples_fixup in clear_context()Michael Niedermayer2015-06-22
| | | | | | This probably makes no difference but its more proper Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: soxr implementation for swr_get_out_samples()Rob Sykes2015-06-21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/swresample: Print used int_sample_fmtMichael Niedermayer2015-06-21
| | | | | Suggested-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Choose 16bit internally only if input and output is 16bit or lessMichael Niedermayer2015-06-21
| | | | | | | | | | | | | or if no rematrix and no resampling is performed and the input is 16bit note reampling and rematrix itself always use more than 16bit internally the "internal" sampling format is the format between these steps Its unlikely the difference from this commit is audible in any case unless there is some bug either before or after the change. but multiple people prefer this and it slightly improves the precission of computations. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Fix ASSERT_LEVEL warningMichael Niedermayer2015-06-08
| | | | | Found-by: cehoyos Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: fix initilaize/initialize typoClément Bœsch2015-06-06
|
* swresample/resample: fix typosMichael Niedermayer2015-06-04
| | | | | Found-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/swresample: Cleanup on init failure.Michael Niedermayer2015-06-04
| | | | | | | | This avoids leaks if the user doest call swr_close() after a failed init Found-by: James Almer <jamrial@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Add swr_get_out_samples()Michael Niedermayer2015-06-04
| | | | | | Previous version reviewed-by: Pavel Koshevoy <pkoshevoy@gmail.com> Previous version reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libswresample/rematrix: Check for malloc errorsMichael Niedermayer2015-06-04
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/dither: check memory allocationGanesh Ajjanagadde2015-06-03
| | | | | | check memory allocation in swri_get_dither() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Check the return value of resampler->init()Michael Niedermayer2015-06-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* x86: check for AV_CPU_FLAG_AVXSLOW where usefulJames Almer2015-06-01
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix alignment issue caused by 8ch sse functionsRainer Hochecker2015-05-13
| | | | | | | | | Fix crash when doing 8 ch conversion from apps compiled with MSVS Thanks to Ronald for giving this hint: https://ffmpeg.org/pipermail/ffmpeg-devel/2015-May/173049.html Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/dither_template: Do not define macro functions to nothingMichael Niedermayer2015-05-07
| | | | | | This avoids potential warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/swresample-test: Randomly wipe out channel countsMichael Niedermayer2015-04-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Check channel layouts and channels against each other and print ↵Michael Niedermayer2015-04-12
| | | | | | human readable error messages Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Allow reinitialization without ever setting channel layoutsMichael Niedermayer2015-04-12
|
* swresample: Allow reinitialization without ever setting channel countsMichael Niedermayer2015-04-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/resample: use av_clip functionsJames Almer2015-04-05
| | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/swresample: Use av_mallocz_array()Michael Niedermayer2015-03-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample/resample: Fix undefined shiftsMichael Niedermayer2015-03-14
| | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 22:03:31 +0000