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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: Q0165_NUM_ADD_OUTPUT_LAYER_SETS

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

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