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

Timestamp:

8 Jul 2015, 00:31:44 (10 years ago)

Author:

seregin

Message:

macro cleanup: VPS_EXTN_UEV_CODING

File:

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

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

@@ -2868 +2868 @@
 #if VPS_EXTN_PROFILE_INFO
   // Profile-tier-level signalling
-#if !VPS_EXTN_UEV_CODING
-  READ_CODE( 10, uiCode, "vps_number_layer_sets_minus1" );     assert( uiCode == (vps->getNumLayerSets() - 1) );
-  READ_CODE(  6, uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
-#else
   READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
-#endif
+
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
 #if !MULTIPLE_PTL_SUPPORT
@@ -2902 +2898 @@
 #endif
 
-#if !VPS_EXTN_UEV_CODING
-  READ_FLAG( uiCode, "more_output_layer_sets_than_default_flag" ); vps->setMoreOutputLayerSetsThanDefaultFlag( uiCode ? true : false );
-  Int numOutputLayerSets = 0;
-  if(! vps->getMoreOutputLayerSetsThanDefaultFlag() )
-  {
-    numOutputLayerSets = vps->getNumLayerSets();
-  }
-  else
-  {
-    READ_CODE( 10, uiCode, "num_add_output_layer_sets" );          vps->setNumAddOutputLayerSets( uiCode );
-    numOutputLayerSets = vps->getNumLayerSets() + vps->getNumAddOutputLayerSets();
-  }
-#else
-
 #if Q0165_NUM_ADD_OUTPUT_LAYER_SETS
   if( vps->getNumLayerSets() > 1 )
@@ -2934 +2916 @@
 
   Int numOutputLayerSets = vps->getNumLayerSets() + vps->getNumAddOutputLayerSets();
-#endif
 
 #if P0295_DEFAULT_OUT_LAYER_IDC