[x265] [PATCH] Analysis: compressIntraCU clean up

ashok at multicorewareinc.com ashok at multicorewareinc.com
Mon Sep 8 17:09:00 CEST 2014


# HG changeset patch
# User Ashok Kumar Mishra<ashok at multicorewareinc.com>
# Date 1410162700 -19800
#      Mon Sep 08 13:21:40 2014 +0530
# Node ID d0ed8682837d422b15515b3c7c013e4191a48d81
# Parent  8cbfec8d6b4d293a5e7f32e8fef46700b9f1cf6a
Analysis: compressIntraCU clean up

diff -r 8cbfec8d6b4d -r d0ed8682837d source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp	Sun Sep 07 12:54:27 2014 +0900
+++ b/source/encoder/analysis.cpp	Mon Sep 08 13:21:40 2014 +0530
@@ -311,7 +311,7 @@
     uint32_t numPartition = cu->getTotalNumPart();
     if (m_bestCU[0]->m_slice->m_sliceType == I_SLICE)
     {
-        compressIntraCU(m_bestCU[0], m_tempCU[0], 0, false, cu, cu->m_CULocalData);
+        compressIntraCU(m_bestCU[0], m_tempCU[0], false, cu, cu->m_CULocalData);
         if (m_param->bLogCuStats || m_param->rc.bStatWrite)
         {
             uint32_t i = 0;
@@ -397,7 +397,7 @@
         }
     }
 }
-void Analysis::compressIntraCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth, bool bInsidePicture, TComDataCU* cuPicsym, CU *cu)
+void Analysis::compressIntraCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth, TComDataCU* cuPicsym, CU *cu)
 {
     //PPAScopeEvent(CompressIntraCU + depth);
     Frame* pic = outBestCU->m_pic;
@@ -412,9 +412,8 @@
     // We need to split, so don't try these modes.
     int cu_split_flag = !(cu->flags & CU::LEAF);
     int cu_unsplit_flag = !(cu->flags & CU::SPLIT_MANDATORY);
-    int cu_intra_flag = cu_unsplit_flag;
 
-    if (cu_intra_flag)
+    if (cu_unsplit_flag)
     {
         m_quant.setQPforQuant(outTempCU);
         checkIntra(outBestCU, outTempCU, SIZE_2Nx2N, cu);
@@ -458,7 +457,7 @@
                 else
                     m_rdEntropyCoders[nextDepth][CI_CURR_BEST].load(m_rdEntropyCoders[nextDepth][CI_NEXT_BEST]);
 
-                compressIntraCU(subBestPartCU, subTempPartCU, nextDepth, bInsidePicture, cuPicsym, child_cu);
+                compressIntraCU(subBestPartCU, subTempPartCU, nextDepth, cuPicsym, child_cu);
                 outTempCU->copyPartFrom(subBestPartCU, partUnitIdx, nextDepth); // Keep best part data to current temporary data.
                 copyYuv2Tmp(subBestPartCU->getTotalNumPart() * partUnitIdx, nextDepth);
             }
diff -r 8cbfec8d6b4d -r d0ed8682837d source/encoder/analysis.h
--- a/source/encoder/analysis.h	Sun Sep 07 12:54:27 2014 +0900
+++ b/source/encoder/analysis.h	Mon Sep 08 13:21:40 2014 +0530
@@ -107,7 +107,7 @@
 protected:
 
     /* Warning: The interface for these functions will undergo significant changes as a major refactor is under progress */
-    void compressIntraCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth, bool bInsidePicture, TComDataCU* cuPicsym, CU *cu);
+    void compressIntraCU(TComDataCU*& outBestCU, TComDataCU*& outTempCU, uint32_t depth, TComDataCU* cuPicsym, CU *cu);
     void checkIntra(TComDataCU*& outBestCU, TComDataCU*& outTempCU, PartSize partSize, CU *cu);
 
     void compressInterCU_rd0_4(TComDataCU*& outBestCU, TComDataCU*& outTempCU, TComDataCU* cu, uint32_t depth,


More information about the x265-devel mailing list