Merged DSUtils Win32 and Win64 code

CCpuID rewritten using intrinsics

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1798 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 93 insertions, 1113 deletions

diff --git a/src/DSUtil/vd.cpp b/src/DSUtil/vd.cpp
index 0b06b043b..2e63d89ed 100644
--- a/src/DSUtil/vd.cpp
+++ b/src/DSUtil/vd.cpp
@@ -24,422 +24,41 @@
 

 #include "stdafx.h"

 #include "vd.h"

+#include "vd_asm.h"

 #include "cpuid_32_64.h"

+#include <intrin.h>

 

 #pragma warning(disable : 4799) // no emms... blahblahblah

 

-#ifdef _WIN64 // _WIN64

-

 CCpuID g_cpuid;

 

 CCpuID::CCpuID()

-{

-	// TODOX64 : ??

-	CPUID_ARGS ca;

-	ca.eax = 1;

-	_CPUID(&ca);

-

-	int t = ca.edx;

+{       

+	int CPUInfo[4] = {-1};

+	__cpuid(CPUInfo, 1);

+	int t = CPUInfo[3];

 

 	int mflags = 0;

 	mflags |= ((t&0x00800000)!=0) ? mmx : 0;			// STD MMX

-	mflags |= ((t&0x02000000)!=0) ? ssemmx+ssefpu : 0;// STD SSE

+	mflags |= ((t&0x02000000)!=0) ? ssemmx+ssefpu : 0;	// STD SSE

 	mflags |= ((t&0x04000000)!=0) ? sse2 : 0;			// SSE2

 

+	t = CPUInfo[2];

+	mflags |= ((t&0x00000001)!=0) ? sse3 : 0;			// SSE3

+

 	// 3dnow

-	ca.eax = 0x80000001;

-	_CPUID(&ca);

-	t = ca.edx;

-	mflags |= ((t&0x80000000)!=0) ? _3dnow : 0;		// 3D NOW

-	mflags |= ((t&0x00400000)!=0) ? ssemmx : 0;		// SSE MMX

-	

+	__cpuid(CPUInfo, 0x80000001);

+	t = CPUInfo[3];

+	mflags |= ((t&0x80000000)!=0) ? _3dnow : 0;			// 3D NOW

+	mflags |= ((t&0x00400000)!=0) ? ssemmx : 0;			// SSE MMX

+

 	// result

-	//m_flags = (flag_t)7;

 	m_flags = (flag_t)mflags;

 }

 

-static void yuvtoyuy2row_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width)

-{

-	WORD* dstw = (WORD*)dst;

-	for(; width > 1; width -= 2)

-	{

-		*dstw++ = (*srcu++<<8)|*srcy++;

-		*dstw++ = (*srcv++<<8)|*srcy++;

-	}

-}

-

-static void yuvtoyuy2row_avg_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv)

-{

-	WORD* dstw = (WORD*)dst;

-	for(; width > 1; width -= 2, srcu++, srcv++)

-	{

-		*dstw++ = (((srcu[0]+srcu[pitchuv])>>1)<<8)|*srcy++;

-		*dstw++ = (((srcv[0]+srcv[pitchuv])>>1)<<8)|*srcy++;

-	}

-}

-

-static void asm_blend_row_clipped_c(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	BYTE* src2 = src + srcpitch;

-	do {*dst++ = (*src++ + *src2++ + 1) >> 1;}

-	while(w--);

-}

-

-static void asm_blend_row_c(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	BYTE* src2 = src + srcpitch;

-	BYTE* src3 = src2 + srcpitch;

-	do {*dst++ = (*src++ + (*src2++ << 1) + *src3++ + 2) >> 2;}

-	while(w--);

-}

-

-bool BitBltFromI420ToI420(int w, int h, BYTE* dsty, BYTE* dstu, BYTE* dstv, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)

-{

-	if((w&1)) return(false);

-

-	if(w > 0 && w == srcpitch && w == dstpitch)

-	{

-		memcpy(dsty, srcy, h*srcpitch);

-		memcpy(dstu, srcu, h/2*srcpitch/2);

-		memcpy(dstv, srcv, h/2*srcpitch/2);

-	}

-	else

-	{

-		int pitch = min(abs(srcpitch), abs(dstpitch));

-

-		for(ptrdiff_t y = 0; y < h; y++, srcy += srcpitch, dsty += dstpitch)

-			memcpy(dsty, srcy, pitch);

-

-		srcpitch >>= 1;

-		dstpitch >>= 1;

-

-		pitch = min(abs(srcpitch), abs(dstpitch));

-

-		for(ptrdiff_t y = 0; y < h; y+=2, srcu += srcpitch, dstu += dstpitch)

-			memcpy(dstu, srcu, pitch);

-

-		for(ptrdiff_t y = 0; y < h; y+=2, srcv += srcpitch, dstv += dstpitch)

-			memcpy(dstv, srcv, pitch);

-	}

-

-	return true;

-}

-

-bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch, bool fInterlaced)

-{

-	if(w<=0 || h<=0 || (w&1) || (h&1))

-		return(false);

-

-	if(srcpitch == 0) srcpitch = w;

-

-	do

-	{

-		yuvtoyuy2row_c(dst, srcy, srcu, srcv, w);

-		yuvtoyuy2row_avg_c(dst + dstpitch, srcy + srcpitch, srcu, srcv, w, srcpitch/2);

-

-		dst += 2*dstpitch;

-		srcy += srcpitch*2;

-		srcu += srcpitch/2;

-		srcv += srcpitch/2;

-	}

-	while((h -= 2) > 2);

-

-	yuvtoyuy2row_c(dst, srcy, srcu, srcv, w);

-	yuvtoyuy2row_c(dst + dstpitch, srcy + srcpitch, srcu, srcv, w);

-

-	return(true);

-}

-

-bool BitBltFromYUY2ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* src, int srcpitch)

