Changeset 1155 in SHVCSoftware

Timestamp:

8 Jul 2015, 00:34:36 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0165_NUM_ADD_OUTPUT_LAYER_SETS

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -158 +158 @@
 #endif
 #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
 
 #define Q0078_ADD_LAYER_SETS             1      ///< JCTVC-Q0078: additional layer sets and layer set config

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

@@ -2898 +2898 @@
 #endif
 
-#if Q0165_NUM_ADD_OUTPUT_LAYER_SETS
   if( vps->getNumLayerSets() > 1 )
   {
-    READ_UVLC( uiCode, "num_add_olss" );            vps->setNumAddOutputLayerSets( uiCode );
+    READ_UVLC( uiCode, "num_add_olss" );                  vps->setNumAddOutputLayerSets( uiCode );
     READ_CODE( 2, uiCode, "default_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
   }
@@ -2908 +2907 @@
     vps->setNumAddOutputLayerSets( 0 );
   }
-#else
-  READ_UVLC( uiCode, "num_add_output_layer_sets" );          vps->setNumAddOutputLayerSets( uiCode );
-#endif
 
   // The value of num_add_olss shall be in the range of 0 to 1023, inclusive.
@@ -2918 +2914 @@
 
 #if P0295_DEFAULT_OUT_LAYER_IDC
-#if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS
-  if( numOutputLayerSets > 1 )
-  {
-    READ_CODE( 2, uiCode, "default_target_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
-  }
-#endif
   vps->setNumOutputLayerSets( numOutputLayerSets );
 

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

@@ -2153 +2153 @@
   assert( numAddOutputLayerSets >= 0 && numAddOutputLayerSets < 1024 );
 
-#if Q0165_NUM_ADD_OUTPUT_LAYER_SETS
   if( vps->getNumLayerSets() > 1 )
   {
@@ -2159 +2158 @@
     WRITE_CODE( vps->getDefaultTargetOutputLayerIdc(), 2, "default_output_layer_idc" );
   }
-#else
-  WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" );
-#endif
-
-#if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS
-  if( numOutputLayerSets > 1 )
-  {
-#if P0295_DEFAULT_OUT_LAYER_IDC
-    WRITE_CODE( vps->getDefaultTargetOutputLayerIdc(), 2, "default_target_output_layer_idc" );   
-#else
-#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
-    WRITE_CODE( vps->getDefaultOneTargetOutputLayerIdc(), 2, "default_one_target_output_layer_idc" );   
-#else
-    WRITE_FLAG( vps->getDefaultOneTargetOutputLayerFlag(), "default_one_target_output_layer_flag" );   
-#endif
-#endif
-  }
-#endif
 
   for(i = 1; i < numOutputLayerSets; i++)