generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
46,530 Commits 24 Branches 241 Tags 173 MiB
3affcc99a8
Commit Graph

286 Commits

Author SHA1 Message Date
Michael Niedermayer
782763ed2b swr: fix compilation with ancient toolchain that doesnt support SSSE3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 11:13:19 +02:00
Michael Niedermayer
4ccf6e3971 swr: MMX2 & SSSE3 int16 resample core 
about 4 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 00:36:27 +02:00
Paul B Mahol
10d2a4028c swresample: make .class_name more descriptive 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-22 14:01:15 +00:00
Stefano Sabatini
065851ffac lswr/rematrix: specify explicitly the name of the unsupported channel layouts 
Help debugging.
 2012-06-21 12:47:47 +02:00
Michael Niedermayer
0c142e4cda swr: introduce filter_alloc in preparation of SIMD resample optimisations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00
Michael Niedermayer
80e857c967 swr/resample: optimize C code for the most common case 
15% speedup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00
Michael Niedermayer
5f8f6243ef swr: fix 10l use of uninitialized data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-13 13:43:42 +02:00
Michael Niedermayer
728f86edfc swr: mix_2_1_int16_mmx/sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 17:49:12 +02:00
Michael Niedermayer
d504266cef swr: mix_1_1_int16_sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:43:19 +02:00
Michael Niedermayer
cbeeaf2593 swr: mix_1_1 int16 MMX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:13 +02:00
Michael Niedermayer
52afa43691 swr: mix_2_1_float SSE/AVX 
Based-on code by Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:13 +02:00
Michael Niedermayer
beb0cd6acf swr: SIMD rematrixing and SSE/AVX mix_1_1 float 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:07 +02:00
Michael Niedermayer
48a45f819f swr: add native matrix for SIMD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:16:15 +02:00
Michael Niedermayer
9abbbf7530 swr: add function pointers for SIMD rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:12:08 +02:00
Michael Niedermayer
634d539c12 swresample.c: update copyleft year 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:11:17 +02:00
Michael Niedermayer
c8553bea9e swr: use &~15 
Idea-by: reimar (and ubitux on IRC)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 10:28:40 +02:00
Michael Niedermayer
4289b6690d swr: replace /16 by >>4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 04:01:17 +02:00
Michael Niedermayer
a5c6349358 swr: skip memset(0) in rematrix when the array is known to be already 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:43:10 +02:00
Michael Niedermayer
75d900d52e swr: zero buffers on allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:42:46 +02:00
Michael Niedermayer
e016e3c9d7 swr: add mix8to2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:12:00 +02:00
Michael Niedermayer
b0348158a0 swr: 5.1->stereo double, float and s16 
2.5 times faster than the generic code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:02:14 +02:00
Michael Niedermayer
ca30ae12c5 swr: add all in one rematrixing function ptr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:55:33 +02:00
Michael Niedermayer
dfde3d497e swr: add inrermediate sample type for rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:54:54 +02:00
Michael Niedermayer
6e6dd9995b resample_template: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-06 20:08:57 +02:00
Michael Niedermayer
787c395a30 swr-test: support "--help" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer
63b1c08073 buildsys: fix rules for swresample-test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer
5a7a9f02de libswresample/Makefile: put each object on its own line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Clément Bœsch
64df092b25 swr: fix a few typo. 2012-06-01 08:06:36 +02:00
Michael Niedermayer
16e25ef34b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter

Conflicts:
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	tests/ref/fate/idroq-video-encode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 04:38:32 +02:00
Michael Niedermayer
72261fa867 swr: fix swr_drop_output() 
Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 02:33:38 +02:00
Michael Niedermayer
841c1be57e swr: check return value of swr_inject_silence/drop_output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
a645049bd8 swr: check count argument of realloc_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
d1384c00d4 swr: skip soft compensation when its disabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 22:42:32 +02:00
Michael Niedermayer
72a242c998 swr: add swr_next_pts() 
parameter descriptions partly reuse text from af_asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
f88f705abc swr: add swr_drop_output() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
7a59964ba9 swr: add swr_inject_silence() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
72872d0201 swr: Fix issue with injecting more data than can be used up in the next call. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
c5c355546d swr: add some asserts to resample() 
These check that the internal and input buffers match in format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
75e25f8540 swr: add reversefill_audiodata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
5027e3daf7 swr: fix buf_set() so it works with input == output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
bdbfd4569d swr: make literal 32 a named constant in realloc_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
186be49fd5 swr: fill_audio_data() support NULL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
4def5d2b64 swr: add swr_get_delay() to find the exact delay the swresampler introduces. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-18 23:02:10 +02:00
Michael Niedermayer
a0493be10e swresample: set the default parameters to "none" 
this way it can easily be detected when parameters have not been set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-17 16:46:15 +02:00
Michael Niedermayer
a927641e7a libswresample-simd: Add ff_pack_6ch_float_to_int32_a_avx and ff_pack_6ch_float_to_int32_a_sse4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:56:18 +02:00
Michael Niedermayer
ca986a06ad libswresample-simd: add ff_pack_6ch_int32_to_float_a_avx and ff_pack_6ch_int32_to_float_a_sse4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:53:30 +02:00
Michael Niedermayer
c4047ad9e0 libswresample: make NOP_N macro less picky on its parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:45:32 +02:00
Michael Niedermayer
57bc91c710 libswresample: Change FLOAT_TO_INT32_N to need 1 register less 
same speed on sandy bridge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:44:08 +02:00
Michael Niedermayer
ecfdd125f1 libswresample-simd: rename 6ch pack to what it is 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:31:12 +02:00
Michael Niedermayer
429b964e25 libswresample-simd: make the converter registers parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 20:30:13 +02:00
Michael Niedermayer
b3915c4b70 libswresample: cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 19:32:06 +02:00
Michael Niedermayer
24c0d1583c libswresample: unaligned AVX/SSE4 float and int32 6ch pack 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 19:31:59 +02:00
Justin Ruggles
6f67d9833b libswresample: Implement MMX, SSE4 and AVX 6ch float and int32 packing function. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-13 19:31:59 +02:00
Michael Niedermayer
bd1d975cd0 swr: fix silence buffer for planar U8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-07 00:05:19 +02:00
Michael Niedermayer
fecdc76a9f swr: fix cpy() after the len was changed to be in samples. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-07 00:04:44 +02:00
Michael Niedermayer
cbbc472467 swr-x86-simd: add ff_unpack_2ch_int16_to_int16/int32/float_a_ssse3 
more than 10% faster (tested on sandybridge)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-06 19:39:52 +02:00
Michael Niedermayer
f10aeab69c swr: audioconvert: consider mono to be planar 
This way it will be handled by the planar==planar SIMD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-06 18:04:09 +02:00
Michael Niedermayer
72ae583b7d swr-x86-simd: stereo unpack S16/S32/FLT-> S16/S32/FLT SSE/SSE2 (16 new SIMD functions) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-06 17:25:52 +02:00
Michael Niedermayer
11ad5f0d7d swr-x86-simd: create prototypes with macros, this is simpler. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-06 17:25:52 +02:00
Michael Niedermayer
adfa53b91f swr-x86-SIMD: 3 instructions less for stereo planar->packed s32/flt->s16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-06 17:25:52 +02:00
Michael Niedermayer
5f4e18cd16 swr: replace the remaining 2 audio convert SIMD macros by the new ones 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 19:59:57 +02:00
Michael Niedermayer
df5ff103cd swr: fix internal asm labels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 19:43:11 +02:00
Michael Niedermayer
b6f4f0d9ef swr: fix PACK_2CH register count 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 19:42:52 +02:00
Michael Niedermayer
aae3119643 swr: replace planar->planar/packed->packed FLT<->S16/S32 SIMD by new macros 
this simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 19:41:39 +02:00
Michael Niedermayer
47055b8913 swr: implement stereo S16/S32/FLT->S16/S32/FLT planar->packed in SSE/SSE2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 18:32:34 +02:00
Michael Niedermayer
fec3700dcd swr: update calling code to support mixed packed planar SIMD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 18:32:34 +02:00
Michael Niedermayer
e8dd7928c8 swr: change simd len argument to be in samples instead of dst bytes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 18:32:34 +02:00
Michael Niedermayer
3db6093244 swr-test: allow testing a specific subset of cases 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 18:32:34 +02:00
Michael Niedermayer
c1fe2db376 swr: add ff_int32_to_float_a_avx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-03 15:58:51 +02:00
Michael Niedermayer
29ed1900cc swr-test: fix rounding error leading to NAN 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-03 14:42:37 +02:00
Michael Niedermayer
33f7033452 swr: automatically choose s16/flt/dbl to preserve input precision unless user overrides. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 01:12:16 +02:00
Michael Niedermayer
f2e799a3d0 swr: add double precision support to the rematrix code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 01:12:16 +02:00
Michael Niedermayer
71a1f76d3c swr: update double precision checks for our resampler 
It supports double precision since a while

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 01:12:16 +02:00
Justin Ruggles
6d5bf67f04 swr: add lfe_mix_level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 01:12:10 +02:00
Justin Ruggles
9b42653b22 swr: update side to back mixing. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-02 01:11:55 +02:00
Michael Niedermayer
aab5a4521c swr: add and use function pointers for rematrix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 20:20:21 +02:00
Michael Niedermayer
00fea26faf swr: add native matrix for rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 20:19:28 +02:00
Michael Niedermayer
046b5339fc swr: disable 1 stage convert when dither is enabled. 
This combination is not possible easily.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 20:12:31 +02:00
Michael Niedermayer
30aa004f0c swr-test: allow randomizing mode differently each run. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 13:25:50 +02:00
Michael Niedermayer
bea3d19fbb swr-test: use uint_rand() for mode too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 13:25:50 +02:00
Michael Niedermayer
0334464336 swr-test: simplify by using uint_rand() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-01 13:25:50 +02:00
Michael Niedermayer
9f98a8e9bc swr: use memcpy when input and output match 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 15:32:18 +02:00
Michael Niedermayer
106789dfa0 swr: add sample format to AudioData 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 15:32:18 +02:00
Michael Niedermayer
2d6c29f566 swr: add set_audiodata_fmt() and use it to simplify code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 15:32:18 +02:00
Michael Niedermayer
65722e7fc5 swr: int32_to_int16_mmx/sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 14:20:35 +02:00
Michael Niedermayer
73edb58c3c swr: float_to_int16_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 12:18:14 +02:00
Michael Niedermayer
5932938c9a swr: float_to_int32_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-29 11:37:32 +02:00
Michael Niedermayer
b72a0f9c23 swr: add int16_to_float_sse2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 19:07:30 +02:00
Michael Niedermayer
832c3b10d2 swr: add int32_to_float_sse2 
could be done for sse/3dnow too if someone wants

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 17:06:11 +02:00
Michael Niedermayer
95057b1972 swr: int16->int32: use the old index negate trick to avoid 2 adds 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 17:06:11 +02:00
Michael Niedermayer
113738d6c2 swr: more correct cglobal parameters to int16->int32 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 17:06:11 +02:00
Michael Niedermayer
fa5daaca0d swr: seperate functions for aligned & unaligned 
If someone has an idea on how to do this cleaner, its welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 13:15:44 +02:00
Michael Niedermayer
bcc66ff0e4 swr: add int16_to_int32_mmx/sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 13:15:44 +02:00
Michael Niedermayer
06b62cb8f2 swr: move AudioConvert to header 
the next commits will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 13:02:58 +02:00
Michael Niedermayer
edbde52226 swr: change sample format representation so as to maintain the planer/packed distinction. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-28 13:02:58 +02:00
Michael Niedermayer
dcfc12e86a swr-test: simplify prng code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-27 12:23:53 +02:00
Michael Niedermayer
bbd3dc49ff swr: unroll audioconvert core C function 
36k->32k decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-27 05:05:20 +02:00
Michael Niedermayer
4119fa7023 swr: audioconvert, mark some constants as floats. 
idea from avr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-27 00:22:57 +02:00
Michael Niedermayer
76d376d99b swr-test: fix declaration statement ordering. 
swr-test is now warning free.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-26 23:48:57 +02:00
Michael Niedermayer
f75169b251 swr-test: fix pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-26 23:47:32 +02:00