-{

-	if(w > 0 && w == srcpitch && w == dstpitch)

-	{

-		memcpy(dst, src, h*srcpitch);

-	}

-	else

-	{

-		int pitch = min(abs(srcpitch), abs(dstpitch));

-

-		for(ptrdiff_t y = 0; y < h; y++, src += srcpitch, dst += dstpitch)

-			memcpy(dst, src, pitch);

-	}

-

-	return(true);

-}

-

-bool BitBltFromI420ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)

-{

-	ASSERT(FALSE);

-	return false;

-}

-

-bool BitBltFromRGBToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* src, int srcpitch, int sbpp)

-{

-	if(dbpp == sbpp)

-	{

-		int rowbytes = w*dbpp>>3;

-

-		if(rowbytes > 0 && rowbytes == srcpitch && rowbytes == dstpitch)

-		{

-			memcpy(dst, src, h*rowbytes);

-		}

-		else

-		{

-			for(ptrdiff_t y = 0; y < h; y++, src += srcpitch, dst += dstpitch)

-				memcpy(dst, src, rowbytes);

-		}

-

-		return(true);

-	}

-	

-	if(sbpp != 16 && sbpp != 24 && sbpp != 32

-	|| dbpp != 16 && dbpp != 24 && dbpp != 32)

-		return(false);

-

-	if(dbpp == 16)

-	{

-		for(ptrdiff_t y = 0; y < h; y++, src += srcpitch, dst += dstpitch)

-		{

-			if(sbpp == 24)

-			{

-				BYTE* s = (BYTE*)src;

-				WORD* d = (WORD*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s+=3, d++)

-					*d = (WORD)(((*((DWORD*)s)>>8)&0xf800)|((*((DWORD*)s)>>5)&0x07e0)|((*((DWORD*)s)>>3)&0x1f));

-			}

-			else if(sbpp == 32)

-			{

-				DWORD* s = (DWORD*)src;

-				WORD* d = (WORD*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s++, d++)

-					*d = (WORD)(((*s>>8)&0xf800)|((*s>>5)&0x07e0)|((*s>>3)&0x1f));

-			}

-		}

-	}

-	else if(dbpp == 24)

-	{

-		for(ptrdiff_t y = 0; y < h; y++, src += srcpitch, dst += dstpitch)

-		{

-			if(sbpp == 16)

-			{

-				WORD* s = (WORD*)src;

-				BYTE* d = (BYTE*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s++, d+=3)

-				{	// not tested, r-g-b might be in reverse

-					d[0] = (*s&0x001f)<<3;

-					d[1] = (*s&0x07e0)<<5;

-					d[2] = (*s&0xf800)<<8;

-				}

-			}

-			else if(sbpp == 32)

-			{

-				BYTE* s = (BYTE*)src;

-				BYTE* d = (BYTE*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s+=4, d+=3)

-					{d[0] = s[0]; d[1] = s[1]; d[2] = s[2];}

-			}

-		}

-	}

-	else if(dbpp == 32)

-	{

-		for(ptrdiff_t y = 0; y < h; y++, src += srcpitch, dst += dstpitch)

-		{

-			if(sbpp == 16)

-			{

-				WORD* s = (WORD*)src;

-				DWORD* d = (DWORD*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s++, d++)

-					*d = ((*s&0xf800)<<8)|((*s&0x07e0)<<5)|((*s&0x001f)<<3);

-			}

-			else if(sbpp == 24)

-			{	

-				BYTE* s = (BYTE*)src;

-				DWORD* d = (DWORD*)dst;

-				for(ptrdiff_t x = 0; x < w; x++, s+=3, d++)

-					*d = *((DWORD*)s)&0xffffff;

-			}

-		}

-	}

-

-	return(true);

-}

-

-bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* src, int srcpitch)

-{

-	ASSERT(FALSE);

-	return false;

-}

-

-void DeinterlaceBlend(BYTE* dst, BYTE* src, DWORD rowbytes, DWORD h, DWORD dstpitch, DWORD srcpitch)

-{

-

-	asm_blend_row_clipped_c(dst, src, rowbytes, srcpitch);

-

-	if((h -= 2) > 0) do

-	{

-		dst += dstpitch;

-		asm_blend_row_c(dst, src, rowbytes, srcpitch);

-        src += srcpitch;

-	}

-	while(--h);

-

-	asm_blend_row_clipped_c(dst + dstpitch, src, rowbytes, srcpitch);

-

-}

-

-void DeinterlaceBob(BYTE* dst, BYTE* src, DWORD rowbytes, DWORD h, DWORD dstpitch, DWORD srcpitch, bool topfield)

-{

-	if(topfield)

-	{

-		BitBltFromRGBToRGB(rowbytes, h/2, dst, dstpitch*2, 8, src, srcpitch*2, 8);

-		AvgLines8(dst, h, dstpitch);

-	}

-	else

-	{

-		BitBltFromRGBToRGB(rowbytes, h/2, dst + dstpitch, dstpitch*2, 8, src + srcpitch, srcpitch*2, 8);

-		AvgLines8(dst + dstpitch, h-1, dstpitch);

-	}

-}

-

-void AvgLines8(BYTE* dst, DWORD h, DWORD pitch)

-{

-	if(h <= 1) return;

-

-	BYTE* s = dst;

-	BYTE* d = dst + (h-2)*pitch;

-

-	for(; s < d; s += pitch*2)

-	{

-		BYTE* tmp = s;

-

-		{

-			for(ptrdiff_t i = pitch; i--; tmp++)

-			{

-				tmp[pitch] = (tmp[0] + tmp[pitch<<1] + 1) >> 1;

-			}

-		}

-	}

-

-	if(!(h&1) && h >= 2)

-	{

-		dst += (h-2)*pitch;

-		memcpy(dst + pitch, dst, pitch);

-	}

-

-}

-

-void AvgLines555(BYTE* dst, DWORD h, DWORD pitch)

