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

Timestamp:

7 Jul 2015, 23:12:48 (10 years ago)

Author:

seregin

Message:

macro cleanup: SUB_LAYERS_IN_LAYER_SET

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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

@@ -3155 +3155 @@
   }
 }
-#endif
 
 #if DERIVE_LAYER_ID_LIST_VARIABLES
@@ -3609 +3608 @@
 }
 #endif
-#if SUB_LAYERS_IN_LAYER_SET
+
 Void TComVPS::calculateMaxSLInLayerSets()
 {
@@ -3622 +3621 @@
   }
 }
-#endif
 
 #if REPN_FORMAT_IN_VPS
@@ -3814 +3812 @@
 #endif
 
-#if SVC_EXTENSION
+
 Bool TComSlice::setBaseColPic(  TComList<TComPic*>& rcListPic, UInt refLayerIdc )
 {  

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

@@ -1316 +1316 @@
   Void  checkNecessaryLayerFlagCondition();
 #endif
-#if SUB_LAYERS_IN_LAYER_SET
   Void  calculateMaxSLInLayerSets();
-#endif
 #endif //SVC_EXTENSION
 };

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

@@ -61 +61 @@
 #endif
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
-#define SUB_LAYERS_IN_LAYER_SET          1      ///< Move calculation of MaxSubLayerInLayerSets to a separate function
 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1