Changeset 189 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.h


Ignore:
Timestamp:
18 Nov 2012, 22:11:37 (12 years ago)
Author:
tech
Message:

Reintegrated branch 4.1-dev0 Rev. 188.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComMotionInfo.h

    r100 r189  
    5959
    6060// ====================================================================================================================
    61 #if QC_MULTI_DIS_CAN
     61#if QC_MULTI_DIS_CAN_A0097
    6262typedef struct _DisCand
    6363{
     
    9494  Int getHor   () const { return  m_acMv.getHor(); }
    9595  Int getVer   () const { return  m_acMv.getVer(); }
     96#if QC_MRG_CANS_B0048
     97  Bool operator== ( const TComMvField& rcMv ) const
     98  {
     99    return (m_acMv.getHor()==rcMv.getHor() && m_acMv.getVer()==rcMv.getVer() && m_iRefIdx == rcMv.getRefIdx());
     100  }
     101#endif
    96102};
    97103
     
    169175  Void decreaseMvAccuracy( Int iPartAddr, Int iNumPart, Int iShift );
    170176#endif
     177
     178#if MTK_UNCONSTRAINED_MVI_B0083
     179  Void setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir );
     180#endif
    171181};
    172182
Note: See TracChangeset for help on using the changeset viewer.