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

Timestamp:

5 Jun 2013, 09:06:22 (12 years ago)

Author:

seregin

Message:

TMVP setting fix, encoder speed up fix, and other minor corrections

Location:

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

Files:

• TEncGOP.cpp (modified) (2 diffs)
• TEncSearch.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (1 diff)

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

@@ -543 +543 @@
         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId-1]->getListPic();
 #endif
-        pcSlice->setBaseColPic (*cListPic, refLayerIdc );
+        pcSlice->setBaseColPic( *cListPic, refLayerIdc );
 
 #if SIMPLIFIED_MV_POS_SCALING
@@ -936 +936 @@
     {
       pcSlice->getSPS()->setTMVPFlagsPresent(1);
+#if SVC_EXTENSION
+      if( pcSlice->getIdrPicFlag() )
+      {
+        pcSlice->setEnableTMVPFlag(0);
+      }
+      else
+#endif
       pcSlice->setEnableTMVPFlag(1);
     }

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

@@ -3313 +3313 @@
       
 #if (ENCODER_FAST_MODE)
-      if (pcCU->getSlice()->getNumRefIdx(eRefPicList) > 1)
+      if( pcCU->getSlice()->getNumRefIdx(eRefPicList) - pcCU->getSlice()->getActiveNumILRRefIdx() > 0)
       {
         testILR = false;

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

@@ -995 +995 @@
     TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );
     pcCU->initCU( rpcPic, uiCUAddr );
-#if SVC_EXTENSION
-    pcCU->setLayerId(m_pcCfg->getLayerId());
-#endif
 
 #if !RATE_CONTROL_LAMBDA_DOMAIN

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

@@ -1222 +1222 @@
   }
 
-  return (TEncTop *)getLayerEnc( getVPS()->getRefLayerId( m_layerId, refLayerIdc ) );
+  return (TEncTop *)getLayerEnc( m_cVPS.getRefLayerId( m_layerId, refLayerIdc ) );
 }
 #endif