Changeset 1132 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: FIX_LAYER_ID_INIT, SPS_PTL_FIX

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3163 +3163 @@
   // For layer 0
   m_numLayerInIdList.push_back(1);
-#if FIX_LAYER_ID_INIT
   m_layerSetLayerIdList.resize(m_vpsNumLayerSetsMinus1 + 1);
-#else
-  m_layerSetLayerIdList.resize(m_numLayerSets);
-#endif
   m_layerSetLayerIdList[0].push_back(0);
   
   // For other layers
-#if FIX_LAYER_ID_INIT
   for (Int i = 1; i <= m_vpsNumLayerSetsMinus1; i++)
-#else
-  for( Int i = 1; i < m_numLayerSets; i++ )
-#endif
   {
     for( Int m = 0; m <= m_maxLayerId; m++)
@@ -3352 +3344 @@
 }
 
-#if FIX_LAYER_ID_INIT
-void TComVPS::deriveLayerIdListVariablesForAddLayerSets()
+Void TComVPS::deriveLayerIdListVariablesForAddLayerSets()
 {
   m_layerSetLayerIdList.resize(m_vpsNumLayerSetsMinus1 + 1 + m_numAddLayerSets);
@@ -3372 +3363 @@
   }
 }
-#else
-void TComVPS::setLayerIdIncludedFlagsForAddLayerSets()
-{
-  for (UInt i = 0; i < m_numAddLayerSets; i++)
-  {
-    for (UInt j = 1; j < m_numIndependentLayers; j++)
-    {
-      Int layerNum = 0;
-      Int lsIdx = m_vpsNumLayerSetsMinus1 + 1 + i;
-      for (Int layerId = 0; layerId < MAX_VPS_LAYER_IDX_PLUS1; layerId++)
-      {
-        m_layerIdIncludedFlag[lsIdx][layerId] = false;
-      }
-      for (Int treeIdx = 1; treeIdx < m_numIndependentLayers; treeIdx++)
-      {
-        for (Int layerCnt = 0; layerCnt < m_highestLayerIdxPlus1[i][j]; layerCnt++)
-        {
-          m_layerSetLayerIdList[lsIdx][layerNum] = m_treePartitionLayerIdList[treeIdx][layerCnt];
-          m_layerIdIncludedFlag[lsIdx][m_treePartitionLayerIdList[treeIdx][layerCnt]] = true;
-          layerNum++;
-        }
-      }
-      m_numLayerInIdList[lsIdx] = layerNum;
-    }
-  }
-}
-#endif
-
 #endif
 

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -957 +957 @@
 #endif
 #if Q0078_ADD_LAYER_SETS
-#if FIX_LAYER_ID_INIT
   void    deriveLayerIdListVariablesForAddLayerSets();
-#else
-  void    setLayerIdIncludedFlagsForAddLayerSets();
-#endif
   UInt    getVpsNumLayerSetsMinus1()                                             { return m_vpsNumLayerSetsMinus1; }
   Void    setVpsNumLayerSetsMinus1(UInt x)                                       { m_vpsNumLayerSetsMinus1 = x; }

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -149 +149 @@
 #define P0182_VPS_VUI_PS_FLAG            1      ///< JCTVC-P0182, add base_layer_parameter_set_compatibility_flag
 
-#define SPS_PTL_FIX                      1      ///< remove profile_tier_level from enhancement layer SPS
-
 #define DERIVE_LAYER_ID_LIST_VARIABLES   1      ///< Derived variables based on the variables in VPS - for use in syntax table parsing
-#define FIX_LAYER_ID_INIT                1
 
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC

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

@@ -2846 +2846 @@
     }
     vps->setNumLayerSets(vps->getNumLayerSets() + vps->getNumAddLayerSets());
-#if FIX_LAYER_ID_INIT
     vps->deriveLayerIdListVariablesForAddLayerSets();
-#else
-    vps->setLayerIdIncludedFlagsForAddLayerSets();
-#endif
   }
   else

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

@@ -848 +848 @@
     }
   }
-#if !FIX_LAYER_ID_INIT  // It was still called because NECESSARY_FLAG does not exist and is by default "false"
-#if !NECESSARY_FLAG   // Already called once in TAppEncTop.cpp
-#if DERIVE_LAYER_ID_LIST_VARIABLES
-  pcVPS->deriveLayerIdListVariables();
-#endif
-#endif
-#endif
+
   TimingInfo *timingInfo = pcVPS->getTimingInfo();
   WRITE_FLAG(timingInfo->getTimingInfoPresentFlag(),          "vps_timing_info_present_flag");