diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-02 02:02:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-02 02:24:09 +0100 |
| commit | 4c677df27cc62e5dd8df9da9d0ca9fb7d963bc08 (patch) | |
| tree | 1453699ac3b21c5c25889aaed590ca4bc0c7a755 /libswscale/x86 | |
| parent | 5cd8afee99c83b62e1474f122d947de7e4ad9ff5 (diff) | |
| parent | 5ff88020ac4cd285fa00d0c559aa196bbd8526d7 (diff) | |
| download | ffmpeg-4c677df27cc62e5dd8df9da9d0ca9fb7d963bc08.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
frwu: Employ more meaningful return values.
fraps: Use av_fast_padded_malloc() instead of av_realloc()
mjpegdec: use av_fast_padded_malloc()
eatqi: use av_fast_padded_malloc()
asv1: use av_fast_padded_malloc()
avcodec: Add av_fast_padded_malloc().
swscale: enable dithering in MMX functions.
swscale: make rgb24 function macros slightly smaller.
avcodec.h: Remove some disabled cruft.
swscale: remove obsolete comment.
swscale-test: Drop unused argc and argv arguments from main().
zmbv: Employ more meaningful return values.
zmbvenc: Employ more meaningful return values.
vc1: prevent null pointer dereference on broken files
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
truespeech: align buffer
ac3: Do not read past the end of ff_ac3_band_start_tab.
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
dv: Fix null pointer dereference due to ach=0
dv: check stype
...
Conflicts:
doc/APIchanges
libavcodec/asv1.c
libavcodec/avcodec.h
libavcodec/eatqi.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/zmbv.c
libavformat/dv.c
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/input.asm | 29 | ||||
| -rw-r--r-- | libswscale/x86/swscale_mmx.c | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/libswscale/x86/input.asm b/libswscale/x86/input.asm index c5b483c766..9a8e24f0b0 100644 --- a/libswscale/x86/input.asm +++ b/libswscale/x86/input.asm @@ -271,31 +271,28 @@ cglobal %2 %+ 24ToUV, 7, 7, %1, dstU, dstV, u1, src, u2, w, u3 %endif ; ARCH_X86_64 && %0 == 3 %endmacro +; %1 = nr. of XMM registers for rgb-to-Y func +; %2 = nr. of XMM registers for rgb-to-UV func +%macro RGB24_FUNCS 2 +RGB24_TO_Y_FN %1, rgb +RGB24_TO_Y_FN %1, bgr, rgb +RGB24_TO_UV_FN %2, rgb +RGB24_TO_UV_FN %2, bgr, rgb +%endmacro + %if ARCH_X86_32 INIT_MMX mmx -RGB24_TO_Y_FN 0, rgb -RGB24_TO_Y_FN 0, bgr, rgb -RGB24_TO_UV_FN 0, rgb -RGB24_TO_UV_FN 0, bgr, rgb +RGB24_FUNCS 0, 0 %endif INIT_XMM sse2 -RGB24_TO_Y_FN 10, rgb -RGB24_TO_Y_FN 10, bgr, rgb -RGB24_TO_UV_FN 12, rgb -RGB24_TO_UV_FN 12, bgr, rgb +RGB24_FUNCS 10, 12 INIT_XMM ssse3 -RGB24_TO_Y_FN 11, rgb -RGB24_TO_Y_FN 11, bgr, rgb -RGB24_TO_UV_FN 13, rgb -RGB24_TO_UV_FN 13, bgr, rgb +RGB24_FUNCS 11, 13 INIT_XMM avx -RGB24_TO_Y_FN 11, rgb -RGB24_TO_Y_FN 11, bgr, rgb -RGB24_TO_UV_FN 13, rgb -RGB24_TO_UV_FN 13, bgr, rgb +RGB24_FUNCS 11, 13 ;----------------------------------------------------------------------------- ; YUYV/UYVY/NV12/NV21 packed pixel shuffling. diff --git a/libswscale/x86/swscale_mmx.c b/libswscale/x86/swscale_mmx.c index 9dffe2b203..ab5b68fb0b 100644 --- a/libswscale/x86/swscale_mmx.c +++ b/libswscale/x86/swscale_mmx.c @@ -27,6 +27,8 @@ #include "libavutil/cpu.h" #include "libavutil/pixdesc.h" +#define DITHER1XBPP + DECLARE_ASM_CONST(8, uint64_t, bF8)= 0xF8F8F8F8F8F8F8F8LL; DECLARE_ASM_CONST(8, uint64_t, bFC)= 0xFCFCFCFCFCFCFCFCLL; DECLARE_ASM_CONST(8, uint64_t, w10)= 0x0010001000100010LL; |