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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: VPS_EXTN_DIRECT_REF_LAYERS

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (4 diffs)
• TEncCfg.h (modified) (4 diffs)
• TEncGOP.cpp (modified) (3 diffs)
• TEncTop.cpp (modified) (4 diffs)
• TEncTop.h (modified) (1 diff)

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

@@ -2067 +2067 @@
 #endif // VIEW_ID_RELATED_SIGNALING
 
-#if VPS_EXTN_DIRECT_REF_LAYERS
   for( Int layerCtr = 1; layerCtr < vps->getMaxLayers(); layerCtr++)
   {
@@ -2075 +2074 @@
     }
   }
-#endif
+
 #if Q0078_ADD_LAYER_SETS
   if (vps->getNumIndependentLayers() > 1)
@@ -2311 +2310 @@
   codeVpsDpbSizeTable(vps);
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   WRITE_UVLC( vps->getDirectDepTypeLen()-2,                           "direct_dep_type_len_minus2");
 
@@ -2333 +2332 @@
     }
   }
-#endif
 
 #if P0307_VPS_NON_VUI_EXTENSION

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -378 +378 @@
   Bool      m_crossLayerBLAFlag;
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   Int       m_numDirectRefLayers;
   Int       m_refLayerId[MAX_VPS_LAYER_IDX_PLUS1];
@@ -390 +390 @@
   Bool      m_samplePredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
   Bool      m_motionPredEnabledFlag[MAX_VPS_LAYER_IDX_PLUS1];
-#endif
+
   Int       m_maxTidIlRefPicsPlus1;
 #if FAST_INTRA_SHVC
@@ -1032 +1032 @@
   Void      setUseFastIntraScalable         ( Bool  b )      { m_useFastIntraScalable = b; }
 #endif
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   Int       getNumDirectRefLayers           ()                              { return m_numDirectRefLayers;      }
   Void      setNumDirectRefLayers           (Int num)                       { m_numDirectRefLayers = num;       }
@@ -1062 +1062 @@
   Bool      getMotionPredEnabledFlag        (Int layerIdx)                  { return m_motionPredEnabledFlag[layerIdx];  }
   Void      setMotionPredEnabledFlag        (Int layerIdx,Bool flag)        { m_motionPredEnabledFlag[layerIdx] = flag;  }
-#endif
+
   Int       getMaxTidIlRefPicsPlus1         ()                              { return m_maxTidIlRefPicsPlus1; }
   Void      setMaxTidIlRefPicsPlus1         (Int num)                       { m_maxTidIlRefPicsPlus1 = num;  }

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

@@ -1369 +1369 @@
         UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
         UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc);
-#if VPS_EXTN_DIRECT_REF_LAYERS
         TComList<TComPic*> *cListPic = m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)]->getRefLayerEnc(refLayerIdc)->getListPic();
-#else
-        TComList<TComPic*> *cListPic = m_ppcTEncTop[pcSlice->getVPS()->getLayerIdxInVps(m_layerId)-1]->getListPic();
-#endif
+
         pcSlice->setBaseColPic( *cListPic, refLayerIdc );
 
@@ -3874 +3871 @@
     {
 #if SVC_EXTENSION
-#if VPS_EXTN_DIRECT_REF_LAYERS
       if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR(m_layerId) )
       {
@@ -3896 +3892 @@
 #endif
       }
-#endif
+
       if( pcSlice->getEnableTMVPFlag() && iRefList == 1 - pcSlice->getColFromL0Flag() && iRefIndex == pcSlice->getColRefIdx() )
       {

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

@@ -624 +624 @@
           Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
 
-#if VPS_EXTN_DIRECT_REF_LAYERS
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
-#else
-          TEncTop *pcEncTopBase = (TEncTop *)getLayerEnc( m_layerId-1 );
-#endif
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
           UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
@@ -690 +686 @@
           Bool zeroPhase = getPPS()->hasZeroResamplingPhase(m_cVPS.getRefLayerId(m_layerId, i));
 
-#if VPS_EXTN_DIRECT_REF_LAYERS
           TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( i );
-#else
-          TEncTop *pcEncTopBase = (TEncTop *)getLayerEnc( m_layerId-1 );
-#endif
 #if O0194_DIFFERENT_BITDEPTH_EL_BL
           UInt refLayerId = m_cVPS.getRefLayerId(m_layerId, i);
@@ -1432 +1424 @@
 
 #if SVC_EXTENSION
-#if VPS_EXTN_DIRECT_REF_LAYERS
 TEncTop* TEncTop::getRefLayerEnc( UInt refLayerIdx )
 {
@@ -1442 +1433 @@
   return (TEncTop *)getLayerEnc( m_cVPS.getLayerIdxInVps(m_cVPS.getRefLayerId( m_layerId, refLayerIdx )) );
 }
-#endif
 
 #if !REPN_FORMAT_IN_VPS

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -253 +253 @@
   Void      encode    ( TComPicYuv* pcPicYuvOrg, const InputColourSpaceConversion snrCSC, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int iPicIdInGOP, Bool isTff );
   Void      encodePrep( TComPicYuv* pcPicYuvOrg, TComPicYuv* pcPicYuvTrueOrg, Bool isTff );
-#if VPS_EXTN_DIRECT_REF_LAYERS
+
   TEncTop*  getRefLayerEnc(UInt refLayerIdx);
-#endif
+
 #if POC_RESET_IDC_ENCODER
   Int       getPocAdjustmentValue()      { return m_pocAdjustmentValue;}