-{

-	if(h <= 1) return;

-

-	BYTE* s = dst;

-	BYTE* d = dst + (h-2)*pitch;

-

-	for(; s < d; s += pitch*2)

-	{

-		WORD* tmp = (WORD*)s;

-		

-		for(ptrdiff_t wd=(pitch>>3);wd--;tmp++)

-		{

-			tmp[0] = 

-				((((*tmp&0x7c00) + (tmp[pitch<<1]&0x7c00)) >> 1)&0x7c00)|

-				((((*tmp&0x03e0) + (tmp[pitch<<1]&0x03e0)) >> 1)&0x03e0)|

-				((((*tmp&0x001f) + (tmp[pitch<<1]&0x001f)) >> 1)&0x001f);

-		}

-

-		for(ptrdiff_t i = (pitch&7)>>1; i--; tmp++)

-		{

-			tmp[pitch] = 

-				((((*tmp&0x7c00) + (tmp[pitch<<1]&0x7c00)) >> 1)&0x7c00)|

-				((((*tmp&0x03e0) + (tmp[pitch<<1]&0x03e0)) >> 1)&0x03e0)|

-				((((*tmp&0x001f) + (tmp[pitch<<1]&0x001f)) >> 1)&0x001f);

-		}

-	}

-

-	if(!(h&1) && h >= 2)

-	{

-		dst += (h-2)*pitch;

-		memcpy(dst + pitch, dst, pitch);

-	}

-}

-

-void AvgLines565(BYTE* dst, DWORD h, DWORD pitch)

-{

-	if(h <= 1) return;

-

-	BYTE* s = dst;

-	BYTE* d = dst + (h-2)*pitch;

-

-	for(; s < d; s += pitch*2)

-	{

-		WORD* tmp = (WORD*)s;

-

-		for(ptrdiff_t wd=(pitch>>3);wd--;tmp++)

-		{

-			tmp[0] = 

-				((((*tmp&0xf800) + (tmp[pitch<<1]&0xf800)) >> 1)&0xf800)|

-				((((*tmp&0x07e0) + (tmp[pitch<<1]&0x07e0)) >> 1)&0x07e0)|

-				((((*tmp&0x001f) + (tmp[pitch<<1]&0x001f)) >> 1)&0x001f);

-		}

-

-		for(ptrdiff_t i = (pitch&7)>>1; i--; tmp++)

-		{

-			tmp[pitch] = 

-				((((*tmp&0xf800) + (tmp[pitch<<1]&0xf800)) >> 1)&0xf800)|

-				((((*tmp&0x07e0) + (tmp[pitch<<1]&0x07e0)) >> 1)&0x07e0)|

-				((((*tmp&0x001f) + (tmp[pitch<<1]&0x001f)) >> 1)&0x001f);

-		}

-	}

-

-	if(!(h&1) && h >= 2)

-	{

-		dst += (h-2)*pitch;

-		memcpy(dst + pitch, dst, pitch);

-	}

-}

-

-#else // _WIN64

-

-CCpuID::CCpuID()

-{

-	DWORD flags = 0;

-

-	__asm

-	{

-		mov			eax, 1

-		cpuid

-		test		edx, 0x00800000		// STD MMX

-		jz			TEST_SSE

-		or			[flags], 1

-TEST_SSE:

-		test		edx, 0x02000000		// STD SSE

-		jz			TEST_SSE2

-		or			[flags], 2

-		or			[flags], 4

-TEST_SSE2:

-		test		edx, 0x04000000		// SSE2	

-		jz			TEST_3DNOW

-		or			[flags], 8

-TEST_3DNOW:

-		mov			eax, 0x80000001

-		cpuid

-		test		edx, 0x80000000		// 3D NOW

-		jz			TEST_SSEMMX

-		or			[flags], 16

-TEST_SSEMMX:

-		test		edx, 0x00400000		// SSE MMX

-		jz			TEST_END

-		or			[flags], 2

-TEST_END:

-	}

-

-	m_flags = (flag_t)flags;

-}

-

-CCpuID g_cpuid;

-

 void memcpy_accel(void* dst, const void* src, size_t len)

 {

+#ifndef _WIN64

 	if((g_cpuid.m_flags & CCpuID::ssefpu) && len >= 128 

 		&& !((DWORD)src&15) && !((DWORD)dst&15))

 	{

@@ -532,6 +151,7 @@ void memcpy_accel(void* dst, const void* src, size_t len)
 		}

 	}

 	else

+#endif

 	{

 		memcpy(dst, src, len);

 	}

