Changeset 422 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source


Ignore:
Timestamp:
20 May 2013, 01:51:15 (11 years ago)
Author:
mitsubishi-htm
Message:

-macro updates.

Location:
branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp

    r419 r422  
    38623862      cDisInfo.m_acMvCandNoRef[0] = getDvInfo(uiAbsPartIdx).m_acMvCandNoRef[0];
    38633863#endif
     3864#if MERL_General_Fix
    38643865#if MERL_VSP_C0152
    38653866#if MERL_VSP_NBDV_RefVId_Fix_D0166
    38663867      cDisInfo.m_aListIdx[0] = getDvInfo(uiAbsPartIdx).m_aListIdx[0];
    38673868      cDisInfo.m_aRefIdx[0]  = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];
     3869#endif
    38683870#endif
    38693871#endif
     
    53805382
    53815383          TComPic* picDepth = NULL;
     5384#if MERL_General_Fix
    53825385#if MERL_VSP_C0152
    53835386#if MERL_VSP_NBDV_RefVId_Fix_D0166
     
    53885391#else
    53895392          picDepth = getSlice()->getRefPicBaseDepth();
     5393#endif
    53905394#endif
    53915395#endif
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.cpp

    r420 r422  
    5050#endif
    5151
     52#if MERL_General_Fix
    5253#if MERL_VSP_C0152
    5354#if MERL_CVSP_D0165
    5455Int TComPrediction::m_iRangeLuma[12]   = {14, 34, 21, 15, 36, 26, 21, 49, 41, 36, 80, 72};
    5556Int TComPrediction::m_iRangeChroma[12] = { 2,  8,  5,  4, 11,  9,  8, 19, 17, 15, 34, 32};
     57#endif
    5658#endif
    5759#endif
     
    18641866#endif
    18651867 
     1868#if MERL_General_Fix
    18661869#if MERL_VSP_BLOCKSIZE_C0152 == 1
    18671870#if MERL_CVSP_D0165
     
    19341937#endif
    19351938#endif
     1939#endif
    19361940
    19371941#if MERL_VSP_BLOCKSIZE_C0152 != 1
     
    20622066  Int dstStrideBlock = dstStride * nTxtPerDepthY;
    20632067  Int depStrideBlock = depStride * nDepthPerTxtY;
     2068
     2069#if !MERL_Bi_VSP_D0166
     2070  if (isDepth)
     2071  {
     2072     // DT: Since the call for this function is redundant, ..
     2073     for (Int y = 0; y < sizeY; y++)
     2074     {
     2075       for (Int x = 0; x < sizeX; x++)
     2076       {
     2077         dstCb[x] = 128;
     2078         dstCr[x] = 128;
     2079       }
     2080       dstCb += dstStride;
     2081       dstCr += dstStride;
     2082     }
     2083     return;
     2084  }
     2085#endif
    20642086
    20652087  if ( widthChroma > widthDepth ) // We assume
     
    21502172
    21512173
     2174#if MERL_General_Fix
    21522175#if MERL_VSP_BLOCKSIZE_C0152 == 1
    21532176#if MERL_CVSP_D0165
     
    22162239#endif
    22172240#endif
     2241#endif
    22182242
    22192243    // (sizeX, sizeY) is Chroma block size
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h

    r420 r422  
    115115      );
    116116
     117#if !MERL_General_Fix
     118#if MERL_VSP_C0152
     119  Void xPredInterUniBWVSP         ( TComDataCU* pcCU,                          UInt uiPartAddr, UInt uiAbsPartIdx,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap, UInt uiSubSampExpX, UInt uiSubSampExpY, Bool bi=false );
     120  Void xPredInterBiBWVSP          ( TComDataCU* pcCU,                          UInt uiPartAddr, UInt uiAbsPartIdx,               Int iWidth, Int iHeight, UInt uiSubSampExpX, UInt uiSubSampExpY, TComYuv*& rpcYuvPred, Int iPartIdx, Bool bPrdDepthMap );
     121#endif
     122#endif
     123
    117124#if DEPTH_MAP_GENERATION
    118125  Void xWeightedAveragePdm      ( TComDataCU* pcCU, TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, Int iRefIdx0, Int iRefIdx1, UInt uiPartAddr, Int iWidth, Int iHeight, TComYuv*& rpcYuvDst, UInt uiSubSampExpX, UInt uiSubSampExpY );
     
    152159  Void xWeightedAverage         ( TComDataCU* pcCU, TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, Int iRefIdx0, Int iRefIdx1, UInt uiPartAddr, Int iWidth, Int iHeight, TComYuv*& rpcYuvDst );
    153160#endif
    154 #if MERL_VSP_C0152
    155   Void xPredInterVSPBlk(TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, TComMv cMv, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi
     161
     162#if MERL_VSP_C0152
    156163#if !MERL_Bi_VSP_D0166
    157                                      , Int vspIdx
    158 #endif
    159     );
    160 #if MERL_Bi_VSP_D0166
     164  Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, Int vspIdx
     165                                  , TComYuv *&dstPic );
     166  Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, Int vspIdx
     167                                  , TComYuv *&dstPic );
     168#else
    161169  TComPic*  xGetVspRefTxt(TComDataCU* pcCU, UInt uiPartAddr, RefPicList eRefPicList);
    162170  Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
     
    164172  Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth,
    165173    TComYuv *&dstPic, Bool bi);
    166 #else
    167   Void xPredInterLumaBlkFromDM    ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, Int vspIdx,
    168                                   TComYuv *&dstPic );
    169   Void xPredInterChromaBlkFromDM  ( TComPicYuv *refPic, TComPicYuv *pPicBaseDepth, Int* pShiftLUT, Int iShiftPrec, TComMv *mv, UInt partAddr,Int posX, Int posY, Int sizeX, Int sizeY, Bool isDepth, Int vspIdx,
    170                                   TComYuv *&dstPic );
    171 #endif
    172 #endif
     174#endif
     175#endif
     176
    173177  Void xGetLLSPrediction ( TComPattern* pcPattern, Int* pSrc0, Int iSrcStride, Pel* pDst0, Int iDstStride, UInt uiWidth, UInt uiHeight, UInt uiExt0 );
    174178#if LGE_ILLUCOMP_B0045
     
    178182  Void xDCPredFiltering( Int* pSrc, Int iSrcStride, Pel*& rpDst, Int iDstStride, Int iWidth, Int iHeight );
    179183  Bool xCheckIdenticalMotion    ( TComDataCU* pcCU, UInt PartAddr);
     184
     185#if MERL_General_Fix
     186#if MERL_VSP_C0152
     187  Void xPredInterVSPBlk(TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, TComMv cMv, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi
     188#if !MERL_Bi_VSP_D0166
     189                                     , Int vspIdx
     190#endif
     191    );
     192#endif
     193#endif
    180194
    181195#if HHI_DMM_WEDGE_INTRA
Note: See TracChangeset for help on using the changeset viewer.