Changeset 56 in 3DVCSoftware for trunk/source/Lib/TLibRenderer


Ignore:
Timestamp:
11 May 2012, 21:20:17 (13 years ago)
Author:
hschwarz
Message:

updated trunk (move to HM6.1)

Location:
trunk/source/Lib/TLibRenderer
Files:
2 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/Lib/TLibRenderer/TRenFilter.cpp

    r5 r56  
    3333
    3434
    35 
    3635#include "TRenImage.h"
    3736#include "TRenFilter.h"
    38 #include "../TLibCommon/TComPredFilter.h"
     37#include "TRenInterpFilter.h"
    3938
    4039
    … …  
    7372  }
    7473  // Set Threshold
    75   riBlendZThres  = ( max( abs(piInvZLUTLeft[0]- piInvZLUTLeft[255]), abs(piInvZLUTRight[0]- piInvZLUTRight[255]) ) * iBlendZThresPerc + 50)  / 100;
     74  riBlendZThres  = ( Max( abs(piInvZLUTLeft[0]- piInvZLUTLeft[255]), abs(piInvZLUTRight[0]- piInvZLUTRight[255]) ) * iBlendZThresPerc + 50)  / 100;
    7675}
    7776
    … …  
    10841083Void TRenFilter::sampleHorUp( Int iLog2HorSampFac, Pel* pcInputPlaneData, Int iInputStride, Int iInputWidth, Int iHeight, Pel* pcOutputPlaneData, Int iOutputStride  )
    10851084{
    1086   TComPredFilter cFilter;
     1085  TRenInterpFilter cFilter;
    10871086  switch ( iLog2HorSampFac )
    10881087  {
    … …  
    11131112  case 1:
    11141113    xDistributeArray( pcInputPlaneData,   iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                  , iOutputStride, 2 , 1 );
    1115     xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +1, iOutputStride, 2 , 1, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
     1114    xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +1, iOutputStride, 2 , 1, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
    11161115    break;
    11171116  case 2:
    11181117    xDistributeArray( pcInputPlaneData,   iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                  , iOutputStride, 4 , 1 );
    1119     xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +1, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA0 );
    1120     xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +2, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1121     xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +3, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA1 );
     1118    xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +1, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA0 );
     1119    xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +2, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1120    xInterpHorChroma( pcInputPlaneData  , iInputStride  , 1, 1, iInputWidth,   iHeight   , pcOutputPlaneData                +3, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA1 );
    11221121    break;
    11231122  }
    … …  
    11311130  case 0:
    11321131    xDistributeArray( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData                -2, iOutputStride, 2,  2 );
    1133     xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-2, iOutputStride, 2 , 2, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1134     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 2, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData+1                , iOutputStride, 2 , 1, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
     1132    xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-2, iOutputStride, 2 , 2, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1133    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 2, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData+1                , iOutputStride, 2 , 1, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
    11351134    break;
    11361135  case 1:
    11371136    xDistributeArray( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData                -4, iOutputStride, 4 , 2 );
    1138     xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-4, iOutputStride, 4 , 2, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1139     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +1, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA0 );
    1140     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +2, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1141     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +3, iOutputStride, 4 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA1 );
     1137    xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-4, iOutputStride, 4 , 2, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1138    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +1, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA0 );
     1139    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +2, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1140    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 4, 1, iInputWidth, iHeight*2 , pcOutputPlaneData                +3, iOutputStride, 4 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA1 );
    11421141    break;
    11431142  case 2:
    11441143    xDistributeArray( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData                -8, iOutputStride, 8 , 2 );
    1145     xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-8, iOutputStride, 8 , 2, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1146     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +1, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_OCT0 );
    1147     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +2, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA0 );
    1148     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +3, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_OCT1 );
    1149     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +4, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VPS04_C_HAL );
    1150     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +5, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_OCT2 );
    1151     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +6, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_QUA1 );
    1152     xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +7, iOutputStride, 8 , 1, &TComPredFilter::xCTI_Filter_VP04_C_OCT3 );
     1144    xInterpVerChroma( pcInputPlaneData-1, iInputStride  , 1, 1, iInputWidth+3, iHeight   , pcOutputPlaneData+1*iOutputStride-8, iOutputStride, 8 , 2, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1145    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +1, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_OCT0 );
     1146    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +2, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA0 );
     1147    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +3, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_OCT1 );
     1148    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +4, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VPS04_C_HAL );
     1149    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +5, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_OCT2 );
     1150    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +6, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_QUA1 );
     1151    xInterpHorChroma( pcOutputPlaneData , iOutputStride , 8, 1, iInputWidth,   iHeight*2 , pcOutputPlaneData                +7, iOutputStride, 8 , 1, &TRenInterpFilter::xCTI_Filter_VP04_C_OCT3 );
    11531152    break;
    11541153  }
    … …  
    12321231  Pel*  piSrcTmp;
    12331232
    1234   TComPredFilter cFilter;
     1233  TRenInterpFilter cFilter;
    12351234  for ( Int y = iHeight; y != 0; y-- )
    12361235  {
    … …  
    12521251  Pel*  piSrcTmp;
    12531252
    1254   TComPredFilter cFilter;
     1253  TRenInterpFilter cFilter;
    12551254  for ( Int y = iHeight; y != 0; y-- )
    12561255  {

  • trunk/source/Lib/TLibRenderer/TRenFilter.h

    r5 r56  
    3434
    3535
    36 
    3736#ifndef __TRENFILTER__
    3837#define __TRENFILTER__
    3938
    40 #include "../TLibCommon/CommonDef.h"
     39#include "TLibCommon/CommonDef.h"
    4140#include "TRenImage.h"
    42 #include "../TLibCommon/TComPredFilter.h"
     41#include "TRenInterpFilter.h"
    4342
    44 typedef Int (TComPredFilter::*FpChromaIntFilt) ( Pel*, Int );
     43typedef Int (TRenInterpFilter::*FpChromaIntFilt) ( Pel*, Int );
    4544
    4645class TRenFilter

  • trunk/source/Lib/TLibRenderer/TRenImage.cpp

    r5 r56  
    3333
    3434
    35 
    3635#include "TRenImage.h"
    3736#include "TRenImagePlane.h"
    3837#include "TRenFilter.h"
     38#include "assert.h"
    3939
    4040template<typename T>
    … …  
    249249template Void TRenImage<Pel>::assign<Pel>    (TRenImage<Pel>*   );
    250250
    251 

  • trunk/source/Lib/TLibRenderer/TRenImage.h

    r5 r56  
    3131 * THE POSSIBILITY OF SUCH DAMAGE.
    3232 */
    33 
    34 
    35 
    3633
    3734
    … …  
    9996};
    10097
    101 
    102 
    103 
    104 
    10598#endif // __TRENIMAGE__
    10699

  • trunk/source/Lib/TLibRenderer/TRenImagePlane.cpp

    r5 r56  
    3333
    3434
    35 
    3635#include "TRenImagePlane.h"
    3736#include "TRenFilter.h"
     37#include <string.h>
    3838/////// TRenImagePlane ///////
    3939
    … …  
    8080
    8181template<typename T>
    82 Void TRenImagePlane<T>::setData( T* pDataOrg, UInt uiWidthOrg, UInt uiHeightOrg, UInt uiStride, UInt uiPad, Bool bClean /*= false*/ )
     82Void TRenImagePlane<T>::setData( T* pDataOrg, UInt uiWidthOrg, UInt uiHeightOrg, UInt uiStride, UInt uiPad, Bool bClean /*= false*/ ) 
    8383{
    8484  deleteData();
    … …  
    492492  for ( Int iPosY = 0; iPosY < iPad; iPosY++ )
    493493  {
    494     ::memcpy( pcData + (iPosY+1)*m_uiStride, pcData, sizeof(T)*(m_uiWidth + (iPad<<1)) );
     494    memcpy( pcData + (iPosY+1)*m_uiStride, pcData, sizeof(T)*(m_uiWidth + (iPad<<1)) );
    495495  }
    496496
    … …  
    498498  for ( Int iPosY = 0; iPosY < iPad; iPosY++ )
    499499  {
    500     ::memcpy( pcData - (iPosY+1)*m_uiStride, pcData, sizeof(T)*(m_uiWidth + (iPad<<1)) );
     500    memcpy( pcData - (iPosY+1)*m_uiStride, pcData, sizeof(T)*(m_uiWidth + (iPad<<1)) );
    501501  }
    502502}

  • trunk/source/Lib/TLibRenderer/TRenImagePlane.h

    r5 r56  
    3131 * THE POSSIBILITY OF SUCH DAMAGE.
    3232 */
    33 
    34 
    35 
    3633
    3734
    … …  
    6966  UInt getStride   () { return m_uiStride; };
    7067
    71   Void setData ( T* pDataOrg, UInt uiWidthOrg, UInt uiHeightOrg, UInt uiStride, UInt uiPad, Bool bClean /*= false*/ );
     68  Void setData ( T* pDataOrg, UInt uiWidthOrg, UInt uiHeightOrg, UInt uiStride, UInt uiPad, Bool bClean /*= false*/ );
     69 
    7270  Void setData ( TRenImagePlane<T>* pcInPlane, Bool bClean );
    7371  Void setClean( Bool bClean );

  • trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

    r5 r56  
    3333
    3434
    35 
    3635#include "TRenImage.h"
    3736#include "TRenFilter.h"

  • trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.h

    r5 r56  
    3838#include "../TLibCommon/TComPicYuv.h"
    3939#include "../TLibCommon/TypeDef.h"
    40 #include "../../App/TAppCommon/TAppComCamPara.h"
     40#include "../TAppCommon/TAppComCamPara.h"
    4141
    4242

  • trunk/source/Lib/TLibRenderer/TRenModel.cpp

    r5 r56  
    4141TRenModel::TRenModel()
    4242{
    43   m_iPad               = 12;
     43  m_iPad               = PICYUV_PAD;
    4444  m_iWidth             = -1;
    4545  m_iHeight            = -1;

  • trunk/source/Lib/TLibRenderer/TRenModel.h

    r5 r56  
    3131 * THE POSSIBILITY OF SUCH DAMAGE.
    3232 */
    33 
    34 
    3533
    3634

  • trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp

    r5 r56  
    4545  m_iStride = -1;
    4646  m_iMode   = -1;
    47   m_iPad    = 12;
     47  m_iPad    = PICYUV_PAD;
    4848  m_iGapTolerance = -1;
    4949  m_bUseOrgRef = false;
    … …  
    448448      m_iLastOccludedSPosFP = xRangeLeftL( m_iLastOccludedSPos );
    449449      xExtrapolateMarginL  ( iCurSPos, iEndChangePos, iError );
    450       iMinChangedSPos       = Min( iMinChangedSPos, (iEndChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iEndChangePos], m_piNewDepthData[iPosXinNewData] )) ]);
     450      iMinChangedSPos       = Min( iMinChangedSPos, (iEndChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( max(m_apiBaseDepthPelRow[m_iCurViewPos][iEndChangePos], m_piNewDepthData[iPosXinNewData] )) ]);
    451451      iLastSPos             = iCurSPos;
    452452      m_iLastDepth          = m_iCurDepth;
    … …  
    466466    {
    467467      // Get minimal changed sample position
    468       iMinChangedSPos = Min( iMinChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);
     468      iMinChangedSPos = Min( iMinChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);
    469469      Int iCurSPos    = xShiftNewData(iCurPosX,iPosXinNewData);
    470470      m_iCurDepth     = m_piNewDepthData[iPosXinNewData];
    … …  
    541541      m_iLastOccludedSPosFP = xRangeRightR( m_iLastOccludedSPos );
    542542      xExtrapolateMarginR     ( iCurSPos, iStartChangePos, iError );
    543       iMaxChangedSPos       = Max( iMaxChangedSPos, (iStartChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iStartChangePos], m_piNewDepthData[iPosXinNewData] )) ]);
     543      iMaxChangedSPos       = max( iMaxChangedSPos, (iStartChangePos << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( max(m_apiBaseDepthPelRow[m_iCurViewPos][iStartChangePos], m_piNewDepthData[iPosXinNewData] )) ]);
    544544      iLastSPos             = iCurSPos;
    545545      m_iLastDepth          = m_iCurDepth;
    … …  
    559559    {
    560560      // Get minimal changed sample position
    561       iMaxChangedSPos = Max( iMaxChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( Max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);
     561      iMaxChangedSPos = max( iMaxChangedSPos, (iCurPosX << m_iShiftPrec) - m_ppiCurLUT[0][ RemoveBitIncrement( max(m_apiBaseDepthPelRow[m_iCurViewPos][iCurPosX], m_piNewDepthData[iPosXinNewData] )) ]);
    562562      Int iCurSPos    = xShiftNewData(iCurPosX,iPosXinNewData);
    563563      m_iCurDepth     = m_piNewDepthData[iPosXinNewData];
    … …  
    675675
    676676    m_iThisDepth = m_iCurDepth;
    677     for (Int iFillSPos = Max(0, xRangeLeftL(iCurSPos) ); iFillSPos <= min(xRangeRightL( iLastSPos ) ,m_iLastOccludedSPosFP-1); iFillSPos++ )
     677    for (Int iFillSPos = max(0, xRangeLeftL(iCurSPos) ); iFillSPos <= min(xRangeRightL( iLastSPos ) ,m_iLastOccludedSPosFP-1); iFillSPos++ )
    678678    {
    679679      Int iDeltaCurSPos  = (iFillSPos << m_iShiftPrec) - iCurSPos;
    … …  
    863863
    864864  m_iThisDepth = m_iLastDepth;
    865   for (Int iFillSPos = Max(iStartFillSPosFP+1,0); iFillSPos <= min(xRangeRightL( iLastSPos ), m_iLastOccludedSPosFP-1 ); iFillSPos++ )
     865  for (Int iFillSPos = max(iStartFillSPosFP+1,0); iFillSPos <= min(xRangeRightL( iLastSPos ), m_iLastOccludedSPosFP-1 ); iFillSPos++ )
    866866  {
    867867    xSetShiftedPel( iLastPos << m_iShiftPrec, iFillSPos, REN_IS_HOLE, riError );
    … …  
    907907//    return;
    908908
    909   Int iSPosFullPel = Max(0,xRangeLeftL(iCurSPos));
     909  Int iSPosFullPel = max(0,xRangeLeftL(iCurSPos));
    910910
    911911  m_iThisDepth = m_iCurDepth;

  • trunk/source/Lib/TLibRenderer/TRenSingleModel.h

    r5 r56  
    3333
    3434
    35 
    36 
    3735#ifndef __TRENSINGLEMODEL__
    3836#define __TRENSINGLEMODEL__
    … …  
    4240#include "../TLibCommon/TComPicYuv.h"
    4341#include "../TLibCommon/TypeDef.h"
    44 #include "../../App/TAppCommon/TAppComCamPara.h"
     42#include "../TAppCommon/TAppComCamPara.h"
    4543
    4644

  • trunk/source/Lib/TLibRenderer/TRenTop.cpp

    r5 r56  
    3232 */
    3333
    34 
    3534#include "TRenImage.h"
    3635#include "TRenTop.h"
    … …  
    152151    PelImagePlane* pcTempPlane = new PelImagePlane(pcOrgInputImage->getPlane(0)->getWidth(), ( pcOrgInputImage->getPlane(0)->getHeight() >> 1), REN_LUMA_MARGIN );
    153152
    154     TRenFilter::sampleVerDown2Tap13(pcOrgInputImage->getPlane(0), pcTempPlane, 12);
     153    TRenFilter::sampleVerDown2Tap13(pcOrgInputImage->getPlane(0), pcTempPlane, PICYUV_PAD);
    155154    pcConvPlane = pcConvInputImage->getPlane(1);
    156155
    … …  
    317316
    318317  PelImage cLeftInputImage   ( pcPicYuvVideoLeft  );
    319   PelImage cLeftInputDepth   ( pcPicYuvDepthLeft, true );
     318  PelImage cLeftInputDepth   ( pcPicYuvDepthLeft,  true );
    320319  PelImage cRightInputImage  ( pcPicYuvVideoRight );
    321   PelImage cRightInputDepth  ( pcPicYuvDepthRight , true );
     320  PelImage cRightInputDepth  ( pcPicYuvDepthRight, true );
    322321  PelImage cOutputImage      ( pcPicYuvSynthOut   );
    323322
    … …  
    338337
    339338  xConvertInputData( &cLeftInputImage,  &cLeftInputDepth,  m_pcLeftInputImage,  m_pcLeftInputDepth  ,false );
    340   xConvertInputData( &cRightInputImage, &cRightInputDepth, m_pcRightInputImage, m_pcRightInputDepth ,true );
     339  xConvertInputData( &cRightInputImage, &cRightInputDepth, m_pcRightInputImage, m_pcRightInputDepth ,true  );
    341340
    342341  // Render from Left View to Right view
    … …  
    386385
    387386  xBlend(m_pcLeftOutputImage, m_pcRightOutputImage, m_pcLeftFilled, m_pcRightFilled, m_pcLeftOutputDepth, m_pcRightOutputDepth, m_pcOutputImage);
    388 
    389387  xConvertOutputData( m_pcOutputImage, &cOutputImage , false );
     388
    390389  xPostProcessImage  ( &cOutputImage, &cOutputImage);
    391390  xCutMargin( &cOutputImage );
    … …  
    22302229  if(m_aiBlkMoving         != NULL ) delete[] m_aiBlkMoving;
    22312230}
    2232 

  • trunk/source/Lib/TLibRenderer/TRenTop.h

    r5 r56  
    3131 * THE POSSIBILITY OF SUCH DAMAGE.
    3232 */
    33 
    34 
    3533
    3634#ifndef __TRENTOP__
Note: See TracChangeset for help on using the changeset viewer.