@@ -560,21 +180,26 @@ static void yuvtoyuy2row_avg_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DW
 static void asm_blend_row_clipped_c(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

 {

 	BYTE* src2 = src + srcpitch;

-	do {*dst++ = (*src++ + *src2++ + 1) >> 1;}

-	while(w--);

+	do 

+	{

+		*dst++ = (*src++ + *src2++ + 1) >> 1;

+	} while(w--);

 }

 

 static void asm_blend_row_c(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

 {

 	BYTE* src2 = src + srcpitch;

 	BYTE* src3 = src2 + srcpitch;

-	do {*dst++ = (*src++ + (*src2++ << 1) + *src3++ + 2) >> 2;}

-	while(w--);

+	do

+	{

+		*dst++ = (*src++ + (*src2++ << 1) + *src3++ + 2) >> 2;

+	} while(w--);

 }

 

 bool BitBltFromI420ToI420(int w, int h, BYTE* dsty, BYTE* dstu, BYTE* dstv, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)

 {

-	if((w&1)) return(false);

+	if((w&1))

+		return(false);

 

 	if(w > 0 && w == srcpitch && w == dstpitch)

 	{

@@ -601,7 +226,7 @@ bool BitBltFromI420ToI420(int w, int h, BYTE* dsty, BYTE* dstu, BYTE* dstv, int
 			memcpy_accel(dstv, srcv, pitch);

 	}

 

-	return true;

+	return(true);

 }

 

 bool BitBltFromYUY2ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* src, int srcpitch)

@@ -621,6 +246,7 @@ bool BitBltFromYUY2ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* src, int
 	return(true);

 }

 

+#ifndef _WIN64

 extern "C" void asm_YUVtoRGB32_row(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

 extern "C" void asm_YUVtoRGB24_row(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

 extern "C" void asm_YUVtoRGB16_row(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

@@ -630,12 +256,14 @@ extern "C" void asm_YUVtoRGB16_row_MMX(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE*
 extern "C" void asm_YUVtoRGB32_row_ISSE(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

 extern "C" void asm_YUVtoRGB24_row_ISSE(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

 extern "C" void asm_YUVtoRGB16_row_ISSE(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width);

+#endif

 

 bool BitBltFromI420ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)

 {

 	if(w<=0 || h<=0 || (w&1) || (h&1))

 		return(false);

 

+#ifndef _WIN64

 	void (*asm_YUVtoRGB_row)(void* ARGB1, void* ARGB2, BYTE* Y1, BYTE* Y2, BYTE* U, BYTE* V, long width) = NULL;;

 

 	if((g_cpuid.m_flags & CCpuID::ssefpu) && !(w&7))

@@ -686,409 +314,11 @@ bool BitBltFromI420ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE*
 	if(g_cpuid.m_flags & CCpuID::ssefpu)

 		__asm sfence

 

-	return true;

-}

-

-static void __declspec(naked) yuvtoyuy2row_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width)

-{

-	__asm {

-		push	ebp

-		push	edi

-		push	esi

-		push	ebx

-

-		mov		edi, [esp+20] // dst

-		mov		ebp, [esp+24] // srcy

-		mov		ebx, [esp+28] // srcu

-		mov		esi, [esp+32] // srcv

-		mov		ecx, [esp+36] // width

-

-		shr		ecx, 3

-

-yuvtoyuy2row_loop:

-

-		movd		mm0, [ebx]

-		punpcklbw	mm0, [esi]

-

-		movq		mm1, [ebp]

-		movq		mm2, mm1

-		punpcklbw	mm1, mm0

-		punpckhbw	mm2, mm0

-

-		movq		[edi], mm1

-		movq		[edi+8], mm2

-

-		add		ebp, 8

-		add		ebx, 4

-		add		esi, 4

-        add		edi, 16

-

-		dec		ecx

-		jnz		yuvtoyuy2row_loop

-

-		pop		ebx

-		pop		esi

-		pop		edi

-		pop		ebp

-		ret

-	};

-}

-

-static void __declspec(naked) yuvtoyuy2row_avg_MMX(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv)

-{

-	static const __int64 mask = 0x7f7f7f7f7f7f7f7fi64;

-

-	__asm {

-		push	ebp

-		push	edi

-		push	esi

-		push	ebx

-

-		movq	mm7, mask

-

-		mov		edi, [esp+20] // dst

-		mov		ebp, [esp+24] // srcy

-		mov		ebx, [esp+28] // srcu

-		mov		esi, [esp+32] // srcv

-		mov		ecx, [esp+36] // width

-		mov		eax, [esp+40] // pitchuv

-

-		shr		ecx, 3

-

-yuvtoyuy2row_avg_loop:

-

-		movd		mm0, [ebx]

-		punpcklbw	mm0, [esi]

-		movq		mm1, mm0

-

-		movd		mm2, [ebx + eax]

-		punpcklbw	mm2, [esi + eax]

-		movq		mm3, mm2

-

-		// (x+y)>>1 == (x&y)+((x^y)>>1)

-

-		pand		mm0, mm2

-		pxor		mm1, mm3

-		psrlq		mm1, 1

-		pand		mm1, mm7

-		paddb		mm0, mm1

-

-		movq		mm1, [ebp]

-		movq		mm2, mm1

-		punpcklbw	mm1, mm0

-		punpckhbw	mm2, mm0

-

-		movq		[edi], mm1

-		movq		[edi+8], mm2

-

-		add		ebp, 8

-		add		ebx, 4

-		add		esi, 4

-        add		edi, 16

-

-		dec		ecx

-		jnz		yuvtoyuy2row_avg_loop

-

-		pop		ebx

-		pop		esi

-		pop		edi

-		pop		ebp

-		ret

-	};

-}

-

-static void __declspec(naked) yv12_yuy2_row_sse2() {

-  __asm {

-    // ebx - Y

-    // edx - U

-    // esi - V

-    // edi - dest

-    // ecx - halfwidth

-    xor     eax, eax

-

-one:

-    movdqa  xmm0, [ebx + eax*2]    // YYYYYYYY

-    movdqa  xmm1, [ebx + eax*2 + 16]    // YYYYYYYY

-

-    movdqa  xmm2, [edx + eax]      // UUUUUUUU

-    movdqa  xmm3, [esi + eax]      // VVVVVVVV

-

-    movdqa  xmm4, xmm2

-    movdqa  xmm5, xmm0

-    movdqa  xmm6, xmm1

-    punpcklbw xmm2, xmm3          // VUVUVUVU

-    punpckhbw xmm4, xmm3          // VUVUVUVU

-

-    punpcklbw xmm0, xmm2          // VYUYVYUY

-    punpcklbw xmm1, xmm4

-    punpckhbw xmm5, xmm2

-    punpckhbw xmm6, xmm4

-

-    movntdq [edi + eax*4], xmm0

-    movntdq [edi + eax*4 + 16], xmm5

-    movntdq [edi + eax*4 + 32], xmm1

-    movntdq [edi + eax*4 + 48], xmm6

-

-    add     eax, 16

-    cmp     eax, ecx

-

-    jb      one

-

-    ret

-  };

-}

-

-static void __declspec(naked) yv12_yuy2_row_sse2_linear() {

-  __asm {

-    // ebx - Y

-    // edx - U

-    // esi - V

-    // edi - dest

-    // ecx - width

-    // ebp - uv_stride

-    xor     eax, eax

-

-one:

-    movdqa  xmm0, [ebx + eax*2]    // YYYYYYYY

-    movdqa  xmm1, [ebx + eax*2 + 16]    // YYYYYYYY

-

-    movdqa  xmm2, [edx]

-    movdqa  xmm3, [esi]

-    pavgb   xmm2, [edx + ebp]      // UUUUUUUU

-    pavgb   xmm3, [esi + ebp]      // VVVVVVVV

-

-    movdqa  xmm4, xmm2

-    movdqa  xmm5, xmm0

-    movdqa  xmm6, xmm1

-    punpcklbw xmm2, xmm3          // VUVUVUVU

-    punpckhbw xmm4, xmm3          // VUVUVUVU

-

-    punpcklbw xmm0, xmm2          // VYUYVYUY

-    punpcklbw xmm1, xmm4

-    punpckhbw xmm5, xmm2

-    punpckhbw xmm6, xmm4

-

-    movntdq [edi + eax*4], xmm0

-    movntdq [edi + eax*4 + 16], xmm5

-    movntdq [edi + eax*4 + 32], xmm1

-    movntdq [edi + eax*4 + 48], xmm6

-

-    add     eax, 16

-    add     edx, 16

-    add     esi, 16

-    cmp     eax, ecx

-

-    jb      one

-

-    ret

-  };

-}

-

-static void __declspec(naked) yv12_yuy2_row_sse2_linear_interlaced() {

-  __asm {

-    // ebx - Y

-    // edx - U

-    // esi - V

-    // edi - dest

-    // ecx - width

-    // ebp - uv_stride

-    xor     eax, eax

-

-one:

-    movdqa  xmm0, [ebx + eax*2]    // YYYYYYYY

-    movdqa  xmm1, [ebx + eax*2 + 16]    // YYYYYYYY

-

-    movdqa  xmm2, [edx]

-    movdqa  xmm3, [esi]

-    pavgb   xmm2, [edx + ebp*2]      // UUUUUUUU

-    pavgb   xmm3, [esi + ebp*2]      // VVVVVVVV

-

-    movdqa  xmm4, xmm2

-    movdqa  xmm5, xmm0

-    movdqa  xmm6, xmm1

-    punpcklbw xmm2, xmm3          // VUVUVUVU

-    punpckhbw xmm4, xmm3          // VUVUVUVU

-

-    punpcklbw xmm0, xmm2          // VYUYVYUY

-    punpcklbw xmm1, xmm4

-    punpckhbw xmm5, xmm2

-    punpckhbw xmm6, xmm4

-

-    movntdq [edi + eax*4], xmm0

-    movntdq [edi + eax*4 + 16], xmm5

-    movntdq [edi + eax*4 + 32], xmm1

-    movntdq [edi + eax*4 + 48], xmm6

-

-    add     eax, 16

-    add     edx, 16

-    add     esi, 16

-    cmp     eax, ecx

-

-    jb      one

-

-    ret

-  };

-}

-

-void __declspec(naked) yv12_yuy2_sse2(const BYTE *Y, const BYTE *U, const BYTE *V,

-    int halfstride, unsigned halfwidth, unsigned height,

-    BYTE *YUY2, int d_stride)

-{

-  __asm {

-    push    ebx

-    push    esi

-    push    edi

-    push    ebp

-

-    mov     ebx, [esp + 20] // Y

-    mov     edx, [esp + 24] // U

-    mov     esi, [esp + 28] // V

-    mov     edi, [esp + 44] // D

-    mov     ebp, [esp + 32] // uv_stride

-    mov     ecx, [esp + 36] // uv_width

-

-    mov     eax, ecx

-    add     eax, 15

-    and     eax, 0xfffffff0

-    sub     [esp + 32], eax

-

-    cmp     dword ptr [esp + 40], 2

-    jbe     last2

-

-row:

-    sub     dword ptr [esp + 40], 2

-    call    yv12_yuy2_row_sse2

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    call    yv12_yuy2_row_sse2_linear

-

-    add     edx, [esp + 32]

-    add     esi, [esp + 32]

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    cmp     dword ptr [esp + 40], 2

-    ja      row

-

-last2:

-    call    yv12_yuy2_row_sse2

-

-    dec     dword ptr [esp + 40]

-    jz      done

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-    call    yv12_yuy2_row_sse2

-done:

-

-    pop     ebp

-    pop     edi

-    pop     esi

-    pop     ebx

-

-    ret

-  };

-}

-

-void __declspec(naked) yv12_yuy2_sse2_interlaced(const BYTE *Y, const BYTE *U, const BYTE *V,

-    int halfstride, unsigned halfwidth, unsigned height,

-    BYTE *YUY2, int d_stride)

-{

-  __asm {

-    push    ebx

-    push    esi

-    push    edi

-    push    ebp

-

-    mov     ebx, [esp + 20] // Y

-    mov     edx, [esp + 24] // U

-    mov     esi, [esp + 28] // V

-    mov     edi, [esp + 44] // D

-    mov     ebp, [esp + 32] // uv_stride

-    mov     ecx, [esp + 36] // uv_width

-

-    mov     eax, ecx

-    add     eax, 15

-    and     eax, 0xfffffff0

-    sub     [esp + 32], eax

-

-    cmp     dword ptr [esp + 40], 4

-    jbe     last4

-

-row:

-    sub     dword ptr [esp + 40], 4

-    call    yv12_yuy2_row_sse2	// first row, first field

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    add	    edx, ebp

-    add	    esi, ebp

-

-    call    yv12_yuy2_row_sse2	// first row, second field

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    sub	    edx, ebp

-    sub	    esi, ebp

-

-    call    yv12_yuy2_row_sse2_linear_interlaced // second row, first field

-

-    add     edx, [esp + 32]

-    add     esi, [esp + 32]

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    call    yv12_yuy2_row_sse2_linear_interlaced // second row, second field

-

-    add     edx, [esp + 32]

-    add     esi, [esp + 32]

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    cmp     dword ptr [esp + 40], 4

-    ja      row

-

-last4:

-    call    yv12_yuy2_row_sse2

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    add     edx, ebp

-    add     esi, ebp

-

-    call    yv12_yuy2_row_sse2

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    sub     edx, ebp

-    sub     esi, ebp

-

-    call    yv12_yuy2_row_sse2

-

-    lea     ebx, [ebx + ebp*2]

-    add     edi, [esp + 48]

-

-    add     edx, ebp

-    add     esi, ebp

-

-    call    yv12_yuy2_row_sse2

-

-    pop     ebp

-    pop     edi

-    pop     esi

-    pop     ebx

-

-    ret

-  };

+	return(true);

+#else

+	ASSERT(FALSE);

+	return(false);

+#endif

 }

 

 bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch, bool fInterlaced)

@@ -1098,28 +328,30 @@ bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYT
 

 	if(srcpitch == 0) srcpitch = w;

 

+	void (*yuvtoyuy2row)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width) = NULL;

+	void (*yuvtoyuy2row_avg)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv) = NULL;

+

+#ifndef _WIN64

 	if((g_cpuid.m_flags & CCpuID::sse2) 

         && !((DWORD_PTR)srcy&15) && !((DWORD_PTR)srcu&15) && !((DWORD_PTR)srcv&15) && !(srcpitch&31) 

         && !((DWORD_PTR)dst&15) && !(dstpitch&15))

 	{

 		if(!fInterlaced) yv12_yuy2_sse2(srcy, srcu, srcv, srcpitch/2, w/2, h, dst, dstpitch);

 		else yv12_yuy2_sse2_interlaced(srcy, srcu, srcv, srcpitch/2, w/2, h, dst, dstpitch);

-		return true;

+		return(true);

 	}

 	else

 	{

 		ASSERT(!fInterlaced);

 	}

 

-	void (*yuvtoyuy2row)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width) = NULL;

-	void (*yuvtoyuy2row_avg)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv) = NULL;

