Changeset 1115 in SHVCSoftware for branches

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_O0199_FLAGS_TO_VUI

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -89 +89 @@
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
 #define FIX_ALIGN_BUMPING                1
-#define O0109_O0199_FLAGS_TO_VUI         1      ///< JCTVC-O0109, O0199: move single_layer_for_non_irap_flag and higher_layer_flag to vps_vui
 #define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews
 

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

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