Changeset 1173 in SHVCSoftware

Timestamp:

8 Jul 2015, 01:52:42 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0092_0094_DEPENDENCY_CONSTRAINT

Location:

branches/SHM-dev/source

Files:

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

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

@@ -1475 +1475 @@
   }
 
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+  // dependency constraint
   vps->setNumRefLayers();
 
-  if (vps->getMaxLayers() > MAX_REF_LAYERS)
-  {
-    for (UInt layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
+  if( vps->getMaxLayers() > MAX_REF_LAYERS )
+  {
+    for( UInt layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++ )
     {
       assert(vps->getNumRefLayers(vps->getLayerIdInNuh(layerCtr)) <= MAX_REF_LAYERS);
     }
   }
-#endif
+
   // The Layer ID List variables should be derived here.
   vps->deriveLayerIdListVariables();

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

@@ -2064 +2064 @@
   ::memset(m_viewIdVal, 0, sizeof(m_viewIdVal));
 #endif
-#if O0092_0094_DEPENDENCY_CONSTRAINT
-  for (Int i = 0; i < MAX_NUM_LAYER_IDS; i++)
+
+  for( Int i = 0; i < MAX_NUM_LAYER_IDS; i++ )
   {
     m_numberRefLayers[i] = 0;
-    for (Int j = 0; j < MAX_NUM_LAYER_IDS; j++)
+    for( Int j = 0; j < MAX_NUM_LAYER_IDS; j++ )
     {
       m_recursiveRefLayerFlag[i][j] = 0;
     }
   }
-#endif
+
 #if VPS_DPB_SIZE_TABLE
   ::memset( m_subLayerFlagInfoPresentFlag,  0, sizeof(m_subLayerFlagInfoPresentFlag ) );
@@ -3189 +3189 @@
 }
 #endif
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+
 Void TComVPS::setRefLayersFlags(Int currLayerId)
 {
@@ -3217 +3217 @@
   }
 }
-#endif
 
 Void TComVPS::setPredictedLayerIds()

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

@@ -709 +709 @@
 #endif
 
-#if O0092_0094_DEPENDENCY_CONSTRAINT
   Int        m_numberRefLayers[MAX_NUM_LAYER_IDS];  // number of direct and indirect reference layers of a coding layer
   Bool       m_recursiveRefLayerFlag[MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS];  // flag to indicate if j-th layer is a direct or indirect reference layer of i-th layer
-#endif
+
   Int        m_numAddLayerSets;
   UInt       m_highestLayerIdxPlus1[MAX_NUM_ADD_LAYER_SETS][MAX_NUM_LAYER_IDS];
@@ -872 +871 @@
 #endif
 
-#if O0092_0094_DEPENDENCY_CONSTRAINT
   Void    setRefLayersFlags(Int currLayerId);
   Bool    getRecursiveRefLayerFlag(Int currLayerId, Int refLayerId)              { return m_recursiveRefLayerFlag[currLayerId][refLayerId];}
@@ -878 +876 @@
   Int     getNumRefLayers(Int currLayerId)                                       { return m_numberRefLayers[currLayerId];                  }
   Void    setNumRefLayers();
-#endif
 
   void    deriveLayerIdListVariablesForAddLayerSets();

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

@@ -125 +125 @@
 #define O0062_POC_LSB_NOT_PRESENT_FLAG   1      ///< JCTVC-O0062: signal poc_lsb_not_present_flag for each layer in VPS extension
 
-#define O0092_0094_DEPENDENCY_CONSTRAINT 1      ///< JCTVC-O0092: constraint on the layer_id of SPS/PPS
-#if O0092_0094_DEPENDENCY_CONSTRAINT
-#define MAX_REF_LAYERS                   7
-#endif
-
 #define MULTIPLE_PTL_SUPPORT             1      ///< Profile, tier and level signalling
 
@@ -203 +198 @@
 #define MAX_SEIS_IN_BSP_NESTING          64
 #define MAX_VPS_NUM_SCALABILITY_TYPES    16
+#define MAX_REF_LAYERS                   7
 
 #endif // SVC_EXTENSION

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

@@ -2777 +2777 @@
   }
 
-#if O0092_0094_DEPENDENCY_CONSTRAINT // Moved here
+  // dependency constraint
   vps->setNumRefLayers();
 
@@ -2787 +2787 @@
     }
   }
-#endif
+
   vps->setPredictedLayerIds();
   vps->setTreePartitionLayerIdList();

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

@@ -2406 +2406 @@
         pcSlice->getSPS()->getVuiParameters()->setHrdParametersPresentFlag( true );
       }
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+
+#if SVC_EXTENSION
+      // dependency constraint
       assert( pcSlice->getSPS()->getLayerId() == 0 || pcSlice->getSPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getSPS()->getLayerId()) );
 #endif
+
       m_pcEntropyCoder->encodeSPS(pcSlice->getSPS());
       writeRBSPTrailingBits(nalu.m_Bitstream);
@@ -2427 +2430 @@
 
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-#if O0092_0094_DEPENDENCY_CONSTRAINT
+
+#if SVC_EXTENSION
+      // dependency constraint
       assert( pcSlice->getPPS()->getLayerId() == 0 || pcSlice->getPPS()->getLayerId() == m_layerId || m_pcEncTop->getVPS()->getRecursiveRefLayerFlag(m_layerId, pcSlice->getPPS()->getLayerId()) );
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if SVC_EXTENSION && Q0048_CGS_3D_ASYMLUT
       m_pcEntropyCoder->encodePPS(pcSlice->getPPS(), &m_Enc3DAsymLUTPPS);
 #else