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

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/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -2120 +2120 @@
 #if VPS_EXTN_PROFILE_INFO
   // Profile-tier-level signalling
-#if !VPS_EXTN_UEV_CODING
-  WRITE_CODE( vps->getNumLayerSets() - 1   , 10, "vps_number_layer_sets_minus1" );     
-  WRITE_CODE( vps->getNumProfileTierLevel() - 1,  6, "vps_num_profile_tier_level_minus1"); 
-#else
   WRITE_UVLC( vps->getNumProfileTierLevel() - 1, "vps_num_profile_tier_level_minus1"); 
+
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
-#endif
+
 #if LIST_OF_PTL
 #if MULTIPLE_PTL_SUPPORT
@@ -2150 +2147 @@
 #endif
 
-#if !VPS_EXTN_UEV_CODING
-  Int numOutputLayerSets = vps->getNumOutputLayerSets() ;
-  WRITE_FLAG(  (numOutputLayerSets > vps->getNumLayerSets()), "more_output_layer_sets_than_default_flag" ); 
-  if(numOutputLayerSets > vps->getNumLayerSets())
-  {
-    WRITE_CODE( numOutputLayerSets - vps->getNumLayerSets(), 10, "num_add_output_layer_sets" );
-  }
-#else
   Int numOutputLayerSets = vps->getNumOutputLayerSets();
   Int numAddOutputLayerSets = numOutputLayerSets - (Int)vps->getNumLayerSets();
@@ -2172 +2161 @@
 #else
   WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" );
-#endif
 #endif