Changeset 782 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder

Timestamp:

6 Jun 2014, 19:07:02 (12 years ago)

Author:

seregin

Message:

remove ILP_SSH_SIG and ILP_SSH_SIG_FIX

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -976 +976 @@
      }
    }
-#if ILP_SSH_SIG
-    WRITE_FLAG( vps->getIlpSshSignalingEnabledFlag(), "all_ref_layers_active_flag" );
-#endif
+   WRITE_FLAG( vps->getIlpSshSignalingEnabledFlag(), "all_ref_layers_active_flag" );
 #if VPS_EXTN_PROFILE_INFO
   // Profile-tier-level signalling
@@ -1969 +1967 @@
 
 #if SVC_EXTENSION
-#if ILP_SSH_SIG
-#if ILP_SSH_SIG_FIX
     if((pcSlice->getLayerId() > 0) && !(pcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (pcSlice->getNumILRRefIdx() > 0) )
-#else
-    if((pcSlice->getLayerId() > 0) && pcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (pcSlice->getNumILRRefIdx() > 0) )
-#endif
-#else
-    if((pcSlice->getLayerId() > 0)  &&  (pcSlice->getNumILRRefIdx() > 0) )
-#endif
     {
       WRITE_FLAG(pcSlice->getInterLayerPredEnabledFlag(),"inter_layer_pred_enabled_flag");