Index: trunk/source/Lib/TLibRenderer/TRenImage.cpp =================================================================== --- trunk/source/Lib/TLibRenderer/TRenImage.cpp (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenImage.cpp (revision 189) @@ -106,5 +106,4 @@ } -#if HHI_VSO_SPEEDUP_A0033 template Void TRenImage::getDataAndStrides( T** pptData, Int* piStrides ) @@ -127,5 +126,4 @@ } } -#endif template Index: trunk/source/Lib/TLibRenderer/TRenImage.h =================================================================== --- trunk/source/Lib/TLibRenderer/TRenImage.h (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenImage.h (revision 189) @@ -69,8 +69,6 @@ TRenImagePlane** getPlanes() const; -#if HHI_VSO_SPEEDUP_A0033 Void getDataAndStrides( T** pptData, Int* piStrides ); Void getWidthAndHeight( Int* piWidths, Int* piHeights ); -#endif UInt getNumberOfPlanes() const; Index: trunk/source/Lib/TLibRenderer/TRenModel.cpp =================================================================== --- trunk/source/Lib/TLibRenderer/TRenModel.cpp (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenModel.cpp (revision 189) @@ -42,7 +42,5 @@ m_iWidth = -1; m_iHeight = -1; -#if FIX_VSO_SETUP m_iUsedHeight = -1; -#endif m_iNumOfBaseViews = -1; m_iSampledWidth = -1; @@ -437,25 +435,13 @@ { AOT( iViewNum < 0 || iViewNum > m_iNumOfBaseViews ); -#if FIX_VSO_SETUP AOF( pcPicYuvVideoData->getHeight() >= m_iUsedHeight + m_uiHorOff && pcPicYuvVideoData->getWidth() == m_iWidth ); AOF( pcPicYuvDepthData->getHeight() >= m_iUsedHeight + m_uiHorOff && pcPicYuvDepthData->getWidth() == m_iWidth ); -#else - AOF( pcPicYuvVideoData->getHeight() <= m_iHeight + m_uiHorOff || pcPicYuvVideoData->getWidth() == m_iWidth ); - AOF( pcPicYuvDepthData->getHeight() <= m_iHeight + m_uiHorOff || pcPicYuvDepthData->getWidth() == m_iWidth ); -#endif pcPicYuvVideoData->extendPicBorder(); -#if FIX_VSO_SETUP TRenFilter::sampleHorUp ( m_iShiftPrec, pcPicYuvVideoData->getLumaAddr() + m_uiHorOff * pcPicYuvVideoData->getStride () , pcPicYuvVideoData->getStride() , m_iWidth, m_iUsedHeight, m_aapiCurVideoPel[ iViewNum ][0], m_aaiCurVideoStrides[iViewNum][0] ); TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvVideoData->getCbAddr() + (m_uiHorOff >> 1 ) * pcPicYuvVideoData->getCStride() , pcPicYuvVideoData->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiCurVideoPel[ iViewNum ][1], m_aaiCurVideoStrides[iViewNum][1] ); TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvVideoData->getCrAddr() + (m_uiHorOff >> 1 ) * pcPicYuvVideoData->getCStride() , pcPicYuvVideoData->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiCurVideoPel[ iViewNum ][2], m_aaiCurVideoStrides[iViewNum][2] ); TRenFilter::copy ( pcPicYuvDepthData->getLumaAddr() + m_uiHorOff * pcPicYuvDepthData->getStride () , pcPicYuvDepthData->getStride(), m_iWidth, m_iUsedHeight, m_apiCurDepthPel [ iViewNum], m_aiCurDepthStrides [iViewNum] ); -#else - TRenFilter::sampleHorUp ( m_iShiftPrec, pcPicYuvVideoData->getLumaAddr() + m_uiHorOff * pcPicYuvVideoData->getStride () , pcPicYuvVideoData->getStride() , m_iWidth, m_iHeight, m_aapiCurVideoPel[ iViewNum ][0], m_aaiCurVideoStrides[iViewNum][0] ); - TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvVideoData->getCbAddr() + (m_uiHorOff >> 1 ) * pcPicYuvVideoData->getCStride() , pcPicYuvVideoData->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiCurVideoPel[ iViewNum ][1], m_aaiCurVideoStrides[iViewNum][1] ); - TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvVideoData->getCrAddr() + (m_uiHorOff >> 1 ) * pcPicYuvVideoData->getCStride() , pcPicYuvVideoData->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiCurVideoPel[ iViewNum ][2], m_aaiCurVideoStrides[iViewNum][2] ); - TRenFilter::copy ( pcPicYuvDepthData->getLumaAddr() + m_uiHorOff * pcPicYuvDepthData->getStride () , pcPicYuvDepthData->getStride(), m_iWidth, m_iHeight, m_apiCurDepthPel [ iViewNum], m_aiCurDepthStrides [iViewNum] ); -#endif // Used for rendering reference pic from original video data @@ -465,5 +451,4 @@ if ( m_abSetupVideoFromOrgForView[iViewNum] ) { -#if FIX_VSO_SETUP AOF( pcPicYuvOrgVideoData->getHeight() >= m_iUsedHeight + m_uiHorOff && pcPicYuvOrgVideoData->getWidth() == m_iWidth ); pcPicYuvOrgVideoData->extendPicBorder(); @@ -471,22 +456,10 @@ TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvOrgVideoData->getCbAddr() + (m_uiHorOff >> 1 ) * pcPicYuvOrgVideoData->getCStride(), pcPicYuvOrgVideoData->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiOrgVideoPel[ iViewNum ][1], m_aaiOrgVideoStrides[iViewNum][1] ); TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvOrgVideoData->getCrAddr() + (m_uiHorOff >> 1 ) * pcPicYuvOrgVideoData->getCStride(), pcPicYuvOrgVideoData->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiOrgVideoPel[ iViewNum ][2], m_aaiOrgVideoStrides[iViewNum][2] ); -#else - AOF( pcPicYuvOrgVideoData->getHeight() <= m_iHeight + m_uiHorOff || pcPicYuvOrgVideoData->getWidth() == m_iWidth ); - pcPicYuvOrgVideoData->extendPicBorder(); - TRenFilter::sampleHorUp ( m_iShiftPrec, pcPicYuvOrgVideoData->getLumaAddr() + m_uiHorOff * pcPicYuvOrgVideoData->getStride() , pcPicYuvOrgVideoData->getStride() , m_iWidth, m_iHeight, m_aapiOrgVideoPel[ iViewNum ][0], m_aaiOrgVideoStrides[iViewNum][0] ); - TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvOrgVideoData->getCbAddr() + (m_uiHorOff >> 1 ) * pcPicYuvOrgVideoData->getCStride(), pcPicYuvOrgVideoData->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiOrgVideoPel[ iViewNum ][1], m_aaiOrgVideoStrides[iViewNum][1] ); - TRenFilter::sampleCUpHorUp( m_iShiftPrec, pcPicYuvOrgVideoData->getCrAddr() + (m_uiHorOff >> 1 ) * pcPicYuvOrgVideoData->getCStride(), pcPicYuvOrgVideoData->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiOrgVideoPel[ iViewNum ][2], m_aaiOrgVideoStrides[iViewNum][2] ); -#endif } if ( m_abSetupDepthFromOrgForView[iViewNum] ) { -#if FIX_VSO_SETUP AOF( pcPicYuvOrgDepthData->getHeight() >= m_iUsedHeight + m_uiHorOff && pcPicYuvOrgDepthData->getWidth() == m_iWidth ); TRenFilter::copy ( pcPicYuvOrgDepthData->getLumaAddr() + m_uiHorOff * pcPicYuvOrgDepthData->getStride() , pcPicYuvOrgDepthData->getStride(), m_iWidth, m_iUsedHeight, m_apiOrgDepthPel [ iViewNum], m_aiOrgDepthStrides [iViewNum] ); -#else - AOF( pcPicYuvOrgDepthData->getHeight() <= m_iHeight + m_uiHorOff || pcPicYuvOrgDepthData->getWidth() == m_iWidth ); - TRenFilter::copy ( pcPicYuvOrgDepthData->getLumaAddr() + m_uiHorOff * pcPicYuvOrgDepthData->getStride() , pcPicYuvOrgDepthData->getStride(), m_iWidth, m_iHeight, m_apiOrgDepthPel [ iViewNum], m_aiOrgDepthStrides [iViewNum] ); -#endif } } @@ -497,7 +470,5 @@ AOT( iModelNum < 0 || iModelNum > m_iNumOfRenModels ); -#if FIX_VSO_SETUP m_apcRenModels[iModelNum]->setupPart( m_uiHorOff, m_iUsedHeight ); -#endif // Switch model to original data for setup if given to render reference @@ -520,9 +491,5 @@ } -#if FIX_VSO_SETUP m_apcRenModels[iModelNum]->setup ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, false ); -#else - m_apcRenModels[iModelNum]->setup ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, false, m_uiHorOff ); -#endif // Setup to Org @@ -545,9 +512,5 @@ // setup keeping reference rendered from original data -#if FIX_VSO_SETUP m_apcRenModels[iModelNum]->setup ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, true ); -#else - m_apcRenModels[iModelNum]->setup ( pcPicYuvRefView, ppiShiftLutLeft, ppiBaseShiftLutLeft, ppiShiftLutRight, ppiBaseShiftLutRight, iDistToLeft, true, m_uiHorOff); -#endif } } @@ -579,5 +542,4 @@ -#if FIX_VSO_SETUP Void TRenModel::setupPart ( UInt uiHorOff, Int iUsedHeight ) @@ -587,11 +549,4 @@ m_iUsedHeight = iUsedHeight; } -#else -Void -TRenModel::setHorOffset ( UInt uiHorOff ) -{ - m_uiHorOff = uiHorOff; -} -#endif #if LGE_VSO_EARLY_SKIP_A0093 @@ -606,9 +561,5 @@ AOT( iWidth + iStartPosX > m_iWidth ); -#if FIX_VSO_SETUP AOT( iHeight + iStartPosY > m_iUsedHeight ); -#else - AOT( iHeight + iStartPosY > m_iHeight ); -#endif AOT( iStartPosX < 0); @@ -644,9 +595,5 @@ iWidth = min(iWidth , m_iWidth - iStartPosX ); -#if FIX_VSO_SETUP iHeight = min(iHeight, m_iUsedHeight - iStartPosY ); -#else - iHeight = min(iHeight, m_iHeight - iStartPosY ); -#endif AOT( iStartPosX < 0); @@ -684,9 +631,5 @@ TRenModel::getSynthVideo( Int iModelNum, Int iViewNum, TComPicYuv* pcPicYuv ) { -#if FIX_VSO_SETUP m_apcRenModels[iModelNum]->getSynthVideo(iViewNum, pcPicYuv ); -#else - m_apcRenModels[iModelNum]->getSynthVideo(iViewNum, pcPicYuv, m_uiHorOff ); -#endif } @@ -694,9 +637,5 @@ TRenModel::getSynthDepth( Int iModelNum, Int iViewNum, TComPicYuv* pcPicYuv ) { -#if HHI_VSO_SPEEDUP_A0033 && !FIX_VSO_SETUP - m_apcRenModels[iModelNum]->getSynthDepth(iViewNum, pcPicYuv, m_uiHorOff ); -#else m_apcRenModels[iModelNum]->getSynthDepth(iViewNum, pcPicYuv ); -#endif } @@ -705,16 +644,8 @@ { TComPicYuv cPicYuvSynth; -#if FIX_VSO_SETUP cPicYuvSynth.create( m_iWidth, m_iUsedHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); -#else - cPicYuvSynth.create( m_iWidth, m_iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); -#endif TComPicYuv cPicYuvTempRef; -#if FIX_VSO_SETUP cPicYuvTempRef.create( m_iWidth, m_iUsedHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth); -#else - cPicYuvTempRef.create( m_iWidth, m_iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth); -#endif Int64 iSSEY = 0; @@ -724,5 +655,4 @@ for (Int iCurModel = 0; iCurModel < m_iNumOfCurRenModels; iCurModel++) { -#if FIX_VSO_SETUP m_apcCurRenModels[iCurModel]->getSynthVideo( m_aiCurPosInModels[iCurModel], &cPicYuvSynth ); m_apcCurRenModels[iCurModel]->getRefVideo ( m_aiCurPosInModels[iCurModel], &cPicYuvTempRef ); @@ -731,13 +661,4 @@ iSSEU += TRenFilter::SSE( cPicYuvSynth.getCbAddr() , cPicYuvSynth.getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, cPicYuvTempRef.getCbAddr() , cPicYuvTempRef.getCStride()); iSSEV += TRenFilter::SSE( cPicYuvSynth.getCrAddr() , cPicYuvSynth.getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, cPicYuvTempRef.getCrAddr() , cPicYuvTempRef.getCStride()); -#else - m_apcCurRenModels[iCurModel]->getSynthVideo( m_aiCurPosInModels[iCurModel], &cPicYuvSynth, 0 ); - TComPicYuv* pcPicYuvRef = &cPicYuvTempRef; - m_apcCurRenModels[iCurModel]->getRefVideo ( m_aiCurPosInModels[iCurModel], pcPicYuvRef , 0 ); - - iSSEY += TRenFilter::SSE( cPicYuvSynth.getLumaAddr(), cPicYuvSynth.getStride(), m_iWidth, m_iHeight , pcPicYuvRef->getLumaAddr(), pcPicYuvRef->getStride() ); - iSSEU += TRenFilter::SSE( cPicYuvSynth.getCbAddr() , cPicYuvSynth.getCStride(), m_iWidth >> 1, m_iHeight >> 1, pcPicYuvRef->getCbAddr() , pcPicYuvRef->getCStride()); - iSSEV += TRenFilter::SSE( cPicYuvSynth.getCrAddr() , cPicYuvSynth.getCStride(), m_iWidth >> 1, m_iHeight >> 1, pcPicYuvRef->getCrAddr() , pcPicYuvRef->getCStride()); -#endif } Index: trunk/source/Lib/TLibRenderer/TRenModel.h =================================================================== --- trunk/source/Lib/TLibRenderer/TRenModel.h (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenModel.h (revision 189) @@ -62,9 +62,5 @@ // Set horizontal offset -#if FIX_VSO_SETUP Void setupPart ( UInt uiHorOff, Int iUsedHeight ); -#else - Void setHorOffset ( UInt uiHorOff ); -#endif // Set Mode @@ -104,15 +100,11 @@ Int m_iSampledWidth; Int m_iPad; -#if FIX_VSO_SETUP Int m_iUsedHeight; // height currently used in buffer, whereas m_iHeight is the total height of the buffer -#endif Int m_iNumOfBaseViews; -#if HHI_VSO_SPEEDUP_A0033 // Horizontal Offset in input data UInt m_uiHorOff; -#endif /// Current Error Type /// Index: trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp =================================================================== --- trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp (revision 189) @@ -44,8 +44,6 @@ m_iHeight = -1; m_iStride = -1; -#if FIX_VSO_SETUP m_iUsedHeight = -1; m_iHorOffset = -1; -#endif m_iMode = -1; m_iPad = PICYUV_PAD; @@ -104,11 +102,6 @@ if ( m_pcInputSamples [1] ) delete[] m_pcInputSamples [1]; -#if FIX_MEM_LEAKS if ( m_pcOutputSamples ) delete[] m_pcOutputSamples ; -#else - if ( m_pcOutputSamples ) delete m_pcOutputSamples ; -#endif - -#if FIX_MEM_LEAKS + if ( m_piInvZLUTLeft ) delete[] m_piInvZLUTLeft ; if ( m_piInvZLUTRight ) delete[] m_piInvZLUTRight; @@ -117,5 +110,4 @@ if ( m_aapiRefVideoPel[1] ) delete[] ( m_aapiRefVideoPel[1] - ( m_aiRefVideoStrides[1] * m_iPad + m_iPad ) ); if ( m_aapiRefVideoPel[2] ) delete[] ( m_aapiRefVideoPel[2] - ( m_aiRefVideoStrides[2] * m_iPad + m_iPad ) ); -#endif } @@ -197,9 +189,5 @@ Int iOffsetX = ( iViewPos == VIEWPOS_RIGHT ) ? 1 : 0; -#if FIX_VSO_SETUP for ( Int iPosY = 0; iPosY < m_iUsedHeight; iPosY++ ) -#else - for ( Int iPosY = 0; iPosY < m_iHeight; iPosY++ ) -#endif { if ( iViewPos == VIEWPOS_RIGHT ) @@ -245,5 +233,4 @@ } -#if FIX_VSO_SETUP template Void TRenSingleModelC::setupPart ( UInt uiHorOffset, Int iUsedHeight ) @@ -254,12 +241,7 @@ m_iHorOffset = (Int) uiHorOffset; } -#endif template Void -#if FIX_VSO_SETUP TRenSingleModelC::setup( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference ) -#else -TRenSingleModelC::setup( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference, UInt uiHorOff ) -#endif { AOT( !m_bUseOrgRef && pcOrgVideo ); @@ -275,13 +257,7 @@ if ( pcOrgVideo && !bKeepReference ) { -#if FIX_VSO_SETUP TRenFilter::copy( pcOrgVideo->getLumaAddr() + m_iHorOffset * pcOrgVideo->getStride() , pcOrgVideo->getStride() , m_iWidth, m_iUsedHeight, m_aapiRefVideoPel[0], m_aiRefVideoStrides[0]); TRenFilter::sampleCUpHorUp(0, pcOrgVideo->getCbAddr() + (m_iHorOffset >> 1) * pcOrgVideo->getCStride(), pcOrgVideo->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiRefVideoPel[1], m_aiRefVideoStrides[1]); TRenFilter::sampleCUpHorUp(0, pcOrgVideo->getCrAddr() + (m_iHorOffset >> 1) * pcOrgVideo->getCStride(), pcOrgVideo->getCStride(), m_iWidth >> 1, m_iUsedHeight >> 1, m_aapiRefVideoPel[2], m_aiRefVideoStrides[2]); -#else - TRenFilter::copy( pcOrgVideo->getLumaAddr() + uiHorOff * pcOrgVideo->getStride() , pcOrgVideo->getStride() , m_iWidth, m_iHeight, m_aapiRefVideoPel[0], m_aiRefVideoStrides[0]); - TRenFilter::sampleCUpHorUp(0, pcOrgVideo->getCbAddr() + (uiHorOff >> 1) * pcOrgVideo->getCStride(), pcOrgVideo->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiRefVideoPel[1], m_aiRefVideoStrides[1]); - TRenFilter::sampleCUpHorUp(0, pcOrgVideo->getCrAddr() + (uiHorOff >> 1) * pcOrgVideo->getCStride(), pcOrgVideo->getCStride(), m_iWidth >> 1, m_iHeight >> 1, m_aapiRefVideoPel[2], m_aiRefVideoStrides[2]); -#endif xSetStructRefView(); } @@ -290,5 +266,4 @@ xResetStructError(); xInitSampleStructs(); -#if FIX_VSO_SETUP switch ( m_iMode ) { @@ -320,35 +295,4 @@ AOT(true); } -#else - switch ( m_iMode ) - { - case 0: -#if LGE_VSO_EARLY_SKIP_A0093 - xRenderL( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[0], m_apiBaseDepthPel[0],false ); -#else - xRenderL( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[0], m_apiBaseDepthPel[0] ); -#endif - break; - case 1: -#ifdef LGE_VSO_EARLY_SKIP_A0093 - xRenderR( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[1], m_apiBaseDepthPel[1],false); -#else - xRenderR( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[1], m_apiBaseDepthPel[1] ); -#endif - break; - case 2: - TRenFilter::setupZLUT( true, 30, iDistToLeft, ppiBaseShiftLutLeft, ppiBaseShiftLutRight, m_iBlendZThres, m_iBlendDistWeight, m_piInvZLUTLeft, m_piInvZLUTRight ); -#ifdef LGE_VSO_EARLY_SKIP_A0093 - xRenderL( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[0], m_apiBaseDepthPel[0],false); - xRenderR( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[1], m_apiBaseDepthPel[1],false); -#else - xRenderL( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[0], m_apiBaseDepthPel[0] ); - xRenderR( 0, 0, m_iWidth, m_iHeight, m_aiBaseDepthStrides[1], m_apiBaseDepthPel[1] ); -#endif - break; - default: - AOT(true); - } -#endif // Get Rendered View as Reference @@ -413,9 +357,5 @@ #endif -#if FIX_VSO_SETUP for ( Int iPosY = 0; iPosY < m_iUsedHeight; iPosY++ ) -#else - for ( Int iPosY = 0; iPosY < m_iHeight; iPosY++ ) -#endif { for ( Int iPosX = 0; iPosX < m_iWidth; iPosX++ ) @@ -470,9 +410,5 @@ #endif -#if FIX_VSO_SETUP for ( Int iPosY = 0; iPosY < m_iUsedHeight; iPosY++ ) -#else - for ( Int iPosY = 0; iPosY < m_iHeight; iPosY++ ) -#endif { for ( Int iPosX = 0; iPosX < m_iWidth; iPosX++ ) @@ -617,5 +553,4 @@ } -#if FIX_VSO_SETUP template Void TRenSingleModelC::getSynthVideo( Int iViewPos, TComPicYuv* pcPicYuv ) @@ -648,38 +583,5 @@ #endif } -#else -template Void -TRenSingleModelC::getSynthVideo( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ) -{ - AOT( pcPicYuv->getWidth() != m_iWidth ); - AOT( pcPicYuv->getHeight() > m_iHeight + uiHorOffset ); - -#if HHI_VSO_COLOR_PLANES - Pel RenModelOutPels::* piText[3] = { NULL, NULL, NULL }; - xGetSampleStrTextPtrs(iViewPos, piText[0], piText[1], piText[2]); - - // Temp image for chroma down sampling - PelImage cTempImage( m_iWidth, m_iHeight, 3, 0); - - Int aiStrides[3]; - Pel* apiData [3]; - - cTempImage.getDataAndStrides( apiData, aiStrides ); - - for (UInt uiCurPlane = 0; uiCurPlane < 3; uiCurPlane++ ) - { - xCopyFromSampleStruct( m_pcOutputSamples, m_iOutputSamplesStride, piText[uiCurPlane], apiData[uiCurPlane], aiStrides[uiCurPlane] , m_iWidth, m_iHeight); - } - xCopy2PicYuv( apiData, aiStrides, pcPicYuv, uiHorOffset ); -#else - Pel RenModelOutPels::* piY; - xGetSampleStrTextPtrs(iViewPos, piY); - xCopyFromSampleStruct( m_pcOutputSamples, m_iOutputSamplesStride, piY, pcPicYuv->getLumaAddr() + uiHorOffset * pcPicYuv->getStride(), pcPicYuv->getStride(), m_iWidth, m_iHeight ); - pcPicYuv->setChromaTo( 128 << g_uiBitIncrement ); -#endif -} -#endif - -#if FIX_VSO_SETUP + template Void TRenSingleModelC::getSynthDepth( Int iViewPos, TComPicYuv* pcPicYuv ) @@ -695,20 +597,5 @@ } -#else -template Void -TRenSingleModelC::getSynthDepth( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOff ) -{ - AOT( iViewPos != 0 && iViewPos != 1); - AOT( pcPicYuv->getWidth() != m_iWidth ); - AOT( pcPicYuv->getHeight() > m_iHeight + uiHorOff ); - - Pel RenModelOutPels::* piD = 0; - xGetSampleStrDepthPtrs(iViewPos, piD); - xCopyFromSampleStruct( m_pcOutputSamples, m_iOutputSamplesStride, piD, pcPicYuv->getLumaAddr() + pcPicYuv->getStride() * uiHorOff, pcPicYuv->getStride(), m_iWidth, m_iHeight ); - pcPicYuv->setChromaTo( 128 << g_uiBitIncrement ); -} -#endif - -#if FIX_VSO_SETUP + template Void TRenSingleModelC::getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv ) @@ -742,37 +629,4 @@ #endif } -#else -template Void -TRenSingleModelC::getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ) -{ - AOT( pcPicYuv->getWidth() != m_iWidth ); - AOT( pcPicYuv->getHeight() > m_iHeight + uiHorOffset); - -#if HHI_VSO_COLOR_PLANES - Pel RenModelOutPels::* piText[3]; - piText[0] = &RenModelOutPels::iYRef; - piText[1] = &RenModelOutPels::iURef; - piText[2] = &RenModelOutPels::iVRef; - - // Temp image for chroma down sampling - - PelImage cTempImage( m_iWidth, m_iHeight, 3, 0); - Int aiStrides[3]; - Pel* apiData [3]; - - cTempImage.getDataAndStrides( apiData, aiStrides ); - - for (UInt uiCurPlane = 0; uiCurPlane < 3; uiCurPlane++ ) - { - xCopyFromSampleStruct( m_pcOutputSamples, m_iOutputSamplesStride, piText[uiCurPlane], apiData[uiCurPlane], aiStrides[uiCurPlane] , m_iWidth, m_iHeight); - } - - xCopy2PicYuv( apiData, aiStrides, pcPicYuv, uiHorOffset ); -#else - xCopyFromSampleStruct( m_pcOutputSamples, m_iOutputSamplesStride, &RenModelOutPels::iYRef, pcPicYuv->getLumaAddr() * pcPicYuv->getStride() + uiHorOffset, pcPicYuv->getStride(), m_iWidth, m_iHeight ); - pcPicYuv->setChromaTo( 128 << g_uiBitIncrement ); -#endif -} -#endif template RMDist @@ -2018,5 +1872,4 @@ } -#if FIX_VSO_SETUP template Void TRenSingleModelC::xCopy2PicYuv( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget ) @@ -2026,13 +1879,4 @@ TRenFilter::sampleDown2Tap13( ppiSrcVideoPel[2], piStrides[2], m_iWidth, m_iUsedHeight, rpcPicYuvTarget->getCrAddr () + (m_iHorOffset >> 1) * rpcPicYuvTarget->getCStride(), rpcPicYuvTarget->getCStride() ); } -#else -template Void -TRenSingleModelC::xCopy2PicYuv( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget, UInt uiHorOffset ) -{ - TRenFilter::copy ( ppiSrcVideoPel[0], piStrides[0], m_iWidth, m_iHeight, rpcPicYuvTarget->getLumaAddr() + uiHorOffset * rpcPicYuvTarget->getStride() , rpcPicYuvTarget->getStride () ); - TRenFilter::sampleDown2Tap13( ppiSrcVideoPel[1], piStrides[1], m_iWidth, m_iHeight, rpcPicYuvTarget->getCbAddr () + (uiHorOffset >> 1) * rpcPicYuvTarget->getCStride(), rpcPicYuvTarget->getCStride() ); - TRenFilter::sampleDown2Tap13( ppiSrcVideoPel[2], piStrides[2], m_iWidth, m_iHeight, rpcPicYuvTarget->getCrAddr () + (uiHorOffset >> 1) * rpcPicYuvTarget->getCStride(), rpcPicYuvTarget->getCStride() ); -} -#endif template class TRenSingleModelC; Index: trunk/source/Lib/TLibRenderer/TRenSingleModel.h =================================================================== --- trunk/source/Lib/TLibRenderer/TRenSingleModel.h (revision 124) +++ trunk/source/Lib/TLibRenderer/TRenSingleModel.h (revision 189) @@ -69,7 +69,5 @@ public: -#if FIX_VIRT_DESTRUCTOR virtual ~TRenSingleModel() { } -#endif #if LGE_VSO_EARLY_SKIP_A0093 virtual Void create ( Int iMode, Int iWidth, Int iHeight, Int iShiftPrec, Int*** aaaiSubPelShiftTable, Int iHoleMargin, Bool bUseOrgRef, Int iBlendMode, Bool bEarlySkip ) = 0; @@ -80,10 +78,6 @@ // Set Frame dependent data virtual Void setLRView ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride ) = 0; -#if FIX_VSO_SETUP virtual Void setupPart ( UInt uiHorOffset, Int iUsedHeight ) = 0; virtual Void setup ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference ) = 0; -#else - virtual Void setup ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference, UInt uiHorOffset ) = 0; -#endif // Set Data @@ -103,13 +97,7 @@ virtual RMDist getDistVideo ( Int iViewPos, Int iPlane, Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData ) = 0; -#if FIX_VSO_SETUP virtual Void getSynthVideo ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0; virtual Void getSynthDepth ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0; virtual Void getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv ) = 0; -#else - virtual Void getSynthVideo ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ) = 0; - virtual Void getSynthDepth ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ) = 0; - virtual Void getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ) = 0; -#endif }; @@ -181,10 +169,6 @@ // Set Frame dependent data Void setLRView ( Int iViewPos, Pel** apiCurVideoPel, Int* aiCurVideoStride, Pel* piCurDepthPel, Int iCurDepthStride ); -#if FIX_VSO_SETUP Void setupPart ( UInt uiHorOffset, Int uiUsedHeight ); Void setup ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference ); -#else - Void setup ( TComPicYuv* pcOrgVideo, Int** ppiShiftLutLeft, Int** ppiBaseShiftLutLeft, Int** ppiShiftLutRight, Int** ppiBaseShiftLutRight, Int iDistToLeft, Bool bKeepReference, UInt uiHorOffset ); -#endif #if LGE_VSO_EARLY_SKIP_A0093 @@ -203,13 +187,7 @@ RMDist getDistVideo ( Int iViewPos, Int iPlane, Int iStartPosX, Int iStartPosY, Int iWidth, Int iHeight, Int iStride, Pel* piNewData ); -#if FIX_VSO_SETUP Void getSynthVideo ( Int iViewPos, TComPicYuv* pcPicYuv ); Void getSynthDepth ( Int iViewPos, TComPicYuv* pcPicYuv ); Void getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv ); -#else - Void getSynthVideo ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ); - Void getSynthDepth ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ); - Void getRefVideo ( Int iViewPos, TComPicYuv* pcPicYuv, UInt uiHorOffset ); -#endif private: @@ -293,19 +271,11 @@ Void xInitSampleStructs (); Void xSetStructSynthViewAsRefView (); -#if FIX_VSO_SETUP Void xCopy2PicYuv ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget ); -#else - Void xCopy2PicYuv ( Pel** ppiSrcVideoPel, Int* piStrides, TComPicYuv* rpcPicYuvTarget, UInt uiHorOffset ); -#endif template< typename S, typename T> Void xCopyFromSampleStruct ( S* ptSource , Int iSourceStride, T S::* ptSourceElement, T* ptTarget, Int iTargetStride, Int iWidth, Int iHeight ) { -#if FIX_VSO_SETUP AOT( iWidth != m_iWidth ); for (Int iPosY = 0; iPosY < iHeight; iPosY++) -#else - for (Int iPosY = 0; iPosY < m_iHeight; iPosY++) -#endif { for (Int iPosX = 0; iPosX < m_iWidth; iPosX++) @@ -321,10 +291,6 @@ Void xCopyToSampleStruct ( T* ptSource , Int iSourceStride, S* ptTarget, Int iTargetStride, T S::* ptSourceElement, Int iWidth, Int iHeight ) { -#if FIX_VSO_SETUP AOT( iWidth != m_iWidth ); for (Int iPosY = 0; iPosY < iHeight; iPosY++) -#else - for (Int iPosY = 0; iPosY < m_iHeight; iPosY++) -#endif { for (Int iPosX = 0; iPosX < m_iWidth; iPosX++) @@ -344,14 +310,8 @@ Int m_iStride; Int m_iPad; -#if FIX_VSO_SETUP Int m_iUsedHeight; Int m_iHorOffset; -#endif Int m_iSampledWidth; -#if FIX_VSO_SETUP -#else - Int m_iSampledHeight; -#endif Int m_iSampledStride;