Changeset 263 in 3DVCSoftware for branches/HTM-5.1-dev2-Sony/source/Lib/TLibCommon
- Timestamp:
- 7 Feb 2013, 06:16:08 (12 years ago)
- Location:
- branches/HTM-5.1-dev2-Sony/source/Lib/TLibCommon
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-5.1-dev2-Sony/source/Lib/TLibCommon/TComDataCU.cpp
r262 r263 6693 6693 Int iNeibPOC = iCurrPOC; 6694 6694 Int iNeibRefPOC; 6695 6695 #if INTER_VIEW_VECTOR_SCALING_C0116 6696 Int iCurrViewId = m_pcSlice->getViewOrderIdx(); // will be changed to view_id 6697 Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, iRefIdx)->getViewOrderIdx(); // will be changed to view_id 6698 Int iNeibViewId = iCurrViewId; 6699 Int iNeibRefViewId; 6700 #endif 6696 6701 #if QC_IV_AS_LT_B0046 6697 6702 Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm(); … … 6701 6706 { 6702 6707 iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ); 6708 #if INTER_VIEW_VECTOR_SCALING_C0116 6709 iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id 6710 #endif 6703 6711 #if QC_IV_AS_LT_B0046 6704 6712 bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getIsLongTerm() ; 6713 #if INTER_VIEW_VECTOR_SCALING_C0116 6714 if ( (bIsCurrRefLongTerm == bIsNeibRefLongTerm) && ((iNeibRefPOC == iCurrRefPOC) && (iNeibRefViewId == iCurrRefViewId))) 6715 #else 6705 6716 if ( (bIsCurrRefLongTerm == bIsNeibRefLongTerm) && (iNeibRefPOC == iCurrRefPOC) ) 6717 #endif 6706 6718 #else 6707 6719 if( pcTmpCU->getSlice()->getRefViewId( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ) != m_pcSlice->getRefViewId( eRefPicList, iRefIdx ) ) … … 6724 6736 { 6725 6737 iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) ); 6738 #if INTER_VIEW_VECTOR_SCALING_C0116 6739 iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id 6740 #endif 6726 6741 TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx); 6727 6742 TComMv rcMv; … … 6736 6751 } 6737 6752 #endif 6753 #if INTER_VIEW_VECTOR_SCALING_C0116 6754 Int iScale = 4096; 6755 if((iCurrRefPOC != iNeibRefPOC) ) // inter & inter 6756 iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC ); 6757 else if(m_pcSlice->getIVScalingFlag()) // inter-view & inter-view 6758 iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iNeibViewId, iNeibRefViewId ); 6759 #else 6738 6760 Int iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC ); 6761 #endif 6739 6762 if ( iScale == 4096 ) 6740 6763 { … … 6758 6781 { 6759 6782 iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) ); 6783 #if INTER_VIEW_VECTOR_SCALING_C0116 6784 iNeibRefViewId = pcTmpCU->getSlice()->getRefPic(eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getViewOrderIdx(); // will be changed to view_id 6785 #endif 6760 6786 TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList2nd)->getMv(uiIdx); 6761 6787 TComMv rcMv; … … 6770 6796 } 6771 6797 #endif 6798 #if INTER_VIEW_VECTOR_SCALING_C0116 6799 Int iScale = 4096; 6800 if((iCurrRefPOC != iNeibRefPOC)) // inter & inter 6801 iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC ); 6802 else if(m_pcSlice->getIVScalingFlag()) // inter-view & inter-view 6803 iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iNeibViewId, iNeibRefViewId ); 6804 #else 6772 6805 Int iScale = xGetDistScaleFactor( iCurrPOC, iCurrRefPOC, iNeibPOC, iNeibRefPOC ); 6806 #endif 6773 6807 if ( iScale == 4096 ) 6774 6808 { -
branches/HTM-5.1-dev2-Sony/source/Lib/TLibCommon/TypeDef.h
r262 r263 149 149 #define LG_ZEROINTRADEPTHRESI_A0087 1 // JCT2-A0087 150 150 #define INTER_VIEW_VECTOR_SCALING_C0115 1 // JCT2-C0115 Inter-view vector scaling for TMVP & flag 151 #define INTER_VIEW_VECTOR_SCALING_C0116 1 // JCT2-C0116 Inter-view vector scaling for AMVP 151 152 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC 1 // full-pel mv accuracy for depth maps 152 153 #define VIDYO_VPS_INTEGRATION 1
Note: See TracChangeset for help on using the changeset viewer.