-

 	if((g_cpuid.m_flags & CCpuID::mmx) && !(w&7))

 	{

 		yuvtoyuy2row = yuvtoyuy2row_MMX;

 		yuvtoyuy2row_avg = yuvtoyuy2row_avg_MMX;

 	}

 	else

+#endif

 	{

 		yuvtoyuy2row = yuvtoyuy2row_c;

 		yuvtoyuy2row_avg = yuvtoyuy2row_avg_c;

@@ -1143,8 +375,10 @@ bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYT
 	yuvtoyuy2row(dst, srcy, srcu, srcv, w);

 	yuvtoyuy2row(dst + dstpitch, srcy + srcpitch, srcu, srcv, w);

 

+#ifndef _WIN64

 	if(g_cpuid.m_flags & CCpuID::mmx)

 		__asm emms

+#endif

 

 	return(true);

 }

@@ -1240,329 +474,48 @@ bool BitBltFromRGBToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* s
 	return(true);

 }

 

-static void __declspec(naked) asm_blend_row_clipped_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	static const __int64 _x0001000100010001 = 0x0001000100010001;

-

-	__asm {

-		push	ebp

-		push	edi

-		push	esi

-		push	ebx

-

-		mov		edi,[esp+20]

-		mov		esi,[esp+24]

-		sub		edi,esi

-		mov		ebp,[esp+28]

-		mov		edx,[esp+32]

-

-		shr		ebp, 3

-

-		movq	mm6, _x0001000100010001

-		pxor	mm7, mm7

-

-xloop:

-		movq		mm0, [esi]

-		movq		mm3, mm0

-		punpcklbw	mm0, mm7

-		punpckhbw	mm3, mm7

-

-		movq		mm1, [esi+edx]

-		movq		mm4, mm1

-		punpcklbw	mm1, mm7

-		punpckhbw	mm4, mm7

-

-		paddw		mm1, mm0

-		paddw		mm1, mm6

-		psrlw		mm1, 1

-

-		paddw		mm4, mm3

-		paddw		mm4, mm6

-		psrlw		mm4, 1

-

-		add			esi, 8

-		packuswb	mm1, mm4

-		movq		[edi+esi-8], mm1

-

-		dec		ebp

-		jne		xloop

-

-		pop		ebx

-		pop		esi

-		pop		edi

-		pop		ebp

-		ret

-	};

