Changeset 1159 in SHVCSoftware

Timestamp:

8 Jul 2015, 00:46:00 (9 years ago)

Author:

seregin

Message:

macro cleanup: NUM_OL_FLAGS

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -154 +154 @@
 
 #define Q0078_ADD_LAYER_SETS             1      ///< JCTVC-Q0078: additional layer sets and layer set config
-#if Q0078_ADD_LAYER_SETS
-#define MAX_NUM_ADD_LAYER_SETS           1023
-#endif
 #define MULTIPLE_PTL_SUPPORT             1      ///< Profile, tier and level signalling
 
@@ -167 +164 @@
 #endif
 #define DPB_PARAMS_MAXTLAYERS            1      ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set
-#define NUM_OL_FLAGS                     1      ///< JCTVC-P0156 output_layer_flag[ i ][ j ] is signalled for j equal to 0 to NumLayersInIdList[ lsIdx ] inclusive
 #define NO_CLRAS_OUTPUT_FLAG             1
 
@@ -222 +218 @@
 #define Q0096_OVERLAY_SEI                1      ///< JCTVC-Q0096, JCTVC-Q0045: selectable overlays SEI message
 #if Q0096_OVERLAY_SEI 
-# define MAX_OVERLAYS                    16
-# define MAX_OVERLAY_ELEMENTS            256
-# define MAX_OVERLAY_STRING_BYTES        256
+#define MAX_OVERLAYS                     16
+#define MAX_OVERLAY_ELEMENTS             256
+#define MAX_OVERLAY_STRING_BYTES         256
 #endif
 #define P0123_ALPHA_CHANNEL_SEI          1      ///< JCTVC-P0123: SEI message for alpha channel information
+
+/// constants
+#define MAX_NUM_ADD_LAYER_SETS           1023
 #define MAX_SEIS_IN_BSP_NESTING          64
 

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

@@ -2937 +2937 @@
       vps->setOutputLayerSetIdx( i, i );
     }
+
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx(i);
+
 #if Q0078_ADD_LAYER_SETS
     if( i > vps->getVpsNumLayerSetsMinus1() || vps->getDefaultTargetOutputLayerIdc() == 2 )
@@ -2944 +2946 @@
 #endif
     {
-#if NUM_OL_FLAGS
-      for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
-#else
-      for(j = 0; j < vps->getNumLayersInIdList(lsIdx) - 1; j++)
-#endif
+      for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
       {
         READ_FLAG( uiCode, "output_layer_flag[i][j]"); vps->setOutputLayerFlag(i, j, uiCode);

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

@@ -2177 +2177 @@
 #endif
     {
-#if NUM_OL_FLAGS
-      for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
-#else
-      for(j = 0; j < vps->getNumLayersInIdList(lsIdx) - 1; j++)
-#endif
+      for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++ )
       {
         WRITE_FLAG( vps->getOutputLayerFlag(i,j), "output_layer_flag[i][j]");