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

Timestamp:

7 Jul 2015, 22:58:48 (10 years ago)

Author:

seregin

Message:

macro cleanup: FIX_LAYER_ID_INIT, SPS_PTL_FIX

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

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

@@ -2502 +2502 @@
 #if OUTPUT_LAYER_SETS_CONFIG
     // Simplifying the code in the #else section
-#if FIX_LAYER_ID_INIT
     assert( scanStringToArray( cfg_highestLayerIdx[addLayerSet], m_numHighestLayerIdx[addLayerSet], "HighestLayerIdx", m_highestLayerIdx[addLayerSet] ) );
-#else
-    assert( scanStringToArray( cfg_layerSetLayerIdList[addLayerSet], m_numLayerInIdList[addLayerSet], "NumLayerInIdList",  m_highestLayerIdx[addLayerSet] ) );
-#endif
 #else
     if (m_numHighestLayerIdx[addLayerSet] > 0)

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

@@ -1542 +1542 @@
   }
 #endif
-#if FIX_LAYER_ID_INIT
   // The Layer ID List variables should be derived here.
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   vps->deriveLayerIdListVariables();
 #endif
-#endif
 #if Q0078_ADD_LAYER_SETS
   vps->setPredictedLayerIds();
   vps->setTreePartitionLayerIdList();
-#if FIX_LAYER_ID_INIT
   vps->deriveLayerIdListVariablesForAddLayerSets();
-#else
-  vps->setLayerIdIncludedFlagsForAddLayerSets();
-#endif
 #endif
 #endif
@@ -1614 +1608 @@
 #endif
 #endif
- #if VPS_DPB_SIZE_TABLE
-#if !FIX_LAYER_ID_INIT  // must be derived earlier to not delete additional layer sets
-  // The Layer ID List variables can be derived here.  
-#if DERIVE_LAYER_ID_LIST_VARIABLES
-  vps->deriveLayerIdListVariables();
-#endif
-#endif
+#if VPS_DPB_SIZE_TABLE
   vps->deriveNumberOfSubDpbs();
   vps->setOutputLayerFlag( 0, 0, 1 );