xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,320 Commits 31 Branches 338 Tags 298 MiB
6931d12745
Commit Graph

448 Commits

Author SHA1 Message Date
Michael Niedermayer
05ff1a2c05 swresample/swresample: Treat mono as planar 
This might in some cases improve performance.

Idea from: fbc0b86599
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 03:05:05 +02:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Michael Niedermayer
52fafaf474 swresample/libswresample.v: hide ff_* 
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 18:40:17 +02:00
Timothy Gu
5b58692ed4 swresample: misc. doxy improvements 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:36:56 +02:00
Timothy Gu
064945b3aa swresample: organize functions into doxy groups 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:07:15 +02:00
Timothy Gu
81f47e272d swresample: better doxy for configuration-returning functions 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 22:06:51 +02:00
Timothy Gu
2711b4708a swresample: improve Doxygen introduction 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 21:41:31 +02:00
Timothy Gu
77c5f546e7 swresample: add SwrContext doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:58 +02:00
Timothy Gu
fc71434e84 swresample: add SwrDitherType doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:41 +02:00
Timothy Gu
c0d9b026f9 swresample: group all the option constants in a section in doxy 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:58:34 +02:00
Timothy Gu
0c58388211 swresample: grammar/capitalization fixes 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:46:06 +02:00
Timothy Gu
37715b4594 swresample: split option table to a separate file 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 03:45:46 +02:00
James Almer
9937362c54 x86/swr: use lavu helper macros to check CPU extensions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:12:16 +02:00
James Almer
8279a15284 x86/swr: split audioconvert and rematrix DSP into separate files 
Also rename resample_x86_dsp.c to resample_init.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:00:11 +02:00
James Almer
857cd1f33b swr: initialize only the necessary resample dsp functions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:37:41 +02:00
James Almer
b5f0eac068 swr: rename swresample_dsp init functions to swri_resample_dsp 
The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 13:18:30 +02:00
James Almer
42a92a240d swr: remove obsolete resample prototypes 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:14:45 +02:00
James Almer
23a9edf531 Partially revert "swr: add prototypes for resample dsp functions" 
Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c

The DO_RESAMPLE_ONE macro is removed for that same reason as well.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 03:14:36 +02:00
James Almer
c45b7f0d80 x86/swr: add ff_resample_{common, linear}_int16_xop 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:11:20 +02:00
James Almer
1a69224f44 x86/swr: add ff_resample_{common, linear}_float_fma 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:09:53 +02:00
James Almer
dd2c9034b1 x86/swr: convert resample_{common, linear}_double_sse2 to yasm 
Signed-off-by: James Almer <jamrial@gmail.com>

312531 -> 311528 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 17:57:36 +02:00
Ronald S. Bultje
847bb638c0 swr: convert resample_common/linear_int16_mmx2/sse2 to yasm. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 20:11:50 +02:00
Michael Niedermayer
418e5768c6 swresample/resample_template: move division out of loop for float/double swri_resample_linear() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 04:30:10 +02:00
Michael Niedermayer
c5a405c4f0 swresample/resample_template: flip order of operations in swri_resample_linear() for 32bit 
Fixes integer overflow

