Changeset 1282 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.cpp
- Timestamp:
- 18 Jul 2015, 09:07:20 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComDataCU.cpp
r1279 r1282 3565 3565 continue; 3566 3566 } 3567 #if NH_3D_FIX_PRUNING 3568 if ( ivCandDir[0] == m_mergCands[MRG_A1+i].m_uDir && 3569 ( ( ivCandDir[0] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] ) && 3570 ( ( ivCandDir[0] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1] ) 3571 ) 3572 #else 3567 3573 if (ivCandDir[0] == m_mergCands[MRG_A1+i].m_uDir && tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1]) 3574 #endif 3568 3575 { 3569 3576 m_mergCands[MRG_A1+i].m_bAvailable = false; … … 3574 3581 if (bIsDepth) 3575 3582 { 3583 #if NH_3D_FIX_PRUNING 3584 if ( m_mergCands[MRG_T].m_bAvailable && ivCandDir[0] == m_mergCands[MRG_T].m_uDir && 3585 ( ( ivCandDir[0] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_T].m_cMvField[0] ) && 3586 ( ( ivCandDir[0] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_T].m_cMvField[1] ) 3587 ) 3588 #else 3576 3589 if (m_mergCands[MRG_T].m_bAvailable && ivCandDir[0] == m_mergCands[MRG_T].m_uDir && tmpMV[0]==m_mergCands[MRG_T].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_T].m_cMvField[1]) 3590 #endif 3577 3591 { 3578 3592 bRemoveSpa = true; … … 3670 3684 continue; 3671 3685 } 3686 #if NH_3D_FIX_PRUNING 3687 if ( ivCandDir[1] == m_mergCands[MRG_A1+i].m_uDir && 3688 ( ( ivCandDir[1] & 1 ) == 0 || tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] ) && 3689 ( ( ivCandDir[1] & 2 ) == 0 || tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1] ) 3690 ) 3691 #else 3672 3692 if (ivCandDir[1] == m_mergCands[MRG_A1+i].m_uDir && tmpMV[0]==m_mergCands[MRG_A1+i].m_cMvField[0] && tmpMV[1]==m_mergCands[MRG_A1+i].m_cMvField[1]) 3693 #endif 3673 3694 { 3674 3695 bRemoveSpa = true;
Note: See TracChangeset for help on using the changeset viewer.