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

Timestamp:

8 Jul 2015, 00:10:36 (11 years ago)

Author:

seregin

Message:

macro cleanup: VPS_EXTN_DIRECT_REF_LAYERS

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (4 diffs)
• TDecGop.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (7 diffs)
• TDecTop.h (modified) (3 diffs)

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

@@ -2764 +2764 @@
 #endif
 #endif // view id related signaling
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   // For layer 0
   vps->setNumDirectRefLayers(0, 0);
@@ -2783 +2783 @@
     vps->setNumDirectRefLayers(layerId, numDirectRefLayers);
   }
-#endif
+
 #if Q0078_ADD_LAYER_SETS
 #if O0092_0094_DEPENDENCY_CONSTRAINT // Moved here
@@ -3244 +3244 @@
 #endif
 
-#if VPS_EXTN_DIRECT_REF_LAYERS
   READ_UVLC( uiCode,           "direct_dep_type_len_minus2"); vps->setDirectDepTypeLen(uiCode+2);
 
@@ -3274 +3273 @@
     }
   }
-#endif
+
 #if !Q0078_ADD_LAYER_SETS
 #if O0092_0094_DEPENDENCY_CONSTRAINT // Moved up

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

@@ -210 +210 @@
     {
 #if SVC_EXTENSION
-#if VPS_EXTN_DIRECT_REF_LAYERS
       if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR( m_layerId ) )
       {
@@ -224 +223 @@
         printf ("%d", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex));
       }
-#endif
+
       if( pcSlice->getEnableTMVPFlag() && iRefList == 1 - pcSlice->getColFromL0Flag() && iRefIndex == pcSlice->getColRefIdx() )
       {

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

@@ -748 +748 @@
 
 #if SVC_EXTENSION
-#if VPS_EXTN_DIRECT_REF_LAYERS
   setRefLayerParams(m_apcSlicePilot->getVPS());
-#endif
   m_apcSlicePilot->setNumMotionPredRefLayers(m_numMotionPredRefLayers);
 #endif
@@ -1723 +1721 @@
         else
         {
-#if VPS_EXTN_DIRECT_REF_LAYERS
           TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( refLayerIdc );
-#else
-          TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
-#endif
           TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
           if( !pcSlice->setBaseColPic ( *cListPic, refLayerIdc ) )
@@ -1735 +1729 @@
         }
 #else
-#if VPS_EXTN_DIRECT_REF_LAYERS
         TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( refLayerIdc );
-#else
-        TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
-#endif
         TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
         pcSlice->setBaseColPic ( *cListPic, refLayerIdc );
@@ -1821 +1811 @@
         else
         {
-#if VPS_EXTN_DIRECT_REF_LAYERS
           TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( refLayerIdc );
-#else
-          TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
-#endif
           TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
           pcSlice->setBaseColPic ( *cListPic, refLayerIdc );
         }
 #else
-#if VPS_EXTN_DIRECT_REF_LAYERS
         TDecTop *pcTDecTop = (TDecTop *)getRefLayerDec( refLayerIdc );
-#else
-        TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
-#endif
         TComList<TComPic*> *cListPic = pcTDecTop->getListPic();
         pcSlice->setBaseColPic ( *cListPic, refLayerIdc );
@@ -2440 +2422 @@
 }
 
-#if VPS_EXTN_DIRECT_REF_LAYERS
 TDecTop* TDecTop::getRefLayerDec( UInt refLayerIdx )
 {
@@ -2451 +2432 @@
   return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, refLayerIdx ) );
 }
-#endif
-
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
 Void TDecTop::setRefLayerParams( TComVPS* vps )
 {
@@ -2479 +2458 @@
   }
 }
-#endif
 
 #if OUTPUT_LAYER_SET_INDEX

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

@@ -143 +143 @@
 #endif
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   Int                     m_numDirectRefLayers;
   Int                     m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1];
   Int                     m_numSamplePredRefLayers;
   Int                     m_numMotionPredRefLayers;
-#endif
+
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
 #if OUTPUT_LAYER_SET_INDEX
@@ -243 +243 @@
   TDecTop*  getLayerDec                     (UInt layerId)                  { return m_ppcTDecTop[layerId];    }
   Void      xDeriveSmallestLayerId(TComVPS* vps);
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   TDecTop*  getRefLayerDec                  (UInt refLayerIdx);
   Int       getNumDirectRefLayers           ()                              { return m_numDirectRefLayers;      }
@@ -258 +258 @@
 
   Void      setRefLayerParams( TComVPS* vps );
-#endif
+
 #if AVC_BASE
   Void      setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; }