Changeset 270 in SHVCSoftware

Timestamp:

6 Jun 2013, 05:19:05 (12 years ago)

Author:

seregin

Message:

put back the first solution for the fast encoder mode

Location:

branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (1 diff)

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

@@ -458 +458 @@
     if (rpcBestCU->getLayerId() > 0)
     {
-      TComList<TComPic*> *cListPic = m_ppcTEncTop[rpcBestCU->getLayerId()]->getRefLayerEnc(0)->getListPic();
+      TComList<TComPic*> *cListPic = m_ppcTEncTop[rpcBestCU->getLayerId()]->getRefLayerEnc(rpcBestCU->getLayerId()-1)->getListPic();
       TComPic* picLowerLayer = pcSlice->getRefPic( *cListPic, pcSlice->getPOC() );
       if(picLowerLayer->getSlice(0)->getSliceType() == I_SLICE)

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

@@ -3313 +3313 @@
       
 #if (ENCODER_FAST_MODE)
-      if( pcCU->getSlice()->getNumRefIdx(eRefPicList) > 1 )
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+      if( pcCU->getSlice()->getNumRefIdx(eRefPicList) - pcCU->getSlice()->getActiveNumILRRefIdx() > Int( pcCU->getSlice()->getActiveNumILRRefIdx() == 0 ) )
+#else
+      if( pcCU->getSlice()->getNumRefIdx(eRefPicList) - pcCU->getSlice()->getVPS()->getNumDirectRefLayers( pcCU->getLayerId() ) > Int( pcCU->getSlice()->getVPS()->getNumDirectRefLayers( pcCU->getLayerId() ) == 0 ) )
+#endif
       {
         testILR = false;