Changeset 514 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib/TLibDecoder

Timestamp:

13 Dec 2013, 23:00:20 (11 years ago)

Author:

sharp

Message:

19. Deshpande (Sharp) <sdeshpande@…>

-Signal max temporal sub-layers for each layer in the VPS, with a gating flag, from JCTVC-O0120.
-IL RPS derivation based on max temporal sub-layers per layer in VPS from JCTVC-O0120.

Location:

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

Files:

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

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

@@ -1109 +1109 @@
   }
 #endif
+#if VPS_TSLAYERS
+    READ_FLAG( uiCode, "vps_sub_layers_max_minus1_present_flag"); vps->setMaxTSLayersPresentFlag(uiCode ? true : false);
+    if (vps->getMaxTSLayersPresentFlag())
+    {
+        for(i = 0; i < vps->getMaxLayers() - 1; i++)
+        {
+            READ_CODE( 3, uiCode, "sub_layers_vps_max_minus1[i]" ); vps->setMaxTSLayersMinus1(i, uiCode);
+        }
+    }
+    else
+    {
+        for( i = 0; i < vps->getMaxLayers() - 1; i++)
+        {
+            vps->setMaxTSLayersMinus1(i, vps->getMaxTLayers()-1);
+        }
+    }
+#endif
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
 #if N0120_MAX_TID_REF_PRESENT_FLAG
@@ -1928 +1945 @@
         else
         {
-#if O0225_TID_BASED_IL_RPS_DERIV
-          if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,rpcSlice->getLayerId()) >  rpcSlice->getTLayer())
+#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
+          if( (rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(0,rpcSlice->getLayerId()) >  rpcSlice->getTLayer()) &&
+             (rpcSlice->getVPS()->getMaxTSLayersMinus1(0) >=  rpcSlice->getTLayer()) )
         {
 #endif
           rpcSlice->setActiveNumILRRefIdx(1);
           rpcSlice->setInterLayerPredLayerIdc(0,0);
-#if O0225_TID_BASED_IL_RPS_DERIV
+#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
         }
 #endif
@@ -1949 +1967 @@
       rpcSlice->setInterLayerPredEnabledFlag(true);
 
-#if O0225_TID_BASED_IL_RPS_DERIV      
+#if O0225_TID_BASED_IL_RPS_DERIV && TSLAYERS_IL_RPS
       Int   numRefLayerPics = 0;
       Int   i = 0;
@@ -1955 +1973 @@
       for(i = 0, numRefLayerPics = 0;  i < rpcSlice->getNumILRRefIdx(); i++ ) 
       {
-        if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) >  rpcSlice->getTLayer())
+        if(rpcSlice->getVPS()->getMaxTidIlRefPicsPlus1(rpcSlice->getVPS()->getLayerIdInVps(i),rpcSlice->getLayerId()) >  rpcSlice->getTLayer() &&
+           (rpcSlice->getVPS()->getMaxTSLayersMinus1(rpcSlice->getVPS()->getLayerIdInVps(i)) >=  rpcSlice->getTLayer()) )
         {          
           refLayerPicIdc[ numRefLayerPics++ ] = i;

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

@@ -1219 +1219 @@
         if( pcPic->isSpatialEnhLayer(refLayerIdc) )
         {    
-#if O0098_SCALED_REF_LAYER_ID
+/*#if O0098_SCALED_REF_LAYER_ID
           Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindowForLayer(pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc));
 #else
           Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
-#endif
+#endif*/
 #if O0215_PHASE_ALIGNMENT
 #if O0194_JOINT_US_BITSHIFT