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


Ignore:
Timestamp:
1 Sep 2013, 22:47:26 (11 years ago)
Author:
tech
Message:

Merged DEV-2.0-dev0@604.

File:
1 edited

Legend:

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

    r443 r608  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2012, ITU/ISO/IEC
     6 * Copyright (c) 2010-2013, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    5858} AMVPInfo;
    5959
    60 // ====================================================================================================================
    61 #if H3D_NBDV
    62 typedef struct _DisCand
     60#if H_3D_NBDV
     61typedef struct _DisCand
    6362{
    64   TComMv m_acMvCand[ DIS_CANS ];            ///< array of motion vector predictor candidates
    65   Int    m_aVIdxCan[ DIS_CANS ];            ///< array of motion vector predictor candidates
    66 #if QC_CU_NBDV_D0181
    6763  Bool bDV;
    68 #if MERL_VSP_C0152
    69   TComMv m_acMvCandNoRef[ DIS_CANS ];
    70 #endif
    71 #endif
    72   Int    iN;                                ///< number of motion vector predictor candidates
    73 #if MERL_VSP_NBDV_RefVId_Fix_D0166
    74   Int    m_aListIdx[ DIS_CANS ];            ///< array of reference list of derived NBDV
    75   Int    m_aRefIdx [ DIS_CANS ];            ///< array of reference frame index corresponding to either RefList0/1
    76 #endif
     64  TComMv m_acNBDV;              // DV from NBDV
     65#if H_3D_NBDV_REF
     66  TComMv m_acDoNBDV;            // DV from DoNBDV
     67#endif 
     68  Int    m_aVIdxCan;            // View order index (the same with the NBDV and the DoNBDV)
    7769} DisInfo;
    7870
    79 typedef struct _McpDisCand
     71typedef struct _IDVCand // IDV
    8072{
    81   TComMv m_acMvCand[2][ MCP_DIS_CANS ];            ///< array of motion vector predictor candidates
    82   Int    m_aVIdxCan[2][ MCP_DIS_CANS ];            ///< array of motion vector predictor candidates
    83   Bool   m_bAvailab[2][ MCP_DIS_CANS ];
    84   Bool   m_bFound;                                 ///< number of motion vector predictor candidates
    85 } McpDisInfo;
    86 
    87 #endif
     73  TComMv m_acMvCand[2][ IDV_CANDS ];           
     74  Int    m_aVIdxCan[2][ IDV_CANDS ];           
     75  Bool   m_bAvailab[2][ IDV_CANDS ];
     76  Bool   m_bFound;                               
     77} IDVInfo;
     78#endif
     79#if MTK_VSP_FIX_ALIGN_WD_E0172
     80typedef struct _InheritedVSPDisCand
     81{
     82  DisInfo m_acDvInfo;
     83} InheritedVSPDisInfo;
     84#endif
     85// ====================================================================================================================
    8886// Class definition
    8987// ====================================================================================================================
     
    113111  Int getHor   () const { return  m_acMv.getHor(); }
    114112  Int getVer   () const { return  m_acMv.getVer(); }
    115 #if H3D_IVMP
     113#if H_3D_IV_MERGE
    116114  Bool operator== ( const TComMvField& rcMv ) const
    117115  {
     
    186184  }
    187185 
    188 #if HHI_MPI
    189   Void compress(Char* pePredMode, UChar* puhInterDir, Int scale);
    190 #else
    191186  Void compress(Char* pePredMode, Int scale);
    192 #endif
    193 #if HHI_FULL_PEL_DEPTH_MAP_MV_ACC
    194   Void decreaseMvAccuracy( Int iPartAddr, Int iNumPart, Int iShift );
    195 #endif
    196 
    197 #if MTK_UNCONSTRAINED_MVI_B0083
    198   Void setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir );
    199 #endif
    200187};
    201188
Note: See TracChangeset for help on using the changeset viewer.