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

Timestamp:

9 Jul 2015, 00:12:33 (10 years ago)

Author:

seregin

Message:

macro cleanup: VPS_DPB_SIZE_TABLE

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (6 diffs)
• TComSlice.h (modified) (5 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -2012 +2012 @@
   }
 
-#if VPS_DPB_SIZE_TABLE
   ::memset( m_subLayerFlagInfoPresentFlag,  0, sizeof(m_subLayerFlagInfoPresentFlag ) );
   ::memset( m_subLayerDpbInfoPresentFlag,   0, sizeof(m_subLayerDpbInfoPresentFlag )  );
@@ -2019 +2018 @@
   ::memset( m_maxVpsLatencyIncreasePlus1,   0, sizeof(m_maxVpsLatencyIncreasePlus1 )  );
   ::memset( m_numSubDpbs                ,   0, sizeof(m_numSubDpbs)                   );
-#endif
   ::memset( m_baseLayerPSCompatibilityFlag, 0, sizeof(m_baseLayerPSCompatibilityFlag) );
 }
@@ -3068 +3066 @@
 }
 
-#if VPS_DPB_SIZE_TABLE
 Void TComVPS::deriveNumberOfSubDpbs()
 {
@@ -3080 +3077 @@
   }
 }
-#endif
 
 Void TComVPS::setTilesNotInUseFlag(Bool x)
@@ -3247 +3243 @@
 }
 
-#if VPS_DPB_SIZE_TABLE
 Int TComVPS::getLayerIdcForOls( Int olsIdx, Int layerId )
 {
@@ -3313 +3308 @@
   }
 }
-#endif
 
 #if O0164_MULTI_LAYER_HRD

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

@@ -702 +702 @@
 
   Int        m_TolsIdx;
-#if VPS_DPB_SIZE_TABLE
   Bool       m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1];
   Bool       m_subLayerDpbInfoPresentFlag  [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];
@@ -709 +708 @@
   Int        m_maxVpsLatencyIncreasePlus1  [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];
   Int        m_numSubDpbs                  [MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
-#endif
 
   Bool       m_vpsVuiPresentFlag;
@@ -818 +816 @@
 
   Void    deriveLayerIdListVariables();
-#if VPS_DPB_SIZE_TABLE
-Void      deriveNumberOfSubDpbs();
-#endif
+  Void    deriveNumberOfSubDpbs();
 
   Void    setRefLayersFlags(Int currLayerId);
@@ -1078 +1074 @@
   Int    scalTypeToScalIdx( ScalabilityType scalType );
 
-#if VPS_DPB_SIZE_TABLE
   Bool   getSubLayerFlagInfoPresentFlag(Int olsIdx)         { return m_subLayerFlagInfoPresentFlag[olsIdx]; }
   Void   setSubLayerFlagInfoPresentFlag(Int olsIdx, Bool x) { m_subLayerFlagInfoPresentFlag[olsIdx] = x;    }
@@ -1099 +1094 @@
   Void   setNumSubDpbs(Int olsIdx, Int x)                   { m_numSubDpbs[olsIdx] = x;    }
   Void   determineSubDpbInfoFlags();
-#endif
 
   Bool   getVpsVuiPresentFlag()                        { return m_vpsVuiPresentFlag; }

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

@@ -64 +64 @@
 #define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
 #define R0062_AUX_PSEUDO_MONOCHROME      1      ///> JCVVC-R0063: pseudo monochrome for auxiliary pictures
-#define VPS_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters
 #define NO_CLRAS_OUTPUT_FLAG             1
 #define P0138_USE_ALT_CPB_PARAMS_FLAG    1      ///< JCTVC-P0138: use_alt_cpb_params_flag syntax in buffering period SEI message extension