Changeset 1124 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

7 Jul 2015, 02:24:58 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0300_ALT_OUTPUT_LAYER_FLAG, O0153_ALT_OUTPUT_LAYER_FLAG

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.h (modified) (3 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -752 +752 @@
   Int        m_avgPicRate          [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER];
 
-#if P0300_ALT_OUTPUT_LAYER_FLAG
 #if Q0078_ADD_LAYER_SETS
   Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
@@ -758 +757 @@
   Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1];
 #endif
-#else
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  Bool       m_altOutputLayerFlag;
-#endif
-#endif
+
 #if REPN_FORMAT_IN_VPS
   Bool       m_repFormatIdxPresentFlag;
@@ -1271 +1266 @@
 #endif
 
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Bool   getAltOuputLayerFlag(Int idx)         { return m_altOutputLayerFlag[idx]; }
   Void   setAltOuputLayerFlag(Int idx, Bool x) { m_altOutputLayerFlag[idx] = x;    }
-#else
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  Bool   getAltOuputLayerFlag()             { return m_altOutputLayerFlag; }
-  Void   setAltOuputLayerFlag(Bool x)       { m_altOutputLayerFlag = x;    }
-#endif
-#endif
+
 #if REPN_FORMAT_IN_VPS
   Bool   getRepFormatIdxPresentFlag()       { return m_repFormatIdxPresentFlag; }

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

@@ -190 +190 @@
 #define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id
 
-#define O0153_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-O0153: alt output layer flag
-#define P0300_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-P0300: alt output layer flag
-
 #define Q0165_OUTPUT_LAYER_SET           1      ///< JCTVC-Q0165: add a constraint to disallow an empty output layer set
 #define Q0165_NUM_ADD_OUTPUT_LAYER_SETS  1      ///< JCTVC-Q0165: signal num_add_olss and default_target_output_layer_idc when vps_num_layer_sets_minus1 is greater than 0