Found-by: BBB
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-29 22:19:57 +02:00
Ronald S. Bultje
faa1471ffc swr: rewrite resample_common/linear_float_sse/avx in yasm. 
Linear interpolation goes from 63 (llvm) or 58 (gcc) to 48 (yasm)
cycles/sample on 64bit, or from 66 (llvm/gcc) to 52 (yasm) cycles/
sample on 32bit. Bon-linear goes from 43 (llvm) or 38 (gcc) to
32 (yasm) cycles/sample on 64bit, or from 46 (llvm) or 44 (gcc) to
38 (yasm) cycles/sample on 32bit (all testing on OSX 10.9.2, llvm
5.1 and gcc 4.8/9).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 17:06:47 +02:00
Ronald S. Bultje
ddb7b4435a swr: move dst_size == 0 handling outside DSP function. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 15:30:01 +02:00
Ronald S. Bultje
0dae193d3e swr: remove another forgotten division in DSP function. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 05:20:22 +02:00
Ronald S. Bultje
cbf21628a5 swr: remove div/mod from DSP functions. 
Also fix a bug with resample_compensation resetting dst_incr.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 14:15:52 +02:00
Michael Niedermayer
0608bc6502 swresample/audioconvert: fix () in FMT_PAIR_FUNC() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 03:13:37 +02:00
Ronald S. Bultje
edf930472b swr: reindent. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 01:33:32 +02:00
Ronald S. Bultje
083cd3d1f7 swr: compile mmx2 s16p functions only on x86-32. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 13:34:53 +02:00
James Almer
7f4dfbd080 swr: add prototypes for resample dsp functions 
Should fix compilation failures with MSVC and any other compiler
without inline asm support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 01:33:17 +02:00
Ronald S. Bultje
ada8f9c046 swr: remove obsolete function prototypes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 00:07:25 +02:00
Ronald S. Bultje
7128a35f8c swr: split out DSP functions. 
DSP bits of swri_resample go into their own mini-DSP functions; DSP
init goes from a per-call branch in multiple_resample to a proper
DSP init routine; x86 bits go into x86/; swri_resample() moves out of
resample_template.c into resample.c because it's independent of DSP
code or sample type; multiple_resample() is simplified.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 20:21:39 +02:00
Michael Niedermayer
4411928c64 swresample/resample: replace assert by av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 16:33:09 +02:00
Ronald S. Bultje
b785c62681 swr: handle initial negative sample index outside DSP function. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 14:36:18 +02:00
Ronald S. Bultje
6b9685de3a swr: remove unnecessary assignment. 
I don't see dst_incr/dst_incr_frac ever being changed from their
initial value (which is the inverse of this operation), so it seems
to me that this is a no-op.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 04:30:53 +02:00
Ronald S. Bultje
f341340552 swr: handle 64bit overflow check in multiple_resample(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-09 15:24:51 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Ronald S. Bultje
cdfd9717ed swr: move compensation_distance handling to swri_resample caller. 
I think there's an off-by-one in terms of the switchpoint where we
switch from dst_incr to ideal_dst_incr, I don't think that's a massive
issue, but just be aware of that. It's probably trivial to prevent but
I don't care.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

I could not reproduce any off by 1 error, results are bit exact (michael)
 2014-06-02 15:06:24 +02:00
Michael Niedermayer
2c23f87c85 swr/resample_template: prevent end_index from overflowing and add check for delta_frac overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-02 00:57:08 +02:00
Ronald S. Bultje
9b53853756 Rewrite main resampling loop (common and linear). 
This removes a branch at a performance-sensitive point (in the middle
of the loop). In fate-swr-resample-s32p-8000-2626, this makes the code
about 10% faster. It also simplifies the loops, allowing us to rewrite
it in yasm at some later point.

The compensation_distance != 0 code and index < 0 code are still kind
of hairy. For compensation_distance != 0, this should likely be handled
in the caller, so that it calls swri_resample twice (once until the
dst_incr switch-point, and once with the remainder of the samples). For
index < 0, the code should probably be rewritten to break out of the
loop once sample_index >= 0, and then resume (e.g. as a tail-call) to
the common or linear resampling loops.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-02 00:47:54 +02:00
James Almer
a9bf713d35 swresample: add swri_resample_float_avx 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-16 05:27:03 +02:00
Michael Niedermayer
96cb4c8718 swresample: swr_close() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-15 18:27:23 +02:00
Matt Oliver
1898c2f49d inline asm: fix arrays as named constraints. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 15:02:45 +02:00
James Almer
4cdea92976 swresample/resample: add missing xmm clobbers 
Might fix fate-swr on ICL

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-07 01:32:40 +02:00
Michael Niedermayer
68c3e6025f Fix convertion typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 00:09:08 +02:00
James Almer
cdac3ab59f swresample: add swri_resample_double_sse2 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-25 16:46:07 +02:00
Michael Niedermayer
291d464161 swresample: fix AV_CH_LAYOUT_STEREO_DOWNMIX input 
Fixes Ticket 3542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 01:25:46 +02:00
Michael Niedermayer
2b58c9c945 swresample/resample_template: try to consider src_size more exactly 
This should avoid slight differences in the output causes by input
size alignment differences between archs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 06:35:35 +02:00