Changeset 617 in 3DVCSoftware

Timestamp:

6 Sep 2013, 12:56:00 (11 years ago)

Author:

tech

Message:

Merged missing parts.

Location:

branches/HTM-8.0-dev0/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TComMv.h (modified) (1 diff)

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5657 +5657 @@
           pDInfo->m_acNBDV = cDispVec;
           pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
-#if !MTK_DVMCP_FIX_E0172
-          assert(pDInfo->m_aVIdxCan == 0); //Notes from QC: only works for CTC
-#endif
 #if H_3D_NBDV_REF
           TComPic* picDepth = getSlice()->getIvPic( true, pDInfo->m_aVIdxCan );
@@ -5829 +5826 @@
           paIDVInfo->m_acMvCand[iList][ uiMvpDvPos ] = TComMv( cMvPred.getIDVHor(), cMvPred.getIDVVer() );
           //Notes from QC: DvMCP is implemented in a way that doesnE½t carry the reference view identifier as NBDV. It only works for CTC and needs to be fixed to be aligned with other part of the NBDV design.
-#if MTK_DVMCP_FIX_E0172
           paIDVInfo->m_aVIdxCan[iList][ uiMvpDvPos ] = cMvPred.getIDVVId();
-#else  
-          paIDVInfo->m_aVIdxCan[iList][ uiMvpDvPos ] = 0; 
-#endif
           paIDVInfo->m_bAvailab[iList][ uiMvpDvPos ] = true;
           paIDVInfo->m_bFound                        = true; 

branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComMv.h

@@ -107 +107 @@
   Void   setIDVVer  (Short i)                    {m_iIDVVer = i;}
   Void   setIDVFlag (Bool b )                    {m_bIDV    = b;}
-#if MTK_DVMCP_FIX_E0172
   Void   setIDVVId  (Short i)                    {m_iIDVVId = i;}
-#endif
 #endif
   // ------------------------------------------------------------------------------------------------------------------