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

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/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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

@@ -3447 +3447 @@
 #endif
 
-#if !O0109_O0199_FLAGS_TO_VUI
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
-#endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
-  READ_FLAG(uiCode, "higher_layer_irap_skip_flag" ); vps->setHigherLayerIrapSkipFlag(uiCode == 1 ? true : false);
-#endif
-#endif
-
   READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);
 
@@ -3972 +3963 @@
 #endif
 
-#if O0109_O0199_FLAGS_TO_VUI
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
@@ -3984 +3974 @@
     assert( !vps->getHigherLayerIrapSkipFlag() );
   }
-#endif
 #endif
 #if N0160_VUI_EXT_ILP_REF