summaryrefslogtreecommitdiff
path: root/libswresample
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: reduce excessive inlining of mpeg_motion() mpegvideo: convert mpegvideo_common.h to a .c file build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO Move MASK_ABS macro to libavcodec/mathops.h x86: move MANGLE() and related macros to libavutil/x86/asm.h x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h aacdec: Don't fall back to the old output configuration when no old configuration is present. rtmp: Add message tracking rtsp: Support mpegts in raw udp packets rtsp: Support receiving plain data over UDP without any RTP encapsulation rtpdec: Remove an unused include rtpenc: Remove an av_abort() that depends on user-supplied data vsrc_movie: discourage its use with avconv. avconv: allow no input files. avconv: prevent invalid reads in transcode_init() avconv: rename OutputStream.is_past_recording_time to finished. Conflicts: configure doc/filters.texi ffmpeg.c ffmpeg.h libavcodec/Makefile libavcodec/aacdec.c libavcodec/mpegvideo.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* bessel: check that the function terminates as expected by av_assert2().Michael Niedermayer2012-08-09
| | | | | | A clear abort is better than wrong output and a possible crash. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix 10l typo mixing in and out config.Michael Niedermayer2012-08-01
| | | | | | Fixes ticket1458 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: resampling: add filter type and Kaiser window beta to AVOptionsJustin Ruggles2012-07-23
|
* lswr: channel_map requires input conversion.Nicolas George2012-07-17
| | | | | | | | 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.
* swr/x86: 16bit integer mix functions need SSE2 not SSEMichael Niedermayer2012-07-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavu: 256 color supportPaul B Mahol2012-07-07
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swr/x86: 10l, missed some SSE2 instructions in code marked as SSE.Michael Niedermayer2012-07-05
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix warning: passing argument 2 of s->mix_any_f from incompatible ↵Michael Niedermayer2012-07-02
| | | | | | pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix warning: passing argument 1 of s->mix_any_f from incompatible ↵Michael Niedermayer2012-07-02
| | | | | | pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix warning: passing argument 2 of ctx->simd_f from incompatible ↵Michael Niedermayer2012-07-02
| | | | | | pointer type Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix mix* related function pointer warningsMichael Niedermayer2012-07-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix MMX resample code, add emmsMichael Niedermayer2012-06-30
| | | | | | Fixes Ticket1495 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix make checkheaders.Clément Bœsch2012-06-30
|
* swr: small align cosmetic.Clément Bœsch2012-06-30
|
* swr: use __asm__ instead of __asm.Clément Bœsch2012-06-30
| | | | For consistency only.
* swr: fix compilation with ancient toolchain that doesnt support SSSE3Michael Niedermayer2012-06-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: MMX2 & SSSE3 int16 resample coreMichael Niedermayer2012-06-28
| | | | | | about 4 times faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: make .class_name more descriptivePaul B Mahol2012-06-22
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lswr/rematrix: specify explicitly the name of the unsupported channel layoutsStefano Sabatini2012-06-21
| | | | Help debugging.
* swr: introduce filter_alloc in preparation of SIMD resample optimisationsMichael Niedermayer2012-06-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/resample: optimize C code for the most common caseMichael Niedermayer2012-06-19
| | | | | | 15% speedup Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix 10l use of uninitialized dataMichael Niedermayer2012-06-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: mix_2_1_int16_mmx/sseMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: mix_1_1_int16_sseMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: mix_1_1 int16 MMXMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: mix_2_1_float SSE/AVXMichael Niedermayer2012-06-12
| | | | | Based-on code by Justin Ruggles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: SIMD rematrixing and SSE/AVX mix_1_1 floatMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add native matrix for SIMDMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add function pointers for SIMD rematrixingMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample.c: update copyleft yearMichael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: use &~15Michael Niedermayer2012-06-12
| | | | | Idea-by: reimar (and ubitux on IRC) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: replace /16 by >>4Michael Niedermayer2012-06-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: skip memset(0) in rematrix when the array is known to be already 0Michael Niedermayer2012-06-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: zero buffers on allocationMichael Niedermayer2012-06-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add mix8to2Michael Niedermayer2012-06-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: 5.1->stereo double, float and s16Michael Niedermayer2012-06-08
| | | | | | 2.5 times faster than the generic code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add all in one rematrixing function ptrMichael Niedermayer2012-06-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add inrermediate sample type for rematrixingMichael Niedermayer2012-06-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* resample_template: use av_assertMichael Niedermayer2012-06-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: support "--help"Michael Niedermayer2012-06-05
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* buildsys: fix rules for swresample-testMichael Niedermayer2012-06-05
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libswresample/Makefile: put each object on its own lineMichael Niedermayer2012-06-05
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix a few typo.Clément Bœsch2012-06-01
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-30
| | | | | | | | | | | | | | | | | * 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>
* swr: fix swr_drop_output()Michael Niedermayer2012-05-26
| | | | | | Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: check return value of swr_inject_silence/drop_output.Michael Niedermayer2012-05-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: check count argument of realloc_audio()Michael Niedermayer2012-05-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: skip soft compensation when its disabled.Michael Niedermayer2012-05-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add swr_next_pts()Michael Niedermayer2012-05-19
| | | | | | parameter descriptions partly reuse text from af_asyncts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>