-}

-

-static void __declspec(naked) asm_blend_row_MMX(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	static const __int64 mask0 = 0xfcfcfcfcfcfcfcfci64;

-	static const __int64 mask1 = 0x7f7f7f7f7f7f7f7fi64;

-	static const __int64 mask2 = 0x3f3f3f3f3f3f3f3fi64;

-	static const __int64 _x0002000200020002 = 0x0002000200020002;

-

-	__asm {

-		push	ebp

-		push	edi

-		push	esi

-		push	ebx

-

-		mov		edi, [esp+20]

-		mov		esi, [esp+24]

-		sub		edi, esi

-		mov		ebp, [esp+28]

-		mov		edx, [esp+32]

-

-		shr		ebp, 3

-

-		movq	mm6, _x0002000200020002

-		pxor	mm7, mm7

-

-xloop:

-		movq		mm0, [esi]

-		movq		mm3, mm0

-		punpcklbw	mm0, mm7

-		punpckhbw	mm3, mm7

-

-		movq		mm1, [esi+edx]

-		movq		mm4, mm1

-		punpcklbw	mm1, mm7

-		punpckhbw	mm4, mm7

-

-		movq		mm2, [esi+edx*2]

-		movq		mm5, mm2

-		punpcklbw	mm2, mm7

-		punpckhbw	mm5, mm7

-

-		psllw		mm1, 1

-		paddw		mm1, mm0

-		paddw		mm1, mm2

-		paddw		mm1, mm6

-		psrlw		mm1, 2

-

-		psllw		mm4, 1

-		paddw		mm4, mm3

-		paddw		mm4, mm5

-		paddw		mm4, mm6

-		psrlw		mm4, 2

-

-		add			esi, 8

-		packuswb	mm1, mm4

-		movq		[edi+esi-8], mm1

-

-		dec		ebp

-		jne		xloop

-

-		// sadly the original code makes a lot of visible banding artifacts on yuv

-		// (it seems those shiftings without rounding introduce too much error)

-/*

-		mov		edi,[esp+20]

-		mov		esi,[esp+24]

-		sub		edi,esi

-		mov		ebp,[esp+28]

-		mov		edx,[esp+32]

-

-		movq	mm5,mask0

-		movq	mm6,mask1

-		movq	mm7,mask2

-		shr		ebp,1

-		jz		oddpart

-

-xloop:

-		movq	mm2,[esi]

-		movq	mm0,mm5

-

-		movq	mm1,[esi+edx]

-		pand	mm0,mm2

-

-		psrlq	mm1,1

-		movq	mm2,[esi+edx*2]

-

-		psrlq	mm2,2

-		pand	mm1,mm6

-

-		psrlq	mm0,2

-		pand	mm2,mm7

-

-		paddb	mm0,mm1

-		add		esi,8

-

-		paddb	mm0,mm2

-		dec		ebp

-

-		movq	[edi+esi-8],mm0

-		jne		xloop

-

-oddpart:

-		test	byte ptr [esp+28],1

-		jz		nooddpart

-

-		mov		ecx,[esi]

-		mov		eax,0fcfcfcfch

-		mov		ebx,[esi+edx]

-		and		eax,ecx

-		shr		ebx,1

-		mov		ecx,[esi+edx*2]

-		shr		ecx,2

-		and		ebx,07f7f7f7fh

-		shr		eax,2

-		and		ecx,03f3f3f3fh

-		add		eax,ebx

-		add		eax,ecx

-		mov		[edi+esi],eax

-

-nooddpart:

-*/

-		pop		ebx

-		pop		esi

-		pop		edi

-		pop		ebp

-		ret

-	};

-}

