Changeset 1155 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

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

Author:

seregin

Message:

macro cleanup: Q0165_NUM_ADD_OUTPUT_LAYER_SETS

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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++)