diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-07-08 21:16:20 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-10-31 03:37:42 +0400 |
commit | 652f5185945c8405fc57aed353286858df8d066f (patch) | |
tree | 9f8c506e35db936ad852bced9d309783cebd2f17 /libswscale/x86 | |
parent | 04581c8c77ce779e4e70684ac45302972766be0f (diff) |
x86: mmx2 ---> mmxext in comments and messages
Diffstat (limited to 'libswscale/x86')
-rw-r--r-- | libswscale/x86/output.asm | 4 | ||||
-rw-r--r-- | libswscale/x86/rgb2rgb.c | 6 | ||||
-rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 2 | ||||
-rw-r--r-- | libswscale/x86/swscale.c | 2 | ||||
-rw-r--r-- | libswscale/x86/swscale_template.c | 2 | ||||
-rw-r--r-- | libswscale/x86/yuv2rgb.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index c29aa7ea18..cf0dec3843 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -218,10 +218,10 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset %else ; %1 == 9/10 %if cpuflag(sse4) packusdw m2, m1 -%else ; mmx2/sse2 +%else ; mmxext/sse2 packssdw m2, m1 pmaxsw m2, m6 -%endif ; mmx2/sse2/sse4/avx +%endif ; mmxext/sse2/sse4/avx pminsw m2, [yuv2yuvX_%1_upper] %endif ; %1 == 9/10/16 mova [dstq+r5*2], m2 diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 59626804cc..486f436702 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -84,7 +84,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; #define RV ((int)( 0.439*(1<<RGB2YUV_SHIFT)+0.5)) #define RU ((int)(-0.148*(1<<RGB2YUV_SHIFT)+0.5)) -//Note: We have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW + MMX2 one. +// Note: We have C, MMX, MMXEXT, 3DNOW versions, there is no 3DNOW + MMXEXT one. #define COMPILE_TEMPLATE_MMXEXT 0 #define COMPILE_TEMPLATE_AMD3DNOW 0 @@ -95,7 +95,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; #define RENAME(a) a ## _MMX #include "rgb2rgb_template.c" -//MMX2 versions +// MMXEXT versions #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT #define COMPILE_TEMPLATE_MMXEXT 1 @@ -123,7 +123,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; /* RGB15->RGB16 original by Strepto/Astral ported to gcc & bugfixed : A'rpi - MMX2, 3DNOW optimization by Nick Kurshev + MMXEXT, 3DNOW optimization by Nick Kurshev 32-bit C version, and and&add trick by Michael Niedermayer */ diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index f312053b1b..205b749244 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -181,7 +181,7 @@ static inline void RENAME(rgb32tobgr24)(const uint8_t *src, uint8_t *dst, int sr /* original by Strepto/Astral ported to gcc & bugfixed: A'rpi - MMX2, 3DNOW optimization by Nick Kurshev + MMXEXT, 3DNOW optimization by Nick Kurshev 32-bit C version, and and&add trick by Michael Niedermayer */ static inline void RENAME(rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index ba7990e20b..fc74d97201 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -78,7 +78,7 @@ DECLARE_ALIGNED(8, const uint64_t, ff_w1111) = 0x0001000100010001ULL; #include "swscale_template.c" #endif -//MMX2 versions +// MMXEXT versions #if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT diff --git a/libswscale/x86/swscale_template.c b/libswscale/x86/swscale_template.c index 0d5ba7ee69..8be6398f59 100644 --- a/libswscale/x86/swscale_template.c +++ b/libswscale/x86/swscale_template.c @@ -1615,7 +1615,7 @@ static av_cold void RENAME(sws_init_swScale)(SwsContext *c) } if (c->srcBpc == 8 && c->dstBpc <= 10) { - // Use the new MMX scaler if the MMX2 one can't be used (it is faster than the x86 ASM one). + // Use the new MMX scaler if the MMXEXT one can't be used (it is faster than the x86 ASM one). #if COMPILE_TEMPLATE_MMXEXT if (c->flags & SWS_FAST_BILINEAR && c->canMMX2BeUsed) { diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index b7d8f42583..17ac3e2ffe 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -3,7 +3,7 @@ * * Copyright (C) 2009 Konstantin Shishkov * - * MMX/MMX2 template stuff (needed for fast movntq support), + * MMX/MMXEXT template stuff (needed for fast movntq support), * 1,4,8bpp support and context / deglobalize stuff * by Michael Niedermayer (michaelni@gmx.at) * @@ -58,7 +58,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; #include "yuv2rgb_template.c" #endif /* HAVE_MMX_INLINE */ -//MMX2 versions +// MMXEXT versions #if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT |