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

Timestamp:

29 Mar 2016, 18:28:05 (9 years ago)

Author:

seregin

Message:

rename the syntax to match the spec, ticket #110

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)

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

@@ -1539 +1539 @@
 #if SVC_EXTENSION
     pcSlice->setActiveNumILRRefIdx(0);
-    if((pcSlice->getLayerId() > 0) && !(vps->getIlpSshSignalingEnabledFlag()) && (pcSlice->getNumILRRefIdx() > 0) )
+    if((pcSlice->getLayerId() > 0) && !(vps->getDefaultRefLayersActiveFlag()) && (pcSlice->getNumILRRefIdx() > 0) )
     {
       READ_FLAG(uiCode,"inter_layer_pred_enabled_flag");
@@ -1600 +1600 @@
       }
     }
-    else if( vps->getIlpSshSignalingEnabledFlag() == true &&  (pcSlice->getLayerId() > 0 ))
+    else if( vps->getDefaultRefLayersActiveFlag() == true &&  (pcSlice->getLayerId() > 0 ))
     {
       pcSlice->setInterLayerPredEnabledFlag(true);
@@ -2681 +2681 @@
   for(i = 0; i < MAX_VPS_NUM_SCALABILITY_TYPES; i++)
   {
-    READ_FLAG( uiCode, "scalability_mask[i]" ); vps->setScalabilityMask(i, uiCode ? true : false);
+    READ_FLAG( uiCode, "scalability_mask_flag[i]" ); vps->setScalabilityMask(i, uiCode ? true : false);
     numScalabilityTypes += uiCode;
   }
@@ -2841 +2841 @@
     }
   }
-  READ_FLAG( uiCode, "all_ref_layers_active_flag" ); vps->setIlpSshSignalingEnabledFlag(uiCode ? true : false);
+  READ_FLAG( uiCode, "default_ref_layers_active_flag" ); vps->setDefaultRefLayersActiveFlag(uiCode ? true : false);
 
   // Profile-tier-level signalling