Changeset 1161 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

8 Jul 2015, 00:54:26 (10 years ago)

Author:

seregin

Message:

macro cleanup: DERIVE_LAYER_ID_LIST_VARIABLES, VPS_EXTN_MASK_AND_DIM_INFO

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (4 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1345 +1345 @@
   }
 #endif
-#if VPS_EXTN_MASK_AND_DIM_INFO
+
 #if AVC_BASE
   vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag );
@@ -1355 +1355 @@
   vps->setAvcBaseLayerFlag(false);
 #endif
+
   vps->setSplittingFlag(false);
+
   for(i = 0; i < MAX_VPS_NUM_SCALABILITY_TYPES; i++)
   {
@@ -1403 +1405 @@
     }
   }
-#endif
 #endif
 
@@ -1536 +1537 @@
 #endif
   // The Layer ID List variables should be derived here.
-#if DERIVE_LAYER_ID_LIST_VARIABLES
   vps->deriveLayerIdListVariables();
-#endif
 #if Q0078_ADD_LAYER_SETS
   vps->setPredictedLayerIds();