Changeset 274 in SHVCSoftware for branches/SHM-2.1-multilayers-dev/source/Lib

Timestamp:

7 Jun 2013, 01:30:46 (11 years ago)

Author:

interdigital

Message:

FAST_MODE bug fix

File:

• branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncCu.cpp (modified) (4 diffs)

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

@@ -456 +456 @@
   {
 #if (ENCODER_FAST_MODE)
-    bool testInter = true;
+    Bool testInter = true;
     if (rpcBestCU->getLayerId() > 0)
-    {
-      TComList<TComPic*> *cListPic = m_ppcTEncTop[rpcBestCU->getLayerId()]->getRefLayerEnc(rpcBestCU->getLayerId()-1)->getListPic();
+    { 
+      TComList<TComPic*> *cListPic = m_ppcTEncTop[rpcBestCU->getLayerId()]->getRefLayerEnc(0)->getListPic();
       TComPic* picLowerLayer = pcSlice->getRefPic( *cListPic, pcSlice->getPOC() );
       if(picLowerLayer->getSlice(0)->getSliceType() == I_SLICE)
@@ -465 +465 @@
         testInter = false;
       }
-
     }
 #endif
@@ -770 +769 @@
       }
 #endif
-
 #if (ENCODER_FAST_MODE)
-        if(pcPic->getLayerId() > 0)
-        { 
-          xCheckRDCostILRUni( rpcBestCU, rpcTempCU); 
-          rpcTempCU->initEstData( uiDepth, iQP );
-       }
+      if(pcPic->getLayerId() > 0)
+      {
+        for(Int refLayer = 0; refLayer < pcSlice->getActiveNumILRRefIdx(); refLayer++)
+        {  
+           xCheckRDCostILRUni( rpcBestCU, rpcTempCU, pcSlice->getInterLayerPredLayerIdc(refLayer));
+           rpcTempCU->initEstData( uiDepth, iQP );
+        }
+      }
 #endif
 
@@ -1815 +1816 @@
 }
 #endif
-
 #if (ENCODER_FAST_MODE)
-Void TEncCu::xCheckRDCostILRUni(TComDataCU *&rpcBestCU, TComDataCU *&rpcTempCU)
+Void TEncCu::xCheckRDCostILRUni(TComDataCU *&rpcBestCU, TComDataCU *&rpcTempCU, UInt refLayerId)
 {
   UChar uhDepth = rpcTempCU->getDepth( 0 );
-
   rpcTempCU->setDepthSubParts( uhDepth, 0 );
-
 #if SKIP_FLAG
   rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
 #endif
-
   rpcTempCU->setPartSizeSubParts  ( SIZE_2Nx2N,  0, uhDepth );  //2Nx2N
   rpcTempCU->setPredModeSubParts  ( MODE_INTER, 0, uhDepth );
   rpcTempCU->setCUTransquantBypassSubParts  ( m_pcEncCfg->getCUTransquantBypassFlagValue(), 0, uhDepth );
-
-  Bool exitILR = m_pcPredSearch->predInterSearchILRUni( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth] );
-
+  Bool exitILR = m_pcPredSearch->predInterSearchILRUni( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth], refLayerId );
   if(!exitILR)
   {
-    return;
-  }
-
+     return;
+  }
   m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false );
-
   rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
-
   xCheckDQP( rpcTempCU );
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
-
   return;
 }
 #endif
-
-
 //! \}