Changeset 370 in SHVCSoftware for branches


Ignore:
Timestamp:
28 Aug 2013, 04:07:11 (11 years ago)
Author:
seregin
Message:

remove SIMPLIFIED_MV_POS_SCALING macro

Location:
branches/SHM-3.1-dev/source/Lib
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComDataCU.cpp

    r345 r370  
    40064006  TComPic* cBaseColPic = m_pcSlice->getBaseColPic(refLayerIdc);
    40074007
    4008 #if !SIMPLIFIED_MV_POS_SCALING
    4009 #if SVC_UPSAMPLING && !ILP_DECODED_PICTURE
    4010   const Window &confBL = cBaseColPic->getPicYuvRec()->getConformanceWindow();
    4011   const Window &confEL = m_pcPic->getPicYuvRec()->getConformanceWindow();
    4012 
    4013   Int widthBL   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
    4014   Int heightBL  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
    4015 
    4016   Int widthEL   = m_pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
    4017   Int heightEL  = m_pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
    4018 #else
    4019   Int widthBL   = cBaseColPic->getPicYuvRec()->getWidth();
    4020   Int heightBL  = cBaseColPic->getPicYuvRec()->getHeight();
    4021 
    4022   Int widthEL   = m_pcPic->getPicYuvRec()->getWidth();
    4023   Int heightEL  = m_pcPic->getPicYuvRec()->getHeight();
    4024 #endif
    4025 #endif
    4026 
    40274008  uiPelX = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getWidth() - 1, uiPelX);
    40284009  uiPelY = (UInt)Clip3<UInt>(0, m_pcPic->getPicYuvRec()->getHeight() - 1, uiPelY);
    … …  
    40304011  UInt uiMinUnitSize = m_pcPic->getMinCUWidth();
    40314012
    4032 #if SIMPLIFIED_MV_POS_SCALING
    40334013#if SCALED_REF_LAYER_OFFSETS
    40344014  Int leftStartL = this->getSlice()->getSPS()->getScaledRefLayerWindow(refLayerIdc).getWindowLeftOffset();
    … …  
    40404020  Int iBY = (uiPelY*g_posScalingFactor[refLayerIdc][1] + (1<<15)) >> 16;
    40414021#endif
    4042 #else
    4043   Int iBX = (uiPelX*widthBL + widthEL/2)/widthEL;
    4044   Int iBY = (uiPelY*heightBL+ heightEL/2)/heightEL;
    4045 #endif
    40464022
    40474023#if N0139_POSITION_ROUNDING_OFFSET
    … …  
    40904066  TComMvField cMvFieldBase;
    40914067  TComMv cMv;
    4092 #if SIMPLIFIED_MV_POS_SCALING
     4068
    40934069  cMv = rcMvFieldBase.getMv().scaleMv( g_mvScalingFactor[refLayerIdc][0], g_mvScalingFactor[refLayerIdc][1] );
    4094 #else
    4095   const Window &confBL = m_pcSlice->getBaseColPic()->getPicYuvRec()->getConformanceWindow();
    4096   const Window &confEL = m_pcPic->getPicYuvRec()->getConformanceWindow();
    4097 
    4098   Int widthBL   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset();
    4099   Int heightBL  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset();
    4100 
    4101   Int widthEL   = m_pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset();
    4102   Int heightEL  = m_pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset();
    4103 
    4104   Int iMvX = (rcMvFieldBase.getHor()*widthEL + (widthBL/2 -1) * (rcMvFieldBase.getHor() > 0 ? 1: -1) )/widthBL;
    4105   Int iMvY = (rcMvFieldBase.getVer()*heightEL + (heightBL/2 -1) * (rcMvFieldBase.getVer() > 0 ? 1: -1) )/heightBL;
    4106 
    4107   cMv.set(iMvX, iMvY);
    4108 #endif
    41094070
    41104071  rcMvFieldEnhance.setMvField( cMv, rcMvFieldBase.getRefIdx() );

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComMv.h

    r313 r370  
    149149    return TComMv( mvx, mvy );
    150150  }
    151 #if SIMPLIFIED_MV_POS_SCALING
     151#if SVC_EXTENSION
    152152  const TComMv scaleMv( Int iScaleX, Int iScaleY ) const
    153153  {

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComRom.cpp

    r313 r370  
    523523Int  g_eTTable[4] = {0,3,1,2};
    524524
    525 #if SIMPLIFIED_MV_POS_SCALING
     525#if SVC_EXTENSION
    526526Int g_mvScalingFactor  [MAX_LAYERS][2] = {{0,0}, {0,0}};
    527527Int g_posScalingFactor [MAX_LAYERS][2] = {{0,0}, {0,0}};

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComRom.h

    r313 r370  
    279279extern Int  g_eTTable[4];
    280280
    281 #if SIMPLIFIED_MV_POS_SCALING
     281#if SVC_EXTENSION
    282282extern Int g_mvScalingFactor  [MAX_LAYERS][2];
    283283extern Int g_posScalingFactor [MAX_LAYERS][2];

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

    r361 r370  
    499499      m_activeNumILRRefIdx = numInterLayerRPSPics;
    500500    }
    501 #if MAX_ONE_RESAMPLING_DIRECT_LAYERS && SIMPLIFIED_MV_POS_SCALING
     501#if MAX_ONE_RESAMPLING_DIRECT_LAYERS
    502502    if( m_pcVPS->getScalabilityMask(1) )
    503503    {

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r345 r370  
    151151  Pel* piDstV;
    152152
    153 #if SIMPLIFIED_MV_POS_SCALING
    154153  Int scaleX = g_posScalingFactor[refLayerIdc][0];
    155154  Int scaleY = g_posScalingFactor[refLayerIdc][1];
    156 #else
    157   Int   scaleX     = ( ( widthBL << shiftX ) + ( widthEL >> 1 ) ) / widthEL;
    158   Int   scaleY     = ( ( heightBL << shiftY ) + ( heightEL >> 1 ) ) / heightEL;
    159 #endif
    160155
    161156  if( scaleX == 65536 && scaleY == 65536 ) // ratio 1x
    … …  
    451446    shiftYM4 = shiftY - 4;
    452447
    453 #if !SIMPLIFIED_MV_POS_SCALING
    454     scaleX     = ( ( widthBL << shiftX ) + ( widthEL >> 1 ) ) / widthEL;
    455     scaleY     = ( ( heightBL << shiftY ) + ( heightEL >> 1 ) ) / heightEL;
    456 #endif
    457 
    458448#if ILP_DECODED_PICTURE
    459449    widthEL   = pcUsPic->getWidth () >> 1;

  • branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

    r369 r370  
    9090#define BUGFIX_RESAMPLE                  1      ///< JCTVC-N0055: resampling bug fix for positive left scalled offset
    9191
    92 #define SIMPLIFIED_MV_POS_SCALING        1      ///< M0133/M0449: inter-layer MV scaling and pixel mapping position calculation
    9392#define ILP_DECODED_PICTURE              1      ///< M0274: use decoded picture for inter-layer prediction
    9493#define JCTVC_M0259_LAMBDAREFINEMENT     1      ///< JCTVC-M0259: lambda refinement (encoder only optimization)

  • branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r368 r370  
    871871#endif
    872872
    873 #if SIMPLIFIED_MV_POS_SCALING
    874873#if SCALED_REF_LAYER_OFFSETS
    875874        const Window &scalEL = pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc);
    … …  
    895894        g_posScalingFactor[refLayerIdc][0] = ((widthBL  << 16) + (widthEL  >> 1)) / widthEL;
    896895        g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
    897 #endif
    898896
    899897#if SVC_UPSAMPLING

  • branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r356 r370  
    588588        pcSlice->setBaseColPic( *cListPic, refLayerIdc );
    589589
    590 #if SIMPLIFIED_MV_POS_SCALING
    591590#if SCALED_REF_LAYER_OFFSETS
    592591        const Window &scalEL = m_pcEncTop->getScaledRefLayerWindow(refLayerIdc);
    … …  
    612611        g_posScalingFactor[refLayerIdc][0] = ((widthBL  << 16) + (widthEL  >> 1)) / widthEL;
    613612        g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
    614 #endif
    615613
    616614#if SVC_UPSAMPLING
Note: See TracChangeset for help on using the changeset viewer.