[x265] [PATCH] analysis: remove redundant argument in compressIntraCU

[gopu at multicorewareinc.com]

# HG changeset patch
# User Gopu Govindaswamy <gopu at multicorewareinc.com>
# Date 1419315212 -19800
#      Tue Dec 23 11:43:32 2014 +0530
# Node ID c4ec3f22846beb3eedcb187e86be17bd7636aafa
# Parent  8d2f418829c894c25da79daa861f16c61e5060d7
analysis: remove redundant argument in compressIntraCU

diff -r 8d2f418829c8 -r c4ec3f22846b source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp	Sat Dec 20 21:27:14 2014 +0900
+++ b/source/encoder/analysis.cpp	Tue Dec 23 11:43:32 2014 +0530
@@ -141,7 +141,7 @@
     if (m_slice->m_sliceType == I_SLICE)
     {
         uint32_t zOrder = 0;
-        compressIntraCU(ctu, cuGeom, m_reuseIntraDataCTU, zOrder);
+        compressIntraCU(ctu, cuGeom, zOrder);
         if (m_param->analysisMode == X265_ANALYSIS_SAVE && m_frame->m_analysisData.intraData)
         {
             CUData *bestCU = &m_modeDepth[0].bestMode->cu;
@@ -198,7 +198,7 @@
     }
 }
 
-void Analysis::compressIntraCU(const CUData& parentCTU, const CUGeom& cuGeom, analysis_intra_data* reuseIntraData, uint32_t& zOrder)
+void Analysis::compressIntraCU(const CUData& parentCTU, const CUGeom& cuGeom, uint32_t& zOrder)
 {
     uint32_t depth = cuGeom.depth;
     ModeDepth& md = m_modeDepth[depth];
@@ -209,9 +209,9 @@
 
     if (m_param->analysisMode == X265_ANALYSIS_LOAD)
     {
-        uint8_t* reuseDepth  = &reuseIntraData->depth[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
-        uint8_t* reuseModes  = &reuseIntraData->modes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
-        char* reusePartSizes = &reuseIntraData->partSizes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
+        uint8_t* reuseDepth  = &m_reuseIntraDataCTU->depth[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
+        uint8_t* reuseModes  = &m_reuseIntraDataCTU->modes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
+        char* reusePartSizes = &m_reuseIntraDataCTU->partSizes[parentCTU.m_cuAddr * parentCTU.m_numPartitions];
 
         if (mightNotSplit && depth == reuseDepth[zOrder] && zOrder == cuGeom.encodeIdx)
         {
@@ -275,7 +275,7 @@
             {
                 m_modeDepth[0].fencYuv.copyPartToYuv(nd.fencYuv, childGeom.encodeIdx);
                 m_rqt[nextDepth].cur.load(*nextContext);
-                compressIntraCU(parentCTU, childGeom, reuseIntraData, zOrder);
+                compressIntraCU(parentCTU, childGeom, zOrder);
 
                 // Save best CU and pred data for this sub CU
                 splitCU->copyPartFrom(nd.bestMode->cu, childGeom, subPartIdx);
diff -r 8d2f418829c8 -r c4ec3f22846b source/encoder/analysis.h
--- a/source/encoder/analysis.h	Sat Dec 20 21:27:14 2014 +0900
+++ b/source/encoder/analysis.h	Tue Dec 23 11:43:32 2014 +0530
@@ -95,7 +95,7 @@
     void parallelME(int threadId, int meId);
 
     /* full analysis for an I-slice CU */
-    void compressIntraCU(const CUData& parentCTU, const CUGeom& cuGeom, analysis_intra_data* sdata, uint32_t &zOrder);
+    void compressIntraCU(const CUData& parentCTU, const CUGeom& cuGeom, uint32_t &zOrder);
 
     /* full analysis for a P or B slice CU */
     void compressInterCU_dist(const CUData& parentCTU, const CUGeom& cuGeom);