Changeset 1177 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

8 Jul 2015, 02:41:56 (10 years ago)

Author:

seregin

Message:

macro cleanup: OUTPUT_LAYER_SET_INDEX

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (7 diffs)
• TDecTop.h (modified) (3 diffs)

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

@@ -699 +699 @@
 #if SVC_EXTENSION
   m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) );
-#if OUTPUT_LAYER_SET_INDEX
+
   // Following check should go wherever the VPS is activated
-  if (!m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag())
+  if( !m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag() )
   {
     assert(nalu.m_layerId != 0);
     assert(m_apcSlicePilot->getVPS()->getNumAddLayerSets() > 0);
-    if (getCommonDecoderParams()->getTargetOutputLayerSetIdx() >= 0)
+
+    if( m_commonDecoderParams->getTargetOutputLayerSetIdx() >= 0 )
     {
       UInt layerIdx = m_apcSlicePilot->getVPS()->getOutputLayerSetIdx(getCommonDecoderParams()->getTargetOutputLayerSetIdx());
@@ -711 +712 @@
     }
   }  
-#endif
+
   m_apcSlicePilot->initSlice( nalu.m_layerId );
 #else //SVC_EXTENSION
@@ -2454 +2455 @@
 }
 
-#if OUTPUT_LAYER_SET_INDEX
 Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps)
 {
@@ -2477 +2477 @@
     // Currently, the target layer ID in the encoder assumes that all the layers are decoded    
     // Check if any of the output layer sets match this description
-    for(Int i = 0; i < vps->getNumOutputLayerSets(); i++)
+    for( Int i = 0; i < vps->getNumOutputLayerSets(); i++ )
     {
       Bool layerSetMatchFlag = false;
       Int layerSetIdx = vps->getOutputLayerSetIdx( i );
 
-      for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
+      for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ )
       {
         if( vps->getLayerSetLayerIdList( layerSetIdx, j ) == params->getTargetLayerId() )
@@ -2498 +2498 @@
           if( params->getTargetDecLayerIdSet()->size() )  
           {
-            for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
+            for( Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++ )
             {
               if( *(params->getTargetDecLayerIdSet()->begin() + j) != vps->getLayerIdInNuh(vps->getLayerSetLayerIdList( layerSetIdx, j )))
@@ -2552 +2552 @@
 
   // Check if the current layer is an output layer
-  for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
+  for( Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++ )
   {
     if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
@@ -2560 +2560 @@
   }
 }
-#endif
 
 #if POC_RESET_IDC_DECODER

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -150 +150 @@
 
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
-#if OUTPUT_LAYER_SET_INDEX
   CommonDecoderParams*    m_commonDecoderParams;
-#endif
 #if NO_CLRAS_OUTPUT_FLAG  
   Bool                    m_noClrasOutputFlag;
@@ -260 +258 @@
 
 #if AVC_BASE
-  Void      setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; }
-  fstream*  getBLReconFile() { return m_pBLReconFile; }
+  Void      setBLReconFile( fstream* pFile )                                { m_pBLReconFile = pFile; }
+  fstream*  getBLReconFile()                                                { return m_pBLReconFile;  }
 #if !REPN_FORMAT_IN_VPS
   Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
@@ -273 +271 @@
   Void      xInitILRP(TComSPS *pcSPS);
 #endif
-#if OUTPUT_LAYER_SET_INDEX
-  CommonDecoderParams*    getCommonDecoderParams() { return m_commonDecoderParams; }
-  Void                    setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; }
+  CommonDecoderParams*    getCommonDecoderParams()                          { return m_commonDecoderParams; }
+  Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }
   Void      checkValueOfTargetOutputLayerSetIdx(TComVPS *vps);
-#endif
 #if SCALINGLIST_INFERRING
-  ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; }
+  ParameterSetManagerDecoder* getParameterSetManager()                      { return &m_parameterSetManagerDecoder; }
 #endif
 #if CONFORMANCE_BITSTREAM_MODE