Changeset 1535 in SHVCSoftware

Timestamp:

22 Mar 2016, 22:46:59 (9 years ago)

Author:

seregin

Message:

port rev 4687

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (5 diffs)
• TEncCu.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -694 +694 @@
         // do normal intra modes
         // speedup for inter frames
-        Double intraCost = 0.0;
-
         if((rpcBestCU->getSlice()->getSliceType() == I_SLICE)                                        ||
 #if ENCODER_FAST_MODE
@@ -707 +705 @@
             )))
         {
-          xCheckRDCostIntra( rpcBestCU, rpcTempCU, intraCost, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
+          xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N DEBUG_STRING_PASS_INTO(sDebug) );
           rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
           if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() )
@@ -713 +711 @@
             if( rpcTempCU->getWidth(0) > ( 1 << sps.getQuadtreeTULog2MinSize() ) )
             {
-              Double tmpIntraCost;
-              xCheckRDCostIntra( rpcBestCU, rpcTempCU, tmpIntraCost, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
-              intraCost = std::min(intraCost, tmpIntraCost);
+              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN DEBUG_STRING_PASS_INTO(sDebug)   );
               rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode );
             }
@@ -1465 +1461 @@
 Void TEncCu::xCheckRDCostIntra( TComDataCU *&rpcBestCU,
                                 TComDataCU *&rpcTempCU,
-                                Double      &cost,
                                 PartSize     eSize
                                 DEBUG_STRING_FN_DECLARE(sDebug) )
@@ -1527 +1522 @@
 
   xCheckDQP( rpcTempCU );
-
-  cost = rpcTempCU->getTotalCost();
 
   xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest));

branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h

@@ -150 +150 @@
   Void  xCheckRDCostIntra   ( TComDataCU *&rpcBestCU,
                               TComDataCU *&rpcTempCU,
-                              Double      &cost,
                               PartSize     ePartSize
                               DEBUG_STRING_FN_DECLARE(sDebug)