virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
41,478 Commits 37 Branches 400 Tags 460 MiB
d35c27db63
Commit Graph

219 Commits

Author SHA1 Message Date
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