Changeset 181 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

11 May 2013, 01:14:05 (12 years ago)

Author:

seregin

Message:

move syntax signaling associated with JCTVC_M0458_INTERLAYER_RPS_SIG ahead of the list modification signaling

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -744 +744 @@
 #if REF_IDX_FRAMEWORK
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
+    return m_activeNumILRRefIdx;
+#else
     return getNumILRRefIdx();
-#else
-    return m_numILRRefIdx;
 #endif 
 #else
@@ -762 +762 @@
   if(getLayerId())
   {
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+    numRpsCurrTempList += m_activeNumILRRefIdx;
+#else
     numRpsCurrTempList += getNumILRRefIdx();
+#endif
   }
 #endif

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

@@ -1323 +1323 @@
         rpcSlice->setRPS(rps);
       }
+
+
       if (rpcSlice->getSPS()->getTMVPFlagsPresent())
       {
@@ -1333 +1335 @@
       }
     }
+
+#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);          
+          }
+          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
+
     if(sps->getUseSAO())
     {
@@ -1606 +1651 @@
     rpcSlice->setNumEntryPointOffsets ( 0 );
   }
-
-#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);          
-        }
-        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
 
   if(pps->getSliceHeaderExtensionPresentFlag())

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1013 +1013 @@
         }
       }
+
       if (pcSlice->getSPS()->getTMVPFlagsPresent())
       {
@@ -1018 +1019 @@
       }
     }
+
+#if JCTVC_M0458_INTERLAYER_RPS_SIG    
+    if((pcSlice->getSPS()->getLayerId() > 0)  &&  (pcSlice->getNumILRRefIdx() > 0) ) 
+    {
+      WRITE_FLAG(pcSlice->getInterLayerPredEnabledFlag(),"inter_layer_pred_enabled_flag");
+      if( pcSlice->getInterLayerPredEnabledFlag())
+      {
+        if(pcSlice->getNumILRRefIdx() > 1)
+        {
+          if( !pcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
+          {
+            WRITE_UVLC(pcSlice->getNumInterLayerRefPics(),"num_inter_layer_ref_pics_minus1");                     
+          }       
+          for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) 
+            WRITE_UVLC(pcSlice->getInterLayerPredLayerIdc(i),"inter_layer_pred_layer_idc[i]");     
+        }
+      }
+    }     
+#endif 
+
     if(pcSlice->getSPS()->getUseSAO())
     {
@@ -1176 +1197 @@
     }
   }
-#if JCTVC_M0458_INTERLAYER_RPS_SIG    
-    if((pcSlice->getSPS()->getLayerId() > 0)  &&  (pcSlice->getNumILRRefIdx() > 0) ) 
-    {
-      WRITE_FLAG(pcSlice->getInterLayerPredEnabledFlag(),"inter_layer_pred_enabled_flag");
-      if( pcSlice->getInterLayerPredEnabledFlag())
-      {
-        if(pcSlice->getNumILRRefIdx() > 1)
-        {
-          if( !pcSlice->getVPS()->getMaxOneActiveRefLayerFlag()) 
-          {
-            WRITE_UVLC(pcSlice->getNumInterLayerRefPics(),"num_inter_layer_ref_pics_minus1");                     
-          }       
-          for(Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) 
-            WRITE_UVLC(pcSlice->getInterLayerPredLayerIdc(i),"inter_layer_pred_layer_idc[i]");     
-        }
-      }
-    }     
-#endif 
+
   if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
   {