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


Ignore:
Timestamp:
9 Jul 2015, 00:20:09 (10 years ago)
Author:
seregin
Message:

macro cleanup: REF_IDX_MFM

Location:
branches/SHM-dev/source/Lib/TLibCommon
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r1203 r1226  
    34163416  Int iPelY = Clip3<Int>(0, m_pcPic->getPicYuvRec()->getHeight(COMPONENT_Y) - 1, pelY);
    34173417
    3418 #if REF_IDX_MFM
    34193418  // centre of the collocated 16x16 block for motion mapping
    34203419  if( motionMapping )
    … …  
    34233422    iPelY = pelY + 8;
    34243423  }
    3425 #endif
    34263424
    34273425#if !LAYER_CTB
    … …  
    34363434  Int iBY = (((iPelY - topStartL )*g_posScalingFactor[refLayerIdc][1] + (1<<15)) >> 16) + windowRL.getWindowTopOffset();
    34373435
    3438 #if REF_IDX_MFM
    34393436  // offset for collocated block in the motion mapping
    34403437  if( motionMapping )
    … …  
    34533450    }
    34543451  }
    3455 #endif
    34563452
    34573453  if ( iBX < 0 || iBX >= baseColPic->getPicYuvRec()->getWidth(COMPONENT_Y) || iBY < 0 || iBY >= baseColPic->getPicYuvRec()->getHeight(COMPONENT_Y) )

  • branches/SHM-dev/source/Lib/TLibCommon/TComMotionInfo.h

    r1029 r1226  
    155155  Void compress(Char* pePredMode, Int scale);
    156156
    157 #if REF_IDX_MFM
     157#if SVC_EXTENSION
    158158  Void setMvField( TComMvField const& mvField, Int iIdx )
    159159  {

  • branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp

    r1208 r1226  
    277277}
    278278
    279 #if REF_IDX_MFM
    280279Void TComPic::copyUpsampledMvField(UInt refLayerIdc, TComPic* pcPicBase)
    281280{
    … …  
    351350  return;
    352351}
    353 #endif
    354352
    355353Bool TComPic::checkSameRefInfo()

  • branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

    r1212 r1226  
    9292  Bool                  m_bSpatialEnhLayer[MAX_LAYERS];       // whether current layer is a spatial enhancement layer,
    9393  TComPicYuv*           m_pcFullPelBaseRec[MAX_LAYERS];    // upsampled base layer recontruction for difference domain inter prediction
    94 #if REF_IDX_MFM
    9594  Bool                  m_equalPictureSizeAndOffsetFlag[MAX_LAYERS];
    96 #endif
    9795#if CGS_3D_ASYMLUT
    9896  Int                   m_nFrameBit;
    … …  
    203201  Void          setFullPelBaseRec   (UInt refLayerIdc, TComPicYuv* p) { m_pcFullPelBaseRec[refLayerIdc] = p; }
    204202  TComPicYuv*   getFullPelBaseRec   (UInt refLayerIdc)  { return  m_pcFullPelBaseRec[refLayerIdc];  }
    205 #if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
    206203  Bool          isILR( UInt currLayerId )   { return ( m_bIsLongTerm && m_layerId < currLayerId ); }
    207 #endif
    208 #if REF_IDX_MFM
    209204  Bool          equalPictureSizeAndOffsetFlag(UInt refLayerIdc)             { return m_equalPictureSizeAndOffsetFlag[refLayerIdc]; }
    210205  Void          setEqualPictureSizeAndOffsetFlag(UInt refLayerIdc, Bool b)  { m_equalPictureSizeAndOffsetFlag[refLayerIdc] = b;    }
    211206  Void          copyUpsampledMvField  ( UInt refLayerIdc, TComPic* pcPicBase );
    212207  Void          initUpsampledMvField  ();
    213 #endif
    214208  Bool          checkSameRefInfo();
    215209  Void          copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut);

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

    r1224 r1226  
    120120, m_firstSliceInPic               ( false )
    121121, m_availableForTMVPRefFlag       ( true )
    122 , m_layerId                     ( 0 )
    123 #if REF_IDX_MFM
     122, m_layerId                       ( 0 )
    124123, m_bMFMEnabledFlag               ( false )
    125 #endif
    126124, m_bDiscardableFlag              ( false )
    127125, m_bCrossLayerBLAFlag            ( false )
    … …  
    37293727      pcIlpPic[refLayerIdc]->getSlice(0)->setVPS( m_pcPic->getSlice(0)->getVPS() );
    37303728
    3731 #if REF_IDX_MFM
    37323729      if( m_bMFMEnabledFlag && !(m_eNalUnitType >= NAL_UNIT_CODED_SLICE_BLA_W_LP && m_eNalUnitType <= NAL_UNIT_CODED_SLICE_CRA) )
    37333730      {
    … …  
    37763773        pcIlpPic[refLayerIdc]->initUpsampledMvField();
    37773774      }
    3778 #endif
    37793775
    37803776      Int maxTidIlRefPicsPlus1 = m_pcVPS->getMaxTidIlRefPicsPlus1( pcIlpPic[refLayerIdc]->getSlice(0)->getLayerIdx(), getLayerIdx() );

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

    r1224 r1226  
    19711971  TComPicYuv* m_pcFullPelBaseRec[MAX_LAYERS];
    19721972  Int         m_numMotionPredRefLayers;
    1973 #if REF_IDX_MFM
    19741973  Bool        m_bMFMEnabledFlag;
    19751974  Int         m_colRefLayerIdx;
    19761975  Bool        m_altColIndicationFlag;
    19771976  TComPic*    m_pcIlpPic;
    1978 #endif
    19791977
    19801978  Bool        m_interLayerPredEnabledFlag;
    … …  
    22712269  Void      setNumMotionPredRefLayers(int i)            { m_numMotionPredRefLayers = i; }
    22722270  Int       getNumMotionPredRefLayers()                 { return m_numMotionPredRefLayers; }
    2273 #if REF_IDX_MFM
     2271
    22742272  Void      setMFMEnabledFlag(Bool flag)                { m_bMFMEnabledFlag = flag; }
    22752273  Bool      getMFMEnabledFlag()                         { return m_bMFMEnabledFlag; }
    2276 #endif
    22772274
    22782275  TComPic* getRefPic(TComList<TComPic*>& rcListPic, Int poc) { return xGetRefPic( rcListPic, poc ); }

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

    r1225 r1226  
    6161#define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
    6262
    63 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture
    6463#define AUXILIARY_PICTURES               1      ///< JCTVC-O0041: auxiliary picture layers
    6564#define NO_CLRAS_OUTPUT_FLAG             1
Note: See TracChangeset for help on using the changeset viewer.