-

-__declspec(align(16)) static BYTE const_1_16_bytes[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};

-

-static void asm_blend_row_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	__asm

-	{

-		mov edx, srcpitch

-		mov esi, src

-		mov edi, dst

-		sub edi, esi

-		mov ecx, w

-		mov ebx, ecx

-		shr ecx, 4

-		and ebx, 15

-

-		movdqa xmm7, [const_1_16_bytes] 

-

-asm_blend_row_SSE2_loop:

-		movdqa xmm0, [esi]

-		movdqa xmm1, [esi+edx]

-		movdqa xmm2, [esi+edx*2]

-		pavgb xmm0, xmm1

-		pavgb xmm2, xmm1

-		psubusb xmm0, xmm7

-		pavgb xmm0, xmm2

-		movdqa [esi+edi], xmm0

-		add esi, 16

-		dec	ecx

-		jnz asm_blend_row_SSE2_loop

-

-		test ebx,15

-		jz asm_blend_row_SSE2_end

-

-		mov ecx, ebx

-		xor ax, ax

-		xor bx, bx

-		xor dx, dx

-asm_blend_row_SSE2_loop2:

-		mov al, [esi]

-		mov bl, [esi+edx]

-		mov dl, [esi+edx*2]

-		add ax, bx

-		inc ax

-		shr ax, 1

-		add dx, bx

-		inc dx

-		shr dx, 1

-		add ax, dx

-		shr ax, 1

-		mov [esi+edi], al

-		inc esi

-		dec	ecx

-		jnz asm_blend_row_SSE2_loop2

-

-asm_blend_row_SSE2_end:

-	}

-}

-

-static void asm_blend_row_clipped_SSE2(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch)

-{

-	__asm

-	{

-		mov edx, srcpitch

-		mov esi, src

-		mov edi, dst

-		sub edi, esi

-		mov ecx, w

-		mov ebx, ecx

-		shr ecx, 4

-		and ebx, 15

-

-		movdqa xmm7, [const_1_16_bytes] 

-

-asm_blend_row_clipped_SSE2_loop:

-		movdqa xmm0, [esi]

-		movdqa xmm1, [esi+edx]

-		pavgb xmm0, xmm1

-		movdqa [esi+edi], xmm0

-		add esi, 16

-		dec	ecx

-		jnz asm_blend_row_clipped_SSE2_loop

-

-		test ebx,15

-		jz asm_blend_row_clipped_SSE2_end

-

-		mov ecx, ebx

-		xor ax, ax

-		xor bx, bx

-asm_blend_row_clipped_SSE2_loop2:

-		mov al, [esi]

-		mov bl, [esi+edx]

-		add ax, bx

-		inc ax

-		shr ax, 1

-		mov [esi+edi], al

-		inc esi

-		dec	ecx

-		jnz asm_blend_row_clipped_SSE2_loop2

-

-asm_blend_row_clipped_SSE2_end:

-	}

-}

-

 void DeinterlaceBlend(BYTE* dst, BYTE* src, DWORD rowbytes, DWORD h, DWORD dstpitch, DWORD srcpitch)

 {

-	void (*asm_blend_row_clipped)(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch) = NULL;

-	void (*asm_blend_row)(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch) = NULL;

+	void (*blend_row_clipped)(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch) = NULL;

+	void (*blend_row)(BYTE* dst, BYTE* src, DWORD w, DWORD srcpitch) = NULL;

 

+#ifndef _WIN64

 	if((g_cpuid.m_flags & CCpuID::sse2) && !((DWORD)src&0xf) && !((DWORD)dst&0xf) && !(srcpitch&0xf))

 	{

-		asm_blend_row_clipped = asm_blend_row_clipped_SSE2;

-		asm_blend_row = asm_blend_row_SSE2;

+		blend_row_clipped = asm_blend_row_clipped_SSE2;

+		blend_row = asm_blend_row_SSE2;

 	}

 	else if(g_cpuid.m_flags & CCpuID::mmx)

 	{

-		asm_blend_row_clipped = asm_blend_row_clipped_MMX;

-		asm_blend_row = asm_blend_row_MMX;

+		blend_row_clipped = asm_blend_row_clipped_MMX;

+		blend_row = asm_blend_row_MMX;

 	}

 	else

+#endif

 	{

-		asm_blend_row_clipped = asm_blend_row_clipped_c;

-		asm_blend_row = asm_blend_row_c;

+		blend_row_clipped = asm_blend_row_clipped_c;

+		blend_row = asm_blend_row_c;

 	}

 

-	if(!asm_blend_row_clipped)

+	if(!blend_row_clipped)

 		return;

 

-	asm_blend_row_clipped(dst, src, rowbytes, srcpitch);

+	blend_row_clipped(dst, src, rowbytes, srcpitch);

 

 	if((h -= 2) > 0) do

 	{

 		dst += dstpitch;

-		asm_blend_row(dst, src, rowbytes, srcpitch);

+		blend_row(dst, src, rowbytes, srcpitch);

         src += srcpitch;

 	}

 	while(--h);

 

-	asm_blend_row_clipped(dst + dstpitch, src, rowbytes, srcpitch);

+	blend_row_clipped(dst + dstpitch, src, rowbytes, srcpitch);

 

+#ifndef _WIN64

 	if(g_cpuid.m_flags & CCpuID::mmx)

 		__asm emms

+#endif

 }

 

 void DeinterlaceBob(BYTE* dst, BYTE* src, DWORD rowbytes, DWORD h, DWORD dstpitch, DWORD srcpitch, bool topfield)

