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

Timestamp:

7 Jul 2015, 01:10:52 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0109_O0199_FLAGS_TO_VUI

File:

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

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

@@ -2420 +2420 @@
 #endif
 
-#if !O0109_O0199_FLAGS_TO_VUI
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" );
-#endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
-  WRITE_FLAG(vps->getHigherLayerIrapSkipFlag(), "higher_layer_irap_skip_flag" );
-#endif
-#endif
-
 #if P0307_VPS_NON_VUI_EXTENSION
   // The value of vps_non_vui_extension_length shall be in the range of 0 to 4096, inclusive.
@@ -2743 +2734 @@
 #endif
 
-#if O0109_O0199_FLAGS_TO_VUI
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" );
@@ -2755 +2745 @@
 
   WRITE_FLAG(vps->getHigherLayerIrapSkipFlag(), "higher_layer_irap_skip_flag" );
-#endif
 #endif
 #if N0160_VUI_EXT_ILP_REF