summaryrefslogtreecommitdiff
path: root/libswresample
Commit message (Collapse)AuthorAge
* Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer2012-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6860b4081d046558c44b1b42f22022ea341a2a73': x86: include x86inc.asm in x86util.asm cng: Reindent some incorrectly indented lines cngdec: Allow flushing the decoder cngdec: Make the dbov variable have the right unit cngdec: Fix the memset size to cover the full array cngdec: Update the LPC coefficients after averaging the reflection coefficients configure: fix print_config() with broke awks Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/dct32.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil.asm libavcodec/x86/dsputilenc.asm libavcodec/x86/fft.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_idct_10bit.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_intrapred_10bit.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
* swr: use 64bit index/len for x86_64 mixMichael Niedermayer2012-10-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: include ff_log2_tab for shared buildsHendrik Leppkes2012-10-20
| | | | | | | | This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy. This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: fix division by 0Michael Niedermayer2012-10-16
| | | | | Fixes CID733739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: check pointers before useMichael Niedermayer2012-10-16
| | | | | Fixes: CID733807, CID733806 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/rematrix: fix C99 left shift overflowMichael Niedermayer2012-10-14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swri_resample_init: unsupported sample formats are an internal error.Michael Niedermayer2012-10-11
| | | | | | | This condition cannot happen. Fixes CID733802 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr-test: avoid VLAMichael Niedermayer2012-10-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add missing version macros to librariesjamal2012-09-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: Create version.h headerjamal2012-09-28
| | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ARM: libswresample: NEON optimised generic fltp to s16 conversionMans Rullgard2012-09-24
| | | | | Adapted to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: make sure the last data element is NULL so we can use it to detect the ↵Michael Niedermayer2012-09-24
| | | | | | number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ARM: libswresample: NEON optimised stereo fltp to s16 conversionMans Rullgard2012-09-24
| | | | | Adaption to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ARM: libswresample: NEON optimised flat float to s16 conversionMans Rullgard2012-09-24
| | | | | Adapted to swr by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/resample: mark mm_flags as potentially unusedMichael Niedermayer2012-09-13
| | | | | | They are unused when asm is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add av_cold to init/free functionsMichael Niedermayer2012-09-09
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: treat a single channel as mono instead of failingMichael Niedermayer2012-09-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: treat stereo downmix like stereo.Michael Niedermayer2012-09-08
| | | | | Based on code by John Stebbins Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: add clean layout functionMichael Niedermayer2012-09-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr/auto_matrix: move layouts to local variablesMichael Niedermayer2012-09-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libswr: remove redundant ARCH_X86, MMX* implicates X86Michael Niedermayer2012-09-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swsresample: Fix unprotected inline asmDerek Buitenhuis2012-09-07
| | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add Dolby/DPLII downmix support to libswresampleMichael Niedermayer2012-09-07
| | | | | | Based on code by John Stebbins <jstebbins.hb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update rematrix coeffs to match AC-3Michael Niedermayer2012-09-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update copyright yearsMichael Niedermayer2012-09-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer2012-09-05
| | | | | | | | | | | | * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-05
| | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Fix compilation with yasm-0.6.2.Carl Eugen Hoyos2012-09-01
|
* swr/resample: update SSSE3 flag to new nameMichael Niedermayer2012-09-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add some missing _EXTERNAL suffixes to yasm source files.Carl Eugen Hoyos2012-08-31
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-24
| | | | | | | | | | | | | | | * qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* 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>