[x265] [PATCH] iSubShift member variable replaced with subShift for all referances

[praveen at multicorewareinc.com]

# HG changeset patch
# User praveentiwari
# Date 1373605269 -19800
# Node ID 21ad840817b9ed81c20dee42a1414460abeaaaa4
# Parent  319547ef3bb70172ff8189f771b0518467d9572e
iSubShift member variable replaced with subShift for all referances

diff -r 319547ef3bb7 -r 21ad840817b9 source/Lib/TLibCommon/TComRdCost.cpp
--- a/source/Lib/TLibCommon/TComRdCost.cpp	Fri Jul 12 10:23:54 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCost.cpp	Fri Jul 12 10:31:09 2013 +0530
@@ -144,7 +144,7 @@
     }
 
     // initialize
-    rcDistParam.iSubShift  = 0;
+    rcDistParam.subShift  = 0;
 }
 
 // Setting the Distortion Parameter for Inter (subpel ME with step)
@@ -188,7 +188,7 @@
     }
 
     // initialize
-    rcDistParam.iSubShift  = 0;
+    rcDistParam.subShift  = 0;
 }
 
 // ====================================================================================================================
@@ -238,7 +238,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -269,7 +269,7 @@
     Pel* piOrg      = pcDtParam->fenc;
     Pel* piCur      = pcDtParam->fref;
     Int  iRows      = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -304,7 +304,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -347,7 +347,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -383,7 +383,7 @@
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
     Int  iCols   = pcDtParam->cols;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -429,7 +429,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -488,7 +488,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -539,7 +539,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
@@ -631,7 +631,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->fref;
     Int  iRows   = pcDtParam->rows;
-    Int  iSubShift  = pcDtParam->iSubShift;
+    Int  iSubShift  = pcDtParam->subShift;
     Int  iSubStep   = (1 << iSubShift);
     Int  iStrideCur = pcDtParam->frefstride * iSubStep;
     Int  iStrideOrg = pcDtParam->fencstride * iSubStep;
diff -r 319547ef3bb7 -r 21ad840817b9 source/Lib/TLibCommon/TComRdCost.h
--- a/source/Lib/TLibCommon/TComRdCost.h	Fri Jul 12 10:23:54 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCost.h	Fri Jul 12 10:31:09 2013 +0530
@@ -128,7 +128,7 @@
 
     // (vertical) subsampling shift (for reducing complexity)
     // - 0 = no subsampling, 1 = even rows, 2 = every 4th, etc.
-    Int   iSubShift;
+    Int   subShift;
 
     DistParam()
     {
@@ -140,7 +140,7 @@
         cols = 0;
         step = 1;
         distFunc = NULL;
-        iSubShift = 0;
+        subShift = 0;
         bitDepth = 0;
     }
 };
diff -r 319547ef3bb7 -r 21ad840817b9 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Fri Jul 12 10:23:54 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Fri Jul 12 10:31:09 2013 +0530
@@ -257,7 +257,7 @@
     if (m_distParam.rows > 12)
     {
         // fast encoder decision: use subsampled SAD when rows > 12 for integer ME
-        m_distParam.iSubShift = 1;
+        m_distParam.subShift = 1;
     }
 
     // distortion