Changeset 1176 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

8 Jul 2015, 02:33:56 (11 years ago)

Author:

seregin

Message:

macro cleanup: VPS_VUI_WPP_NOT_IN_USEFLAG, VPS_VUI_TILES_NOT_IN_USEFLAG

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -2023 +2023 @@
     }
   }
-#if VPS_VUI_TILES_NOT_IN_USE__FLAG
+
   m_tilesNotInUseFlag = true;
+  m_wppNotInUseFlag = true;
   ::memset(m_tilesInUseFlag,  0, sizeof(m_tilesInUseFlag));
   ::memset(m_loopFilterNotAcrossTilesFlag,  0, sizeof(m_loopFilterNotAcrossTilesFlag));
-#endif
   ::memset(m_tileBoundariesAlignedFlag,  0, sizeof(m_tileBoundariesAlignedFlag));
-#if VPS_VUI_WPP_NOT_IN_USE__FLAG
-  m_wppNotInUseFlag = true;
   ::memset(m_wppInUseFlag,  0, sizeof(m_wppInUseFlag));
-#endif
 
   m_ilpRestrictedRefLayersFlag = false;
@@ -3151 +3148 @@
 }
 #endif
-#if VPS_VUI_TILES_NOT_IN_USE__FLAG
+
 Void TComVPS::setTilesNotInUseFlag(Bool x)
 {
   m_tilesNotInUseFlag = x;
-  if (m_tilesNotInUseFlag)
-  {
-    for (int i = 0; i < getMaxLayers(); i++)
+
+  if( m_tilesNotInUseFlag )
+  {
+    for( Int i = 0; i < getMaxLayers(); i++ )
     {
       m_tilesInUseFlag[i] = m_loopFilterNotAcrossTilesFlag[i] = m_tilesNotInUseFlag;
     }
-  }
-
-  if (m_tilesNotInUseFlag)
-  {
-    for (int i = 1; i < getMaxLayers(); i++)
-    {
-      for(int j = 0; j < getNumDirectRefLayers(getLayerIdInNuh(i)); j++)
+  
+    for( Int i = 1; i < getMaxLayers(); i++ )
+    {
+      for( Int j = 0; j < getNumDirectRefLayers(getLayerIdInNuh(i)); j++)
       {
         setTileBoundariesAlignedFlag(i, j, m_tilesNotInUseFlag);
@@ -3174 +3169 @@
   }
 }
-#endif
-
-#if VPS_VUI_WPP_NOT_IN_USE__FLAG
+
 Void TComVPS::setWppNotInUseFlag(Bool x)
 {
   m_wppNotInUseFlag = x;
-  if (m_wppNotInUseFlag)
-  {
-    for (int i = 0; i < getMaxLayers(); i++)
+
+  if( m_wppNotInUseFlag )
+  {
+    for( Int i = 0; i < getMaxLayers(); i++ )
     {
       m_wppInUseFlag[i] = m_wppNotInUseFlag;
@@ -3188 +3182 @@
   }
 }
-#endif
 
 Void TComVPS::setRefLayersFlags(Int currLayerId)

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

@@ -658 +658 @@
   Bool       m_singleLayerForNonIrapFlag;
   Bool       m_higherLayerIrapSkipFlag;
-#if VPS_VUI_TILES_NOT_IN_USE__FLAG
   Bool       m_tilesNotInUseFlag;
   Bool       m_tilesInUseFlag[MAX_VPS_LAYER_IDX_PLUS1];
   Bool       m_loopFilterNotAcrossTilesFlag[MAX_VPS_LAYER_IDX_PLUS1];
-#endif 
   Bool       m_tileBoundariesAlignedFlag[MAX_VPS_LAYER_IDX_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
-#if VPS_VUI_WPP_NOT_IN_USE__FLAG
   Bool       m_wppNotInUseFlag;
   Bool       m_wppInUseFlag[MAX_VPS_LAYER_IDX_PLUS1];
-#endif
 
   Bool       m_ilpRestrictedRefLayersFlag;
@@ -1018 +1014 @@
   Bool   getHigherLayerIrapSkipFlag()                                           { return m_higherLayerIrapSkipFlag;              }
   Void   setHigherLayerIrapSkipFlag(Bool x)                                     { m_higherLayerIrapSkipFlag = x;                 }
-#if VPS_VUI_TILES_NOT_IN_USE__FLAG  
-  Bool   getTilesNotInUseFlag()         { return m_tilesNotInUseFlag; }
+
+  Bool   getTilesNotInUseFlag()                                                  { return m_tilesNotInUseFlag; }
   Void   setTilesNotInUseFlag(Bool x); 
-  Bool   getTilesInUseFlag(Int currLayerId)    { return m_tilesInUseFlag[currLayerId]; }
-  Void   setTilesInUseFlag(Int currLayerId, Bool x)    { m_tilesInUseFlag[currLayerId] = x; } 
-  Bool   getLoopFilterNotAcrossTilesFlag(Int currLayerId)    { return m_loopFilterNotAcrossTilesFlag[currLayerId]; }
-  Void   setLoopFilterNotAcrossTilesFlag(Int currLayerId, Bool x)    { m_loopFilterNotAcrossTilesFlag[currLayerId] = x; } 
-#endif 
+  Bool   getTilesInUseFlag(Int currLayerId)                                      { return m_tilesInUseFlag[currLayerId]; }
+  Void   setTilesInUseFlag(Int currLayerId, Bool x)                              { m_tilesInUseFlag[currLayerId] = x; } 
+  Bool   getLoopFilterNotAcrossTilesFlag(Int currLayerId)                        { return m_loopFilterNotAcrossTilesFlag[currLayerId]; }
+  Void   setLoopFilterNotAcrossTilesFlag(Int currLayerId, Bool x)                { m_loopFilterNotAcrossTilesFlag[currLayerId] = x; } 
   Bool   getTileBoundariesAlignedFlag(Int currLayerId, Int refLayerId)           { return m_tileBoundariesAlignedFlag[currLayerId][refLayerId]; }
   Void   setTileBoundariesAlignedFlag(Int currLayerId, Int refLayerId, Bool x)   { m_tileBoundariesAlignedFlag[currLayerId][refLayerId] = x; } 
-#if VPS_VUI_WPP_NOT_IN_USE__FLAG  
-  Bool   getWppNotInUseFlag()         { return m_wppNotInUseFlag; }
+  Bool   getWppNotInUseFlag()                                                    { return m_wppNotInUseFlag; }
   Void   setWppNotInUseFlag(Bool x); 
-  Bool   getWppInUseFlag(Int currLayerId)    { return m_wppInUseFlag[currLayerId]; }
-  Void   setWppInUseFlag(Int currLayerId, Bool x)    { m_wppInUseFlag[currLayerId] = x; } 
-#endif 
+  Bool   getWppInUseFlag(Int currLayerId)                                        { return m_wppInUseFlag[currLayerId]; }
+  Void   setWppInUseFlag(Int currLayerId, Bool x)                                { m_wppInUseFlag[currLayerId] = x; } 
 
   Bool   getIlpRestrictedRefLayersFlag  ( )                                            { return m_ilpRestrictedRefLayersFlag;}

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

@@ -107 +107 @@
 #define P0297_VPS_POC_LSB_ALIGNED_FLAG   1      ///< JCTVC-P0297: vps_poc_lsb_aligned_flag for cross-layer POC anchor picture derivation
 
-#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
-
 #define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC