[x265] [PATCH] More cleanup with transformNxN

[praveen at multicorewareinc.com]

# HG changeset patch
# User praveentiwari
# Date 1373359594 -19800
# Node ID ad61303c8896b2885581bec943756596ee1b3911
# Parent  330843e6f7c09a0919e0fd6849a6afd384a148c7
More cleanup with transformNxN

diff -r 330843e6f7c0 -r ad61303c8896 source/Lib/TLibCommon/TComTrQuant.cpp
--- a/source/Lib/TLibCommon/TComTrQuant.cpp	Tue Jul 09 14:08:24 2013 +0530
+++ b/source/Lib/TLibCommon/TComTrQuant.cpp	Tue Jul 09 14:16:34 2013 +0530
@@ -909,8 +909,8 @@
 Void TComTrQuant::transformNxN(TComDataCU* CU,
                                Short*      residual,
                                UInt        stride,
-                               TCoeff*     rpcCoeff,
-                               Int*&       rpcArlCoeff,
+                               TCoeff*     coeff,
+                               Int*&       arlCoeff,
                                UInt        width,
                                UInt        height,
                                UInt&       absSum,
@@ -926,21 +926,21 @@
         {
             for (UInt j = 0; j < width; j++)
             {
-                rpcCoeff[k * width + j] = ((Short)residual[k * stride + j]);
+                coeff[k * width + j] = ((Short)residual[k * stride + j]);
                 absSum += abs(residual[k * stride + j]);
             }
         }
 
         return;
     }
-    UInt uiMode; //luma intra pred
+    UInt mode; //luma intra pred
     if (eTType == TEXT_LUMA && CU->getPredictionMode(absPartIdx) == MODE_INTRA)
     {
-        uiMode = CU->getLumaIntraDir(absPartIdx);
+        mode = CU->getLumaIntraDir(absPartIdx);
     }
     else
     {
-        uiMode = REG_DCT;
+        mode = REG_DCT;
     }
 
     absSum = 0;
@@ -955,12 +955,12 @@
         // CHECK_ME: we can't use Short when HIGH_BIT_DEPTH=1
         assert(bitDepth == 8);
 
-        const UInt uiLog2BlockSize = g_aucConvertToBit[width];
-        x265::primitives.dct[x265::DCT_4x4 + uiLog2BlockSize - ((width == 4) && (uiMode != REG_DCT))](residual, m_plTempCoeff, stride);
+        const UInt log2BlockSize = g_aucConvertToBit[width];
+        x265::primitives.dct[x265::DCT_4x4 + log2BlockSize - ((width == 4) && (mode != REG_DCT))](residual, m_plTempCoeff, stride);
 
         assert(width == height);
     }
-    xQuant(CU, m_plTempCoeff, rpcCoeff, rpcArlCoeff, width, height, absSum, eTType, absPartIdx);
+    xQuant(CU, m_plTempCoeff, coeff, arlCoeff, width, height, absSum, eTType, absPartIdx);
 }
 
 Void TComTrQuant::invtransformNxN(Bool transQuantBypass, TextType eText, UInt uiMode, Short* rpcResidual, UInt uiStride, TCoeff*   pcCoeff, UInt uiWidth, UInt uiHeight,  Int scalingListType, Bool useTransformSkip)