Changeset 257 in SHVCSoftware for branches/SHM-2.1-multilayers-dev

Timestamp:

3 Jun 2013, 21:33:24 (12 years ago)

Author:

seregin

Message:

remove asserts and LIP init at decoder

Location:

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

Files:

• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/SHM-2.1-multilayers-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -160 +160 @@
     if (m_cIlpPic[0] == NULL)
     {
-      for (Int j=0; j< 1/*MAX_NUM_REF*/; j++)  // to be set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
+      for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++)  // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
       {
 
@@ -1307 +1307 @@
 #endif
   }
-
-  // currently only one reference layer is supported
-  assert( vps->getNumDirectRefLayers( m_layerId ) == 1 );
-#if JCTVC_M0458_INTERLAYER_RPS_SIG
-  assert( vps->getMaxOneActiveRefLayerFlag() == 1 );
-#endif 
   
   return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, refLayerIdc ) );

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

@@ -1222 +1222 @@
   }
 
-  // currently only one reference layer is supported
-  assert( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() == 1 );
-
   return (TEncTop *)getLayerEnc( getVPS()->getRefLayerId( m_layerId, refLayerIdc ) );
 }
@@ -1247 +1244 @@
     if (m_cIlpPic[0] == NULL)
     {
-      for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++)
+      for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
       {
         m_cIlpPic[j] = new  TComPic;