Changeset 178 in SHVCSoftware for branches/SHM-2.0-dev

Timestamp:

10 May 2013, 18:04:28 (12 years ago)

Author:

seregin

Message:

set NumDirectRefLayers for a slice at decoder

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -183 +183 @@
 #if REF_IDX_FRAMEWORK
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
-    m_activeNumILRRefIdx        = 0;
-    m_interLayerPredEnabledFlag = 0;
+  m_activeNumILRRefIdx        = 0;
+  m_interLayerPredEnabledFlag = 0;
 #else
-    m_numILRRefIdx              = 0;
+  m_numILRRefIdx              = 0;
 #endif  
 

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1607 +1607 @@
   }
 
-  #if JCTVC_M0458_INTERLAYER_RPS_SIG    
-    rpcSlice->setActiveNumILRRefIdx(0); 
-    if((sps->getLayerId() > 0)  &&  (rpcSlice->getNumILRRefIdx() > 0) ) 
-    {      
-      READ_FLAG(uiCode,"inter_layer_pred_enabled_flag");
-      rpcSlice->setInterLayerPredEnabledFlag(uiCode);
-      if( rpcSlice->getInterLayerPredEnabledFlag())
-      {
-        if(rpcSlice->getNumILRRefIdx() > 1) 
-        {
-          if( !rpcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
-          {
-            READ_UVLC(uiCode,"num_inter_layer_ref_pics_minus1");   
-            rpcSlice->setActiveNumILRRefIdx(uiCode + 1);          
-          }
-          else
-          {
-            rpcSlice->setActiveNumILRRefIdx(1);          
-            rpcSlice->setInterLayerPredLayerIdc(0,0);          
-          }
-          for(Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) 
-          {
-            READ_UVLC(uiCode,"inter_layer_pred_layer_idc[i]");          
-            rpcSlice->setInterLayerPredLayerIdc(uiCode,i);          
-          }
+#if REF_IDX_FRAMEWORK
+#if JCTVC_M0458_INTERLAYER_RPS_SIG    
+  rpcSlice->setActiveNumILRRefIdx(0);
+  if((sps->getLayerId() > 0)  &&  (rpcSlice->getNumILRRefIdx() > 0) ) 
+  {      
+    READ_FLAG(uiCode,"inter_layer_pred_enabled_flag");
+    rpcSlice->setInterLayerPredEnabledFlag(uiCode);
+    if( rpcSlice->getInterLayerPredEnabledFlag())
+    {
+      if(rpcSlice->getNumILRRefIdx() > 1) 
+      {
+        if( !rpcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
+        {
+          READ_UVLC(uiCode,"num_inter_layer_ref_pics_minus1");   
+          rpcSlice->setActiveNumILRRefIdx(uiCode + 1);          
         }
         else
         {
           rpcSlice->setActiveNumILRRefIdx(1);          
-          rpcSlice->setInterLayerPredLayerIdc(0,0);      
-        }
-      }
-    }     
+          rpcSlice->setInterLayerPredLayerIdc(0,0);          
+        }
+        for(Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) 
+        {
+          READ_UVLC(uiCode,"inter_layer_pred_layer_idc[i]");          
+          rpcSlice->setInterLayerPredLayerIdc(uiCode,i);          
+        }
+      }
+      else
+      {
+        rpcSlice->setActiveNumILRRefIdx(1);          
+        rpcSlice->setInterLayerPredLayerIdc(0,0);      
+      }
+    }
+  }
+#else
+  if( rpcSlice->getLayerId() > 0 )
+  {
+    rpcSlice->setNumILRRefIdx( rpcSlice->getVPS()->getNumDirectRefLayers( rpcSlice->getLayerId() ) );
+  }
+#endif
 #endif