Changeset 412 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source/App/TAppDecoder
- Timestamp:
- 16 May 2013, 16:05:31 (11 years ago)
- Location:
- branches/HTM-6.2-dev2-MERL/source/App/TAppDecoder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-6.2-dev2-MERL/source/App/TAppDecoder/TAppDecTop.cpp
r296 r412 735 735 736 736 #if MERL_VSP_C0152 737 Void TAppDecTop::setBWVSPLUT(TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc) 737 Void TAppDecTop::setBWVSPLUT( 738 #if MERL_VSP_NBDV_RefVId_Fix_D0166 739 Int iNeighborViewId, 740 #endif 741 TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc) 742 738 743 { 739 744 //first view does not have VSP … … 742 747 AOT( iCodedViewIdx <= 0); 743 748 //AOT( iCodedViewIdx >= m_iNumberOfViews ); 749 #if !MERL_VSP_NBDV_RefVId_Fix_D0166 744 750 Int iNeighborViewId = 0; 751 #endif 745 752 // Int* piShiftLUT = bRenderFromLeft ? m_cCamParsCollector.getBaseViewShiftLUTI()[iCodedViewIdx][iNeighborViewId][0] : m_cCamParsCollector.getBaseViewShiftLUTI()[iNeighborViewId][iCodedViewIdx][0]; 746 753 Int* piShiftLUT = m_cCamParsCollector.getBaseViewShiftLUTI()[iNeighborViewId][iCodedViewIdx][0]; 754 #if MERL_VSP_NBDV_RefVId_Fix_D0166 755 pcSlice->setBWVSPLUTParam(piShiftLUT, 2-LOG2_DISP_PREC_LUT, iNeighborViewId ); 756 #else 747 757 pcSlice->setBWVSPLUTParam(piShiftLUT, 2-LOG2_DISP_PREC_LUT ); 758 #endif 748 759 } 749 760 #endif -
branches/HTM-6.2-dev2-MERL/source/App/TAppDecoder/TAppDecTop.h
r296 r412 113 113 114 114 #if MERL_VSP_C0152 115 #if MERL_VSP_NBDV_RefVId_Fix_D0166 116 Void setBWVSPLUT( Int iNeighborViewId, TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc ); 117 #else 115 118 Void setBWVSPLUT( TComSlice* pcSlice, Int iCodedViewIdx, Int iCurPoc ); 119 #endif 116 120 #endif 117 121
Note: See TracChangeset for help on using the changeset viewer.