From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 11 Jun 2011 06:00:15 +0000
Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and
 Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 mpeglib/lib/util/render/dither/ditherer_mmx16.cpp | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'mpeglib/lib/util/render/dither/ditherer_mmx16.cpp')

diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
index 757f0676..1de9cc17 100644
--- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
+++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
@@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[]   = {0x66, 0x66, 0x66, 0x66};
 static unsigned short MMX16_Ugrncoeff[]   = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
 static unsigned short MMX16_Vgrncoeff[]   = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
 static unsigned short MMX16_Ycoeff[]      = {0x4a, 0x4a, 0x4a, 0x4a};   
-static unsigned short MMX16_redmask[]     = {0xf800, 0xf800, 0xf800, 0xf800}; 
-static unsigned short MMX16_grnmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; 
+static unsigned short MMX16_redtqmask[]     = {0xf800, 0xf800, 0xf800, 0xf800}; 
+static unsigned short MMX16_grntqmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; 
 
 void dummy_dithermmx16() {
   cout << "MMX16_0"<<MMX16_0<<endl;
@@ -38,8 +38,8 @@ void dummy_dithermmx16() {
   cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl;
   cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl;
   cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl;
-  cout << "MMX16_redmask:"<<MMX16_redmask<<endl;
-  cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl;
+  cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl;
+  cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl;
   cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl;
 }
 
@@ -114,11 +114,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm4,                  %%mm4\n"
          "punpcklbw      %%mm5,                  %%mm5\n"
 
-         "pand           MMX16_redmask,            %%mm4\n"
+         "pand           MMX16_redtqmask,            %%mm4\n"
          "psllw          $3,                     %%mm5\n"  // GREEN       1
          "punpcklbw      %%mm6,                  %%mm6\n"
-         "pand           MMX16_grnmask,            %%mm5\n"
-         "pand           MMX16_redmask,            %%mm6\n"
+         "pand           MMX16_grntqmask,            %%mm5\n"
+         "pand           MMX16_redtqmask,            %%mm6\n"
          "por            %%mm5,                  %%mm4\n" //
          "psrlw          $11,                    %%mm6\n"                // BLUE        1
          "movq           %%mm3,                  %%mm5\n" // lum2
@@ -145,10 +145,10 @@ void  ditherBlock(unsigned char *lum,
          "pmullw         MMX16_Ycoeff,             %%mm6\n"  // lum3
          "punpcklbw      %%mm7,                  %%mm7\n"
          "psllw          $3,                             %%mm5\n"  // GREEN 2
-         "pand                   MMX16_redmask,    %%mm7\n"
-         "pand                   MMX16_redmask,    %%mm3\n"
+         "pand                   MMX16_redtqmask,    %%mm7\n"
+         "pand                   MMX16_redtqmask,    %%mm3\n"
          "psrlw          $11,                            %%mm7\n"  // BLUE  2
-         "pand                   MMX16_grnmask,    %%mm5\n"
+         "pand                   MMX16_grntqmask,    %%mm5\n"
          "por                    %%mm7,                  %%mm3\n"
 	 
          "movq                   (%2),        %%mm7\n"  // L4 load lum2
@@ -186,11 +186,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm5,                  %%mm5\n"
          "punpcklbw      %%mm6,                  %%mm6\n"
          "psllw          $3,                             %%mm5\n" // GREEN 3
-         "pand                   MMX16_redmask,    %%mm4\n"
+         "pand                   MMX16_redtqmask,    %%mm4\n"
          "psraw          $6,                             %%mm3\n" // psr 6
          "psraw          $6,                             %%mm0\n"
-         "pand                   MMX16_redmask,    %%mm6\n" // BLUE
-         "pand                   MMX16_grnmask,    %%mm5\n"
+         "pand                   MMX16_redtqmask,    %%mm6\n" // BLUE
+         "pand                   MMX16_grntqmask,    %%mm5\n"
          "psrlw          $11,                            %%mm6\n"  // BLUE  3
          "por                    %%mm5,                  %%mm4\n"
          "psraw          $6,                             %%mm7\n"
@@ -201,11 +201,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm3,                  %%mm3\n"
          "punpcklbw      %%mm0,                  %%mm0\n"
          "punpcklbw      %%mm7,                  %%mm7\n"
-         "pand                   MMX16_redmask,    %%mm3\n"
-         "pand                   MMX16_redmask,    %%mm7\n" // BLUE
+         "pand                   MMX16_redtqmask,    %%mm3\n"
+         "pand                   MMX16_redtqmask,    %%mm7\n" // BLUE
          "psllw          $3,                             %%mm0\n" // GREEN 4
          "psrlw          $11,                            %%mm7\n"
-         "pand                   MMX16_grnmask,    %%mm0\n"
+         "pand                   MMX16_grntqmask,    %%mm0\n"
          "por                    %%mm7,                  %%mm3\n"
          "por                    %%mm0,                  %%mm3\n"
 
-- 
cgit v1.2.1