@@ -1581,7 +534,8 @@ void DeinterlaceBob(BYTE* dst, BYTE* src, DWORD rowbytes, DWORD h, DWORD dstpitc
 

 void AvgLines8(BYTE* dst, DWORD h, DWORD pitch)

 {

-	if(h <= 1) return;

+	if(h <= 1)

+		return;

 

 	BYTE* s = dst;

 	BYTE* d = dst + (h-2)*pitch;

@@ -1590,6 +544,7 @@ void AvgLines8(BYTE* dst, DWORD h, DWORD pitch)
 	{

 		BYTE* tmp = s;

 

+#ifndef _WIN64

 		if((g_cpuid.m_flags & CCpuID::sse2) && !((DWORD)tmp&0xf) && !((DWORD)pitch&0xf))

 		{

 			__asm

@@ -1665,6 +620,7 @@ AvgLines8_mmx_loop:
 			}

 		}

 		else

+#endif

 		{

 			for(ptrdiff_t i = pitch; i--; tmp++)

 			{

@@ -1679,12 +635,15 @@ AvgLines8_mmx_loop:
 		memcpy_accel(dst + pitch, dst, pitch);

 	}

 

+#ifndef _WIN64

 	__asm emms;

+#endif

 }

 

 void AvgLines555(BYTE* dst, DWORD h, DWORD pitch)

 {

-	if(h <= 1) return;

+	if(h <= 1)

+		return;

 

 	unsigned __int64 __0x7c007c007c007c00 = 0x7c007c007c007c00;

 	unsigned __int64 __0x03e003e003e003e0 = 0x03e003e003e003e0;

@@ -1697,6 +656,7 @@ void AvgLines555(BYTE* dst, DWORD h, DWORD pitch)
 	{

 		BYTE* tmp = s;

 

+#ifndef _WIN64

 		__asm

 		{

 			mov		esi, tmp

@@ -1749,6 +709,7 @@ AvgLines555_loop:
 

 			mov		tmp, esi

 		}

+#endif

 

 		for(ptrdiff_t i = (pitch&7)>>1; i--; tmp++)

 		{

@@ -1765,12 +726,15 @@ AvgLines555_loop:
 		memcpy_accel(dst + pitch, dst, pitch);

 	}

 

+#ifndef _WIN64

 	__asm emms;

+#endif

 }

 

 void AvgLines565(BYTE* dst, DWORD h, DWORD pitch)

 {

-	if(h <= 1) return;

+	if(h <= 1)

+		return;

 

 	unsigned __int64 __0xf800f800f800f800 = 0xf800f800f800f800;

 	unsigned __int64 __0x07e007e007e007e0 = 0x07e007e007e007e0;

@@ -1783,6 +747,7 @@ void AvgLines565(BYTE* dst, DWORD h, DWORD pitch)
 	{

 		WORD* tmp = (WORD*)s;

 

+#ifndef _WIN64

 		__asm

 		{

 			mov		esi, tmp

@@ -1835,6 +800,15 @@ AvgLines565_loop:
 

 			mov		tmp, esi

 		}

+#else

+		for(ptrdiff_t wd=(pitch>>3);wd--;tmp++)

+		{

+			tmp[0] = 

+				((((*tmp&0xf800) + (tmp[pitch<<1]&0xf800)) >> 1)&0xf800)|

+				((((*tmp&0x07e0) + (tmp[pitch<<1]&0x07e0)) >> 1)&0x07e0)|

+				((((*tmp&0x001f) + (tmp[pitch<<1]&0x001f)) >> 1)&0x001f);

+		}

+#endif

 

 		for(ptrdiff_t i = (pitch&7)>>1; i--; tmp++)

 		{

@@ -1851,16 +825,21 @@ AvgLines565_loop:
 		memcpy_accel(dst + pitch, dst, pitch);

 	}

 

+#ifndef _WIN64

 	__asm emms;

+#endif

 }

 

+#ifndef _WIN64

 extern "C" void mmx_YUY2toRGB24(const BYTE* src, BYTE* dst, const BYTE* src_end, int src_pitch, int row_size, bool rec709);

 extern "C" void mmx_YUY2toRGB32(const BYTE* src, BYTE* dst, const BYTE* src_end, int src_pitch, int row_size, bool rec709);

+#endif

 

 bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* src, int srcpitch)

 {

 	void (* YUY2toRGB)(const BYTE* src, BYTE* dst, const BYTE* src_end, int src_pitch, int row_size, bool rec709) = NULL;

 

+#ifndef _WIN64

 	if(g_cpuid.m_flags & CCpuID::mmx)

 	{

 		YUY2toRGB = 

@@ -1870,15 +849,16 @@ bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE*
 			NULL;

 	}

 	else

+#endif

 	{

+		ASSERT(FALSE);

 		// TODO

 	}

 

-	if(!YUY2toRGB) return(false);

+	if(!YUY2toRGB)

+		return(false);

 

 	YUY2toRGB(src, dst, src + h*srcpitch, srcpitch, w, false);

 

 	return(true);

 }

-

-#endif //_WIN64