rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 29 insertions, 29 deletions

diff --git a/k9decmpeg/cpu_accel.cpp b/k9decmpeg/cpu_accel.cpp
index 6af9558..9589868 100755
--- a/k9decmpeg/cpu_accel.cpp
+++ b/k9decmpeg/cpu_accel.cpp
@@ -197,7 +197,7 @@ static inline uint32_t arch_accel (void)
 {
     uint64_t no_mvi;
 
-    asm volatile ("atqmask %1, %0"
+    asm volatile ("amask %1, %0"
 		  : "=r" (no_mvi)
 		  : "rI" (256));	/* AMASK_MVI */
     return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA |
diff --git a/k9decmpeg/idct_alpha.cpp b/k9decmpeg/idct_alpha.cpp
index 7105089..4f1e88f 100755
--- a/k9decmpeg/idct_alpha.cpp
+++ b/k9decmpeg/idct_alpha.cpp
@@ -158,7 +158,7 @@ static void inline idct_col (int16_t * const block)
 
 void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
 {
-    uint64_t clamptqmask;
+    uint64_t clampmask;
     int i;
 
     for (i = 0; i < 8; i++)
@@ -167,18 +167,18 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
     for (i = 0; i < 8; i++)
 	idct_col (block + i);
 
-    clamptqmask = zap (-1, 0xaa);	/* 0x00ff00ff00ff00ff */
+    clampmask = zap (-1, 0xaa);	/* 0x00ff00ff00ff00ff */
     do {
 	uint64_t shorts0, shorts1;
 
 	shorts0 = ldq (block);
 	shorts0 = maxsw4 (shorts0, 0);
-	shorts0 = minsw4 (shorts0, clamptqmask);
+	shorts0 = minsw4 (shorts0, clampmask);
 	stl (pkwb (shorts0), dest);
 
 	shorts1 = ldq (block + 4);
 	shorts1 = maxsw4 (shorts1, 0);
-	shorts1 = minsw4 (shorts1, clamptqmask);
+	shorts1 = minsw4 (shorts1, clampmask);
 	stl (pkwb (shorts1), dest + 4);
 
 	stq (0, block);
@@ -192,8 +192,8 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
 void mpeg2_idct_add_mvi (const int last, int16_t * block,
 			 uint8_t * dest, const int stride)
 {
-    uint64_t clamptqmask;
-    uint64_t signtqmask;
+    uint64_t clampmask;
+    uint64_t signmask;
     int i;
 
     if (last != 129 || (block[0] & (7 << 4)) == (4 << 4)) {
@@ -201,9 +201,9 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block,
 	    idct_row (block + 8 * i);
 	for (i = 0; i < 8; i++)
 	    idct_col (block + i);
-	clamptqmask = zap (-1, 0xaa);	/* 0x00ff00ff00ff00ff */
-	signtqmask = zap (-1, 0x33);
-	signtqmask ^= signtqmask >> 1;	/* 0x8000800080008000 */
+	clampmask = zap (-1, 0xaa);	/* 0x00ff00ff00ff00ff */
+	signmask = zap (-1, 0x33);
+	signmask ^= signmask >> 1;	/* 0x8000800080008000 */
 
 	do {
 	    uint64_t shorts0, pix0, signs0;
@@ -214,22 +214,22 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block,
 
 	    pix0 = unpkbw (ldl (dest));
 	    /* signed subword add (MMX paddw).  */
-	    signs0 = shorts0 & signtqmask;
-	    shorts0 &= ~signtqmask;
+	    signs0 = shorts0 & signmask;
+	    shorts0 &= ~signmask;
 	    shorts0 += pix0;
 	    shorts0 ^= signs0;
 	    /* clamp. */
 	    shorts0 = maxsw4 (shorts0, 0);
-	    shorts0 = minsw4 (shorts0, clamptqmask);	
+	    shorts0 = minsw4 (shorts0, clampmask);	
 
 	    /* next 4.  */
 	    pix1 = unpkbw (ldl (dest + 4));
-	    signs1 = shorts1 & signtqmask;
-	    shorts1 &= ~signtqmask;
+	    signs1 = shorts1 & signmask;
+	    shorts1 &= ~signmask;
 	    shorts1 += pix1;
 	    shorts1 ^= signs1;
 	    shorts1 = maxsw4 (shorts1, 0);
-	    shorts1 = minsw4 (shorts1, clamptqmask);
+	    shorts1 = minsw4 (shorts1, clampmask);
 
 	    stl (pkwb (shorts0), dest);
 	    stl (pkwb (shorts1), dest + 4);
diff --git a/k9decmpeg/motion_comp_mmx.cpp b/k9decmpeg/motion_comp_mmx.cpp
index e6c8f78..97828c4 100755
--- a/k9decmpeg/motion_comp_mmx.cpp
+++ b/k9decmpeg/motion_comp_mmx.cpp
@@ -52,7 +52,7 @@
  */
 
 /* some rounding constants */
-static mmx_t tqmask1 = {0xfefefefefefefefeLL};
+static mmx_t mask1 = {0xfefefefefefefefeLL};
 static mmx_t round4 = {0x0002000200020002LL};
 
 /*
@@ -81,7 +81,7 @@ static inline void mmx_average_2_U8 (uint8_t * dest, const uint8_t * src1,
     movq_r2r (mm3, mm4);	/* copy 8 src2 bytes */
 
     pxor_r2r (mm1, mm3);	/* xor src1 and src2 */
-    pand_m2r (tqmask1, mm3);	/* tqmask lower bits */
+    pand_m2r (mask1, mm3);	/* mask lower bits */
     psrlq_i2r (1, mm3);		/* /2 */
     por_r2r (mm2, mm4);		/* or src1 and src2 */
     psubb_r2r (mm3, mm4);	/* subtract subresults */
@@ -104,14 +104,14 @@ static inline void mmx_interp_average_2_U8 (uint8_t * dest,
     movq_r2r (mm5, mm6);	/* copy 8 src2 bytes */
 
     pxor_r2r (mm3, mm5);	/* xor src1 and src2 */
-    pand_m2r (tqmask1, mm5);	/* tqmask lower bits */
+    pand_m2r (mask1, mm5);	/* mask lower bits */
     psrlq_i2r (1, mm5);		/* /2 */
     por_r2r (mm4, mm6);		/* or src1 and src2 */
     psubb_r2r (mm5, mm6);	/* subtract subresults */
     movq_r2r (mm6, mm5);	/* copy subresult */
 
     pxor_r2r (mm1, mm5);	/* xor srcavg and dest */
-    pand_m2r (tqmask1, mm5);	/* tqmask lower bits */
+    pand_m2r (mask1, mm5);	/* mask lower bits */
     psrlq_i2r (1, mm5);		/* /2 */
     por_r2r (mm2, mm6);		/* or srcavg and dest */
     psubb_r2r (mm5, mm6);	/* subtract subresults */
@@ -228,7 +228,7 @@ static inline void mmx_interp_average_4_U8 (uint8_t * dest,
     movq_r2r (mm1,mm2);		/* copy subresult */
 
     pxor_r2r (mm1, mm3);	/* xor srcavg and dest */
-    pand_m2r (tqmask1, mm3);	/* tqmask lower bits */
+    pand_m2r (mask1, mm3);	/* mask lower bits */
     psrlq_i2r (1, mm3);		/* /2 */
     por_r2r (mm2, mm4);		/* or srcavg and dest */
     psubb_r2r (mm3, mm4);	/* subtract subresults */
diff --git a/k9decmpeg/motion_comp_vis.cpp b/k9decmpeg/motion_comp_vis.cpp
index eb01501..218af8a 100755
--- a/k9decmpeg/motion_comp_vis.cpp
+++ b/k9decmpeg/motion_comp_vis.cpp
@@ -39,8 +39,8 @@
  * This allows us to average 8 bytes at a time in a 64-bit FPU reg.
  * We avoid overflows by masking before we do the shift, and we
  * implement the shift by multiplying by 1/2 using mul8x16.  So in
- * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating tqmask
- * of '0xfe' is in f4, a repeating tqmask of '0x7f' is in f6, and
+ * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
+ * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
  * the value 0x80808080 is in f8):
  *
  *	fxor		f0, f2, f10
diff --git a/k9decmpeg/rgb_mmx.cpp b/k9decmpeg/rgb_mmx.cpp
index 59b7c6e..957708c 100755
--- a/k9decmpeg/rgb_mmx.cpp
+++ b/k9decmpeg/rgb_mmx.cpp
@@ -127,9 +127,9 @@ static inline void mmx_yuv2rgb (uint8_t * py, uint8_t * pu, uint8_t * pv)
 
 static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu)
 {
-    static mmx_t mmx_bluetqmask = {0xf8f8f8f8f8f8f8f8LL};
-    static mmx_t mmx_greentqmask = {0xfcfcfcfcfcfcfcfcLL};
-    static mmx_t mmx_redtqmask = {0xf8f8f8f8f8f8f8f8LL};
+    static mmx_t mmx_bluemask = {0xf8f8f8f8f8f8f8f8LL};
+    static mmx_t mmx_greenmask = {0xfcfcfcfcfcfcfcfcLL};
+    static mmx_t mmx_redmask = {0xf8f8f8f8f8f8f8f8LL};
 
     /*
      * convert RGB plane to RGB 16 bits
@@ -138,9 +138,9 @@ static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu)
      * mm6 -> GB, mm7 -> AR pixel 0-3
      */
 
-    pand_m2r (mmx_bluetqmask, mm0);	/* mm0 = b7b6b5b4b3______ */
-    pand_m2r (mmx_greentqmask, mm2);	/* mm2 = g7g6g5g4g3g2____ */
-    pand_m2r (mmx_redtqmask, mm1);	/* mm1 = r7r6r5r4r3______ */
+    pand_m2r (mmx_bluemask, mm0);	/* mm0 = b7b6b5b4b3______ */
+    pand_m2r (mmx_greenmask, mm2);	/* mm2 = g7g6g5g4g3g2____ */
+    pand_m2r (mmx_redmask, mm1);	/* mm1 = r7r6r5r4r3______ */
     psrlq_i2r (3, mm0);			/* mm0 = ______b7b6b5b4b3 */
     pxor_r2r (mm4, mm4);		/* mm4 = 0 */
     movq_r2r (mm0, mm5);		/* mm5 = ______b7b6b5b4b3 */