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

Timestamp:

9 Jul 2015, 00:20:09 (10 years ago)

Author:

seregin

Message:

macro cleanup: REF_IDX_MFM

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (3 diffs)
• TEncTop.h (modified) (2 diffs)

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

@@ -1782 +1782 @@
     {
       pcSlice->setILRPic( m_pcEncTop->getIlpList() );
-#if !REF_IDX_MFM
-      //  Set reference list
-      pcSlice->setRefPicList ( rcListPic );
-#endif
       pcSlice->setRefPicListModificationSvc();
       pcSlice->setRefPicList( rcListPic, false, m_pcEncTop->getIlpList());
 
-#if REF_IDX_MFM
       if( pcSlice->getMFMEnabledFlag() )
       {
@@ -1838 +1833 @@
         }
       }
-#endif
     }
 #else //SVC_EXTENSION

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

@@ -80 +80 @@
 
 #if SVC_EXTENSION
-  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
-#if REF_IDX_MFM
+  memset( m_cIlpPic, 0, sizeof(m_cIlpPic) );
   m_bMFMEnabledFlag = false;
-#endif
   m_numRefLayerLocationOffsets = 0;
   m_pocAdjustmentValue     = 0;
@@ -623 +621 @@
           Bool sameBitDepths = ( g_bitDepthLayer[CHANNEL_TYPE_LUMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] ) && ( g_bitDepthLayer[CHANNEL_TYPE_CHROMA][m_layerId] == g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] );
 
-#if REF_IDX_MFM
           if( m_iSourceWidth == pcEncTopBase->getSourceWidth() && m_iSourceHeight == pcEncTopBase->getSourceHeight() && equalOffsets && zeroPhase )
           {
@@ -630 +627 @@
 
           if( !pcEPic->equalPictureSizeAndOffsetFlag(i) || !sameBitDepths 
-#else
-          if( m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() || !sameBitDepths 
-            || !equalOffsets
-            || !zeroPhase
-#endif
 #if CGS_3D_ASYMLUT
             || m_cPPS.getCGSFlag() > 0

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

@@ -119 +119 @@
   TEncTop*                getLayerEnc(UInt layerIdx)       { return m_ppcTEncTop[layerIdx]; }
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture 
-#if REF_IDX_MFM
   Bool                    m_bMFMEnabledFlag;
-#endif
   UInt                    m_numRefLayerLocationOffsets;
   UInt                    m_refLocationOffsetLayerId[MAX_LAYERS];
@@ -233 +231 @@
 
   TComPic** getIlpList()                                      { return m_cIlpPic; }
-#if REF_IDX_MFM
   Void      setMFMEnabledFlag(Bool flag)                      { m_bMFMEnabledFlag = flag; }
   Bool      getMFMEnabledFlag()                               { return m_bMFMEnabledFlag; }    
-#endif
   Void      setInterLayerWeightedPredFlag(Bool flag)          { m_interLayerWeightedPredFlag = flag; }
   Bool      getInterLayerWeightedPredFlag()                   { return m_interLayerWeightedPredFlag; }