Changeset 170 in SHVCSoftware for branches/SHM-2.0-dev/source/Lib/TLibDecoder

Timestamp:

9 May 2013, 17:40:26 (12 years ago)

Author:

qualcomm

Message:

JCTVC-M0458:signalling and derivation of inter-layer RPS. Author: krapaka@…

Location:

branches/SHM-2.0-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

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

@@ -1039 +1039 @@
 #endif
 #endif
+#if JCTVC_M0458
+   READ_FLAG(uiCode, "max_one_active_ref_layer_flag" );
+   vps->setMaxOneActiveRefLayerFlag(uiCode);   
+#endif 
 
 #if !VPS_MOVE_DIR_DEPENDENCY_FLAG
@@ -1591 +1595 @@
   }
 
+  #if JCTVC_M0458    
+    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);          
+          }
+        }
+        else
+        {
+          rpcSlice->setActiveNumILRRefIdx(1);          
+          rpcSlice->setInterLayerPredLayerIdc(0,0);      
+        }
+      }
+    }     
+#endif
+
   if(pps->getSliceHeaderExtensionPresentFlag())
   {

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

@@ -1257 +1257 @@
   // currently only one reference layer is supported
   assert( vps->getNumDirectRefLayers( m_layerId ) == 1 );
+#if JCTVC_M0458
+  assert( vps->getMaxOneActiveRefLayerFlag() == 1 );
+#endif 
+
 
   return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, 0 ) );