RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
42,937 Commits 37 Branches 400 Tags 241 MiB
7333798c85
Commit Graph

249 Commits

Author SHA1 Message Date
Justin Ruggles
7e15df7551 swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
Nicolas George
1d903a5ee4 lswr: channel_map requires input conversion. 
channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
 2012-07-17 09:50:36 +02:00
Michael Niedermayer
68712ce820 swr/x86: 16bit integer mix functions need SSE2 not SSE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:52:34 +02:00
Paul B Mahol
1842b27564 lavu: 256 color support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-07 01:41:55 +00:00
Michael Niedermayer
c88e60af76 swr/x86: 10l, missed some SSE2 instructions in code marked as SSE. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-05 15:28:10 +02:00
Michael Niedermayer
7309451d73 swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:33:27 +02:00
Michael Niedermayer
338509c2e1 swr: fix warning: passing argument 1 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:32:23 +02:00
Michael Niedermayer
087d067a99 swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:31:16 +02:00
Michael Niedermayer
04b5eb47a6 swr: fix mix* related function pointer warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:23:22 +02:00
Michael Niedermayer
51d2578348 swr: fix MMX resample code, add emms 
Fixes Ticket1495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-30 21:27:39 +02:00
Clément Bœsch
ca612a27ae swr: fix make checkheaders. 2012-06-30 11:21:53 +02:00
Clément Bœsch
022cbb6791 swr: small align cosmetic. 2012-06-30 11:18:45 +02:00
Clément Bœsch
3491c2a909 swr: use __asm__ instead of __asm. 
For consistency only.
 2012-06-30 11:18:05 +02:00
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