Changeset 1151 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

8 Jul 2015, 00:21:05 (9 years ago)

Author:

seregin

Message:

macro cleanup: NECESSARY_LAYER_FLAG

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (7 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (3 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (6 diffs)

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

@@ -1658 +1658 @@
   }
 #endif
-#if NECESSARY_LAYER_FLAG
+
   vps->deriveNecessaryLayerFlag();
   vps->checkNecessaryLayerFlagCondition();
-#endif
+
 #if !MULTIPLE_PTL_SUPPORT
 #if PER_LAYER_PTL

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

@@ -2028 +2028 @@
   ::memset(m_directDependencyType, 0, sizeof(m_directDependencyType));
 
-#if !NECESSARY_LAYER_FLAG
-#if DERIVE_LAYER_ID_LIST_VARIABLES
-  ::memset(m_layerSetLayerIdList,  0, sizeof(m_layerSetLayerIdList));
-  ::memset(m_numLayerInIdList,     0, sizeof(m_numLayerInIdList   )); 
-#endif
-#endif
 #if !PER_LAYER_PTL
   ::memset(m_profileLevelTierIdx,  0, sizeof(m_profileLevelTierIdx));
@@ -3151 +3145 @@
 
 #if DERIVE_LAYER_ID_LIST_VARIABLES
-#if NECESSARY_LAYER_FLAG
 Void TComVPS::deriveLayerIdListVariables()
 {
@@ -3172 +3165 @@
   }
 }
-#else
-Void TComVPS::deriveLayerIdListVariables()
-{
-  // For layer 0
-  m_numLayerInIdList[0] = 1;
-  m_layerSetLayerIdList[0][0] = 0;
-  
-  // For other layers
-  Int i, m, n;
-  for( i = 1; i < m_numLayerSets; i++ )
-  {
-    n = 0;
-    for( m = 0; m <= m_maxLayerId; m++)
-    {
-      if( m_layerIdIncludedFlag[i][m] )
-      {
-        m_layerSetLayerIdList[i][n++] = m;
-      }
-    }
-    m_numLayerInIdList[i] = n;
-  }
-}
-#endif
 #endif
 #if VPS_DPB_SIZE_TABLE
@@ -3528 +3498 @@
 }
 #endif
-#if NECESSARY_LAYER_FLAG
+
 Void TComVPS::deriveNecessaryLayerFlag()
 {
@@ -3539 +3509 @@
   }
 }
+
 Void TComVPS::deriveNecessaryLayerFlag(Int const olsIdx)
 {
@@ -3563 +3534 @@
   m_numNecessaryLayers.push_back(std::accumulate(m_necessaryLayerFlag[olsIdx].begin(), m_necessaryLayerFlag[olsIdx].end(), 0));
 }
+
 Void TComVPS::checkNecessaryLayerFlagCondition()
 {
@@ -3590 +3562 @@
   }
 }
-#endif
+
 #if PER_LAYER_PTL
 Int TComVPS::calculateLenOfSyntaxElement( Int const numVal )

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

@@ -598 +598 @@
 #if DERIVE_LAYER_ID_LIST_VARIABLES
 #if Q0078_ADD_LAYER_SETS
-#if NECESSARY_LAYER_FLAG
   std::vector< std::vector<Int> >     m_layerSetLayerIdList;
   std::vector<Int>                    m_numLayerInIdList;
-#else
-  Int         m_layerSetLayerIdList[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS][MAX_VPS_LAYER_IDX_PLUS1];
-  Int         m_numLayerInIdList[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS];
-#endif
 #else
   Int         m_layerSetLayerIdList[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
@@ -825 +820 @@
   Bool       m_vpsPocLsbAlignedFlag;
 #endif
-#if NECESSARY_LAYER_FLAG
   std::vector< std::vector<Bool> > m_necessaryLayerFlag;
-  std::vector<Int>               m_numNecessaryLayers;
-#endif
+  std::vector<Int>                 m_numNecessaryLayers;
 #endif //SVC_EXTENSION
 
@@ -1298 +1291 @@
 #endif
 #if O0164_MULTI_LAYER_HRD
-  Void setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess );
-#endif
-#if NECESSARY_LAYER_FLAG
-  Void  deriveNecessaryLayerFlag();
-  Void  deriveNecessaryLayerFlag(Int const olsIdx);
-  Void  checkNecessaryLayerFlagCondition();
-#endif
-  Void  calculateMaxSLInLayerSets();
+  Void   setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess );
+#endif
+  Void   deriveNecessaryLayerFlag();
+  Void   deriveNecessaryLayerFlag(Int const olsIdx);
+  Void   checkNecessaryLayerFlagCondition();
+  Void   calculateMaxSLInLayerSets();
 #endif //SVC_EXTENSION
 };

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

@@ -57 +57 @@
 #if PTL_SIGNALLING
 #define LIST_OF_PTL                      1      ///< JCTVC-R0272: Signalling the PTL for the 0-th OLS
-#define NECESSARY_LAYER_FLAG             1      ////< Derivation of NecessaryLayerFlag
 #define PER_LAYER_PTL                    1      ///< Signal profile-tier-level information for each layer.
 #endif

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

@@ -2946 +2946 @@
 #endif
   vps->setNumOutputLayerSets( numOutputLayerSets );
-#if NECESSARY_LAYER_FLAG
+
   // Default output layer set
   vps->setOutputLayerSetIdx(0, 0);
@@ -2955 +2955 @@
   vps->getProfileLevelTierIdx(0)->push_back( vps->getBaseLayerInternalFlag() && vps->getMaxLayers() > 1 ? 1 : 0);
 #endif
-#endif
+
   for(i = 1; i < numOutputLayerSets; i++)
   {
@@ -3011 +3011 @@
       }
     }
-#if NECESSARY_LAYER_FLAG
+
     vps->deriveNecessaryLayerFlag(i);  
-#endif
+
 #if PER_LAYER_PTL
     vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
@@ -3078 +3078 @@
 #endif
   }
-#if NECESSARY_LAYER_FLAG
+
   vps->checkNecessaryLayerFlagCondition();  
-#endif
+
 #else
   if( numOutputLayerSets > 1 )
@@ -3369 +3369 @@
   }
 
-#if NECESSARY_LAYER_FLAG
   // Default output layer set
   // The value of NumLayersInIdList[ 0 ] is set equal to 1 and the value of LayerSetLayerIdList[ 0 ][ 0 ] is set equal to 0.
@@ -3378 +3377 @@
 
   vps->deriveNecessaryLayerFlag(0);
-#endif
 
   // The value of sub_layer_dpb_info_present_flag[ i ][ 0 ] for any possible value of i is inferred to be equal to 1