Changeset 1171 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:32:32 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_EXTN_OP_LAYER_SETS

Location:

branches/SHM-dev/source

Files:

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

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

@@ -1252 +1252 @@
   }
 
-#if VPS_EXTN_OP_LAYER_SETS
-  vps->setMaxLayerId( m_acLayerCfg[m_numLayers - 1].m_layerId );    // Set max-layer ID
-
+  // Set max-layer ID
+  vps->setMaxLayerId( m_acLayerCfg[m_numLayers - 1].m_layerId );
   vps->setVpsExtensionFlag( m_numLayers > 1 ? true : false );
 
@@ -1524 +1523 @@
     }
   }
-#endif
+
   // Target output layer
 #if VPS_DPB_SIZE_TABLE

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

@@ -1956 +1956 @@
 , m_maxLayerId                (0)
 , m_numLayerSets              (0)
-#if VPS_EXTN_OP_LAYER_SETS
 , m_numOutputLayerSets        (0)  
-#endif
 , m_numProfileTierLevel       (0)
 , m_numAddOutputLayerSets     (0)
@@ -1997 +1995 @@
   m_numScalabilityTypes = 0;
   ::memset(m_layerIdxInVps, 0, sizeof(m_layerIdxInVps));
-
   ::memset(m_profilePresentFlag, 0, sizeof(m_profilePresentFlag));
-#if VPS_EXTN_OP_LAYER_SETS
+
   ::memset(m_layerIdIncludedFlag, 0, sizeof(m_layerIdIncludedFlag));
   // Consider dynamic allocation for outputLayerSetIdx and outputLayerFlag
   ::memset(m_outputLayerSetIdx, 0, sizeof(m_outputLayerSetIdx));
   ::memset(m_outputLayerFlag, 0, sizeof(m_outputLayerFlag));
-#endif
 
   ::memset(m_directDependencyFlag, 0, sizeof(m_directDependencyFlag));

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

@@ -639 +639 @@
   std::vector<TComPTL>    m_pcPTLForExtn;  
 #endif
-#if VPS_EXTN_OP_LAYER_SETS
-  // .. More declarations here
+
   // Target output layer signalling related
   UInt       m_numOutputLayerSets;
@@ -649 +648 @@
   UInt       m_outputLayerSetIdx[MAX_VPS_LAYER_SETS_PLUS1];
   Bool       m_outputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
-#endif
 #endif
 
@@ -972 +970 @@
   TComPTL* getPTLForExtn(Int id)                                { return &m_pcPTLForExtn[id];      }
 #endif
-#if VPS_EXTN_OP_LAYER_SETS
   // Target output layer signalling related
   UInt   getNumOutputLayerSets()                                { return m_numOutputLayerSets;     } 
@@ -982 +979 @@
   Bool   getOutputLayerFlag(Int layerSet, Int layerIdx)          { return m_outputLayerFlag[layerSet][layerIdx]; }
   Void   setOutputLayerFlag(Int layerSet, Int layerIdx, Bool x)  { m_outputLayerFlag[layerSet][layerIdx] = x;    }
-#endif
 
   // Direct dependency of layers

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

@@ -109 +109 @@
 #define P0297_VPS_POC_LSB_ALIGNED_FLAG   1      ///< JCTVC-P0297: vps_poc_lsb_aligned_flag for cross-layer POC anchor picture derivation
 
-#define VPS_EXTN_OP_LAYER_SETS           1      ///< Include output layer sets in VPS extension
-
 #define VPS_VUI_TILES_NOT_IN_USE__FLAG   1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use
 #define VPS_VUI_WPP_NOT_IN_USE__FLAG     1      ///< JCTVC-O0226: VPS VUI flag to indicate tile not in use

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

@@ -815 +815 @@
   assert( pcVPS->getNumHrdParameters() <= MAX_VPS_LAYER_SETS_PLUS1 );
   assert( pcVPS->getMaxLayerId() < MAX_VPS_LAYER_IDX_PLUS1 );
-#if !VPS_EXTN_OP_LAYER_SETS     // num layer sets set in TAppEncTop.cpp
-  pcVPS->setNumLayerSets(1);
-#endif
+
   WRITE_CODE( pcVPS->getMaxLayerId(), 6,                       "vps_max_layer_id" );
 #if Q0078_ADD_LAYER_SETS
@@ -829 +827 @@
     // Operation point set
     for( UInt i = 0; i <= pcVPS->getMaxLayerId(); i ++ )
+    {
 #else
   assert( pcVPS->getNumHrdParameters() <= MAX_VPS_NUM_HRD_PARAMETERS );
@@ -839 +838 @@
     // Operation point set
     for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ )
-#endif
-    {
-#if !VPS_EXTN_OP_LAYER_SETS     // layer Id include flag set in TAppEncTop.cpp
+    {
       // Only applicable for version 1
       pcVPS->setLayerIdIncludedFlag( true, opsIdx, i );