limit-modes: rename SplitData::rdCost to sa8dCost

nandaku2 · nandaku2 · commit 40ba1eb5dcbf · 2016-01-25T10:46:50.000+05:30
diff --git a/source/encoder/analysis.cpp b/source/encoder/analysis.cpp
@@ -949,7 +949,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&
             Mode *bestInter = &md.pred[PRED_2Nx2N];
             if (m_param->bEnableRectInter)
             {
-                uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;
+                uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;
                 uint32_t threshold_2NxN, threshold_Nx2N;
 
                 if (m_slice->m_sliceType == P_SLICE)
@@ -999,7 +999,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&
 
             if (m_slice->m_sps->maxAMPDepth > depth)
             {
-                uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;
+                uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;
                 uint32_t threshold_2NxnU, threshold_2NxnD, threshold_nLx2N, threshold_nRx2N;
 
                 if (m_slice->m_sliceType == P_SLICE)
@@ -1276,7 +1276,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&
     {
         splitCUData.mvCost[0] = md.pred[PRED_2Nx2N].bestME[0][0].mvCost; // L0
         splitCUData.mvCost[1] = md.pred[PRED_2Nx2N].bestME[0][1].mvCost; // L1
-        splitCUData.rdCost    = md.pred[PRED_2Nx2N].sa8dCost;
+        splitCUData.sa8dCost    = md.pred[PRED_2Nx2N].sa8dCost;
     }
     
     if (mightNotSplit)
@@ -1437,7 +1437,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&
 
             if (m_param->bEnableRectInter)
             {
-                uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;
+                uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;
                 uint32_t threshold_2NxN, threshold_Nx2N;
 
                 if (m_slice->m_sliceType == P_SLICE)
@@ -1485,7 +1485,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&
             // Try AMP (SIZE_2NxnU, SIZE_2NxnD, SIZE_nLx2N, SIZE_nRx2N)
             if (m_slice->m_sps->maxAMPDepth > depth)
             {
-                uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;
+                uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;
                 uint32_t threshold_2NxnU, threshold_2NxnD, threshold_nLx2N, threshold_nRx2N;
 
                 if (m_slice->m_sliceType == P_SLICE)
@@ -1638,7 +1638,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&
     {
         splitCUData.mvCost[0] = md.pred[PRED_2Nx2N].bestME[0][0].mvCost; // L0
         splitCUData.mvCost[1] = md.pred[PRED_2Nx2N].bestME[0][1].mvCost; // L1
-        splitCUData.rdCost    = md.pred[PRED_2Nx2N].rdCost;
+        splitCUData.sa8dCost    = md.pred[PRED_2Nx2N].rdCost;
     }
 
     /* Copy best data to encData CTU and recon */
diff --git a/source/encoder/analysis.h b/source/encoder/analysis.h
@@ -45,14 +45,14 @@ struct SplitData
 {
     uint32_t splitRefs;
     uint32_t mvCost[2];
-    uint64_t rdCost;
+    uint64_t sa8dCost;
 
     void initSplitCUData()
     {
         splitRefs = 0;
         mvCost[0] = 0; // L0
         mvCost[1] = 0; // L1
-        rdCost    = 0;
+        sa8dCost    = 0;
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&`
`949`	`949`	`Mode *bestInter = &md.pred[PRED_2Nx2N];`
`950`	`950`	`if (m_param->bEnableRectInter)`
`951`	`951`	`{`
`952`		`- uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;`
	`952`	`+ uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;`
`953`	`953`	`uint32_t threshold_2NxN, threshold_Nx2N;`
`954`	`954`
`955`	`955`	`if (m_slice->m_sliceType == P_SLICE)`
`@@ -999,7 +999,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&`
`999`	`999`
`1000`	`1000`	`if (m_slice->m_sps->maxAMPDepth > depth)`
`1001`	`1001`	`{`
`1002`		`- uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;`
	`1002`	`+ uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;`
`1003`	`1003`	`uint32_t threshold_2NxnU, threshold_2NxnD, threshold_nLx2N, threshold_nRx2N;`
`1004`	`1004`
`1005`	`1005`	`if (m_slice->m_sliceType == P_SLICE)`
`@@ -1276,7 +1276,7 @@ SplitData Analysis::compressInterCU_rd0_4(const CUData& parentCTU, const CUGeom&`
`1276`	`1276`	`{`
`1277`	`1277`	`splitCUData.mvCost[0] = md.pred[PRED_2Nx2N].bestME[0][0].mvCost; // L0`
`1278`	`1278`	`splitCUData.mvCost[1] = md.pred[PRED_2Nx2N].bestME[0][1].mvCost; // L1`
`1279`		`- splitCUData.rdCost = md.pred[PRED_2Nx2N].sa8dCost;`
	`1279`	`+ splitCUData.sa8dCost = md.pred[PRED_2Nx2N].sa8dCost;`
`1280`	`1280`	`}`
`1281`	`1281`
`1282`	`1282`	`if (mightNotSplit)`
`@@ -1437,7 +1437,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&`
`1437`	`1437`
`1438`	`1438`	`if (m_param->bEnableRectInter)`
`1439`	`1439`	`{`
`1440`		`- uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;`
	`1440`	`+ uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;`
`1441`	`1441`	`uint32_t threshold_2NxN, threshold_Nx2N;`
`1442`	`1442`
`1443`	`1443`	`if (m_slice->m_sliceType == P_SLICE)`
`@@ -1485,7 +1485,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&`
`1485`	`1485`	`// Try AMP (SIZE_2NxnU, SIZE_2NxnD, SIZE_nLx2N, SIZE_nRx2N)`
`1486`	`1486`	`if (m_slice->m_sps->maxAMPDepth > depth)`
`1487`	`1487`	`{`
`1488`		`- uint64_t splitCost = splitData[0].rdCost + splitData[1].rdCost + splitData[2].rdCost + splitData[3].rdCost;`
	`1488`	`+ uint64_t splitCost = splitData[0].sa8dCost + splitData[1].sa8dCost + splitData[2].sa8dCost + splitData[3].sa8dCost;`
`1489`	`1489`	`uint32_t threshold_2NxnU, threshold_2NxnD, threshold_nLx2N, threshold_nRx2N;`
`1490`	`1490`
`1491`	`1491`	`if (m_slice->m_sliceType == P_SLICE)`
`@@ -1638,7 +1638,7 @@ SplitData Analysis::compressInterCU_rd5_6(const CUData& parentCTU, const CUGeom&`
`1638`	`1638`	`{`
`1639`	`1639`	`splitCUData.mvCost[0] = md.pred[PRED_2Nx2N].bestME[0][0].mvCost; // L0`
`1640`	`1640`	`splitCUData.mvCost[1] = md.pred[PRED_2Nx2N].bestME[0][1].mvCost; // L1`
`1641`		`- splitCUData.rdCost = md.pred[PRED_2Nx2N].rdCost;`
	`1641`	`+ splitCUData.sa8dCost = md.pred[PRED_2Nx2N].rdCost;`
`1642`	`1642`	`}`
`1643`	`1643`
`1644`	`1644`	`/* Copy best data to encData CTU and recon */`
Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,14 @@ struct SplitData`
`45`	`45`	`{`
`46`	`46`	`uint32_t splitRefs;`
`47`	`47`	`uint32_t mvCost[2];`
`48`		`- uint64_t rdCost;`
	`48`	`+ uint64_t sa8dCost;`
`49`	`49`
`50`	`50`	`void initSplitCUData()`
`51`	`51`	`{`
`52`	`52`	`splitRefs = 0;`
`53`	`53`	`mvCost[0] = 0; // L0`
`54`	`54`	`mvCost[1] = 0; // L1`
`55`		`- rdCost = 0;`
	`55`	`+ sa8dCost = 0;`
`56`	`56`	`}`
`57`	`57`	`};`
`58`	`58`