[x265] [PATCH] iStrideCur member variable replaced with strideCur for all referances

praveen at multicorewareinc.com praveen at multicorewareinc.com
Thu Jul 11 11:23:18 CEST 2013


# HG changeset patch
# User praveentiwari
# Date 1373534585 -19800
# Node ID 940bcf86c1a22c9db1b993161bc6a7b4c69884e1
# Parent  a33dae682242d75ad5e80e336eda57c107693c49
iStrideCur member variable replaced with strideCur for all referances

diff -r a33dae682242 -r 940bcf86c1a2 source/Lib/TLibCommon/TComRdCost.cpp
--- a/source/Lib/TLibCommon/TComRdCost.cpp	Thu Jul 11 14:34:21 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCost.cpp	Thu Jul 11 14:53:05 2013 +0530
@@ -125,7 +125,7 @@
     rcDistParam.pCur = piRefY;
 
     rcDistParam.strideOrg = patternKey->getPatternLStride();
-    rcDistParam.iStrideCur = iRefStride;
+    rcDistParam.strideCur = iRefStride;
 
     // set Block Width / Height
     rcDistParam.iCols    = patternKey->getROIYWidth();
@@ -157,7 +157,7 @@
     rcDistParam.pCur = piRefY;
 
     rcDistParam.strideOrg = patternKey->getPatternLStride();
-    rcDistParam.iStrideCur = iRefStride * iStep;
+    rcDistParam.strideCur = iRefStride * iStep;
 
     // set Step for interpolated buffer
     rcDistParam.iStep = iStep;
@@ -212,7 +212,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     UInt uiSum = 0;
 
@@ -242,7 +242,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -273,7 +273,7 @@
     Int  iRows      = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -308,7 +308,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -351,7 +351,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
 
     UInt uiSum = 0;
@@ -387,7 +387,7 @@
     Int  iCols   = pcDtParam->iCols;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -433,7 +433,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -492,7 +492,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
     UInt uiSum = 0;
 
@@ -543,7 +543,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
 
     UInt uiSum = 0;
@@ -635,7 +635,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iSubShift  = pcDtParam->iSubShift;
     Int  iSubStep   = (1 << iSubShift);
-    Int  iStrideCur = pcDtParam->iStrideCur * iSubStep;
+    Int  iStrideCur = pcDtParam->strideCur * iSubStep;
     Int  iStrideOrg = pcDtParam->strideOrg * iSubStep;
 
     UInt uiSum = 0;
@@ -734,7 +734,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
 
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
@@ -798,7 +798,7 @@
 
     Int  iRows   = pcDtParam->iRows;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
 
@@ -872,7 +872,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
 
@@ -959,7 +959,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
 
@@ -1050,7 +1050,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
 
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
@@ -1170,7 +1170,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
 
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
@@ -1355,7 +1355,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
 
     UInt uiSum = 0;
     UInt uiShift = DISTORTION_PRECISION_ADJUSTMENT((pcDtParam->bitDepth - 8) << 1);
@@ -1590,7 +1590,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
     UInt uiSum = 0;
@@ -1616,7 +1616,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
     Int  y;
@@ -1653,7 +1653,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
 
diff -r a33dae682242 -r 940bcf86c1a2 source/Lib/TLibCommon/TComRdCost.h
--- a/source/Lib/TLibCommon/TComRdCost.h	Thu Jul 11 14:34:21 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCost.h	Thu Jul 11 14:53:05 2013 +0530
@@ -116,7 +116,7 @@
     Pel*  fenc;
     Pel*  pCur;
     Int   strideOrg;
-    Int   iStrideCur;
+    Int   strideCur;
     Int   iRows;
     Int   iCols;
     Int   iStep;
@@ -135,7 +135,7 @@
         fenc = NULL;
         pCur = NULL;
         strideOrg = 0;
-        iStrideCur = 0;
+        strideCur = 0;
         iRows = 0;
         iCols = 0;
         iStep = 1;
diff -r a33dae682242 -r 940bcf86c1a2 source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp
--- a/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp	Thu Jul 11 14:34:21 2013 +0530
+++ b/source/Lib/TLibCommon/TComRdCostWeightPrediction.cpp	Thu Jul 11 14:53:05 2013 +0530
@@ -72,7 +72,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
 
     wpScalingParam  *wpCur    = &(pcDtParam->wpCur[0]);
@@ -115,7 +115,7 @@
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
     Int  iStrideOrg = pcDtParam->strideOrg;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
 
     assert(pcDtParam->iSubShift == 0);
 
@@ -427,7 +427,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
     Int  y;
@@ -455,7 +455,7 @@
     Pel* piOrg   = pcDtParam->fenc;
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
     Int  y;
@@ -492,7 +492,7 @@
     Pel* piCur   = pcDtParam->pCur;
     Int  iRows   = pcDtParam->iRows;
     Int  iCols   = pcDtParam->iCols;
-    Int  iStrideCur = pcDtParam->iStrideCur;
+    Int  iStrideCur = pcDtParam->strideCur;
     Int  iStrideOrg = pcDtParam->strideOrg;
     Int  iStep  = pcDtParam->iStep;
 


More information about the x265-devel mailing list