Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-02Merge commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73'Michael Niedermayer
* commit '880e2aa23645ed9871c66ee1cbd00f93c72d2d73': Remove all Blackfin architecture optimizations Conflicts: libavcodec/bfin/dsputil.S libavcodec/bfin/dsputil_init.c libavcodec/bfin/fdct_bfin.S libavcodec/bfin/hpel_pixels_no_rnd.S libavcodec/bfin/hpeldsp_init.c libavcodec/bfin/idct_bfin.S libavcodec/bfin/mathops.h libavcodec/bfin/pixels.S libavcodec/bfin/pixels.h libavcodec/bfin/vp3dsp.S libavcodec/bfin/vp3dsp_init.c libavutil/bfin/asm.h libavutil/bfin/attributes.h libswscale/bfin/internal_bfin.S libswscale/bfin/swscale_bfin.c libswscale/bfin/yuv2rgb_bfin.c libswscale/swscale_internal.h libswscale/version.h If someone wants to maintain blackfin support in FFmpeg, please contact ffmpeg-devel@ffmpeg.org Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-02Remove all Blackfin architecture optimizationsDiego Biurrun
Blackfin is a painful platform to work with, no test machines are available and the range of multimedia applications is dubious. Thus it only represents a maintenance burden.
2014-05-17lavc: Use av_gettime_relative()Olivier Langlois
Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-15Merge commit '1e9265cd8f0821acbeca1db437be1361a3976b85'Michael Niedermayer
* commit '1e9265cd8f0821acbeca1db437be1361a3976b85': dct-test: test ff_simple_idct_neon only on ARM for now Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-15dct-test: test ff_simple_idct_neon only on ARM for nowJanne Grunau
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-14avcodec/proresdsp & idct: move biasing from after the IDCT into the IDCTMichael Niedermayer
This replaces 64 additions by 8 additions MSE Changes from 0.04873672 to 0.05012422 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/dct-test: add support for C prores IDCTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/dct-test: reproduce 4..1019 clipping when testing prores IDCTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/dct-test: correct output bias of prores idctMichael Niedermayer
This way the output values make sense Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'Michael Niedermayer
* commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac': Remove all Alpha architecture optimizations Conflicts: libavcodec/alpha/asm.h libavcodec/alpha/dsputil_alpha.c libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/dsputil_alpha_asm.S libavcodec/alpha/hpeldsp_alpha.c libavcodec/alpha/hpeldsp_alpha.h libavcodec/alpha/hpeldsp_alpha_asm.S libavcodec/alpha/motion_est_alpha.c libavcodec/alpha/motion_est_mvi_asm.S libavcodec/alpha/mpegvideo_alpha.c libavcodec/alpha/regdef.h libavcodec/alpha/simple_idct_alpha.c We have a qemu based fate alpha client. And various failures on alpha have previously pointed to issues in generic C code. Thus IMHO it makes sense to keep alpha code as long as someone is willing to do the little bit of maintaince it needs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13Remove all Alpha architecture optimizationsDiego Biurrun
Alpha has been end-of-lifed and no more test machines are available.
2013-11-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Remove #undefs for formerly forbidden system functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07Remove #undefs for formerly forbidden system functionsDiego Biurrun
The macros forbidding the system functions no longer exist, obviating the need for the #undefs.
2013-10-25dct-test: Remove possibility of returning a restricted exit codeDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-24dct-test: Remove possibility of returning a restricted exit codeDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-06Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'Michael Niedermayer
* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918': x86: xviddct: Employ more specific ifdefs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-05x86: xviddct: Employ more specific ifdefsDiego Biurrun
This avoids building mmxext and sse2 code when disabled by configure.
2013-03-13Merge commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f'Michael Niedermayer
* commit 'de27d2b92fa97deb2856d18e9f5f19586ce45a0f': lavc: remove disabled FF_API_LIBMPEG2 cruft Conflicts: libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dsputil: Move fdct function declarations to dct.h Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-09dsputil: Move fdct function declarations to dct.hDiego Biurrun
2013-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-12-08Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'Michael Niedermayer
* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52': configure: do not bypass cpuflags section if --cpu not given dct-test: arm: indicate required cpu features for optimised funcs snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793 arm: fix use of uninitialised value in ff_fft_fixed_init_arm() avpicture: Don't assume a valid pix fmt in avpicture_get_size Conflicts: libavcodec/avpicture.c libavcodec/snow.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-07dct-test: arm: indicate required cpu features for optimised funcsMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-11-01Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'Michael Niedermayer
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415': x86: h264_chromamc_10bit: drop pointless PAVG %define x86: mmx2 ---> mmxext in function names swscale: do not forget to swap data in formats with different endianness Conflicts: libavcodec/x86/dsputil_mmx.c libavfilter/x86/gradfun.c libswscale/input.c libswscale/utils.c libswscale/x86/swscale.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31x86: mmx2 ---> mmxext in function namesDiego Biurrun
2012-09-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: dsputil: Move Xvid IDCT put/add functions to a more suitable place trasher: Include all the necessary headers x86: Remove some leftover declarations for non-existent functions ARM: libavresample: NEON optimised generic fltp to s16 conversion ARM: libavresample: NEON optimised stereo fltp to s16 conversion ARM: libavresample: NEON optimised flat float to s16 conversion Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13x86: Remove some leftover declarations for non-existent functionsDiego Biurrun
2012-09-09dct-test: fix order of evaluation bugMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: MSS1 and MSS2: set final pixel format after common stuff has been initialised MSS2 decoder configure: handle --disable-asm before check_deps x86: Split inline and external assembly #ifdefs configure: x86: Separate inline from standalone assembler capabilities pktdumper: Use a custom define instead of PATH_MAX for buffers pktdumper: Use av_strlcpy instead of strncpy pktdumper: Use sizeof(variable) instead of the direct buffer length Conflicts: Changelog configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/dct-test.c libavcodec/imgconvert.c libavcodec/mss12.c libavcodec/version.h libavfilter/x86/gradfun.c libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31x86: Split inline and external assembly #ifdefsDiego Biurrun
2012-08-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavr: fix handling of custom mix matrices fate: force pix_fmt in lagarith-rgb32 test fate: add tests for lagarith lossless video codec. ARMv6: vp8: fix stack allocation with Apple's assembler ARM: vp56: allow inline asm to build with clang fft: 3dnow: fix register name typo in DECL_IMDCT macro x86: dct32: port to cpuflags x86: build: replace mmx2 by mmxext Revert "wmapro: prevent division by zero when sample rate is unspecified" wmapro: prevent division by zero when sample rate is unspecified lagarith: fix color plane inversion for YUY2 output. lagarith: pad RGB buffer by 1 byte. dsputil: make add_hfyu_left_prediction_sse4() support unaligned src. Conflicts: doc/APIchanges libavcodec/lagarith.c libavfilter/x86/gradfun.c libavutil/cpu.h libavutil/version.h libswscale/utils.c libswscale/version.h libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04x86: build: replace mmx2 by mmxextDiego Biurrun
Refactoring mmx2/mmxext YASM code with cpuflags will force renames. So switching to a consistent naming scheme beforehand is sensible. The name "mmxext" is more official and widespread and also the name of the CPU flag, as reported e.g. by the Linux kernel.
2012-08-02x86: remove libmpeg2 mmx(ext) idct functionsMans Rullgard
These functions are not faster than other mmx implementations on any hardware I have been able to test on, and they are horribly inaccurate. There is thus no reason to ever use them. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs ARM: use =const syntax instead of explicit literal pools ARM: use standard syntax for all LDRD/STRD instructions fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. dct-test: allow to compile without HAVE_INLINE_ASM. x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM. dca: Move tables used outside of dcadec.c to a separate file. dca: Rename dca.c ---> dcadec.c x86: h264dsp: Remove unused variable ff_pb_3_1 apetag: change a forgotten return to return 0 Conflicts: libavcodec/Makefile libavcodec/dca.c libavcodec/x86/fft_3dn.c libavcodec/x86/fft_3dn2.c libavcodec/x86/fft_mmx.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01dct-test: allow to compile without HAVE_INLINE_ASM.Ronald S. Bultje
2012-07-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libopenjpeg: support YUV and deep RGB pixel formats Fix typo in v410 decoder. vf_yadif: unset cur_buf on the input link. vf_overlay: ensure the overlay frame does not get leaked. vf_overlay: prevent premature freeing of cur_buf Support urlencoded http authentication credentials rtmp: Return an error when the client bandwidth is incorrect rtmp: Return proper error code in handle_server_bw rtmp: Return proper error code in handle_client_bw rtmp: Return proper error codes in handle_chunk_size lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt() vp8: Replace x*155/100 by x*101581>>16. vp3: don't use calls to inline asm in yasm code. x86/dsputil: put inline asm under HAVE_INLINE_ASM. dsputil_mmx: fix incorrect assembly code rtmp: Factorize the code by adding handle_invoke rtmp: Factorize the code by adding handle_chunk_size rtmp: Factorize the code by adding handle_ping rtmp: Factorize the code by adding handle_client_bw rtmp: Factorize the code by adding handle_server_bw Conflicts: libavcodec/libopenjpegdec.c libavcodec/x86/dsputil_mmx.c libavfilter/vf_overlay.c libavformat/Makefile libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-25x86/dsputil: put inline asm under HAVE_INLINE_ASM.Ronald S. Bultje
This allows compiling with compilers that don't support gcc-style inline assembly. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-07-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: build: Fix Ogg demuxer dependencies build: Fix FLAC demuxer dependencies flac: Move flac functions shared between libraries to flac common code build: Fix CAF demuxer dependencies build: Fix MP2 muxer dependencies build: Add missing build rules for the ISMV muxer configure: Drop redundant mxf_d10 test dependency declaration Support AAC encoding via the external library fdk-aac libavcodec: Add more AAC profiles dct/fft-test: use a replacement getopt() if the system has none present. Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-11dct/fft-test: use a replacement getopt() if the system has none present.Ronald S. Bultje
This allows compiling and running these tests on systems lacking a built- in version of getopt(), such as MSVC. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-06-20Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-20Use av_gettime() in various placesMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-20dct-test: use emms_c() from libavutil instead of duplicating itMans Rullgard
2012-06-10dct-test: fix alignment in ff_prores_idct_put_10_sse2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-10dct-test: fix #if for ff_prores_idct_put_10_sse2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-01dct-test: give emms a memory clober.Michael Niedermayer
Without this, the compiler in theory could attempt to keep things in float registers across the emms which would cause bad things to happen. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-01dct-test: perform emms before gettime().Michael Niedermayer
This fixes the hypothetical case of a gettime implementation using floats Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02dct-test: fix incompatible pointer types warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-31dcttest: put ff_prores_idct_put_10_sse2_wrap under HAVE_YASMMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>