Changeset 40 in SHVCSoftware for branches/SHM-1.1-dev/source/Lib/TLibCommon


Ignore:
Timestamp:
20 Feb 2013, 23:45:18 (12 years ago)
Author:
seregin
Message:

MV_SCALING_FIX: fix base layer MV scaling

Location:
branches/SHM-1.1-dev/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r38 r40  
    49334933   TComMv cMv;
    49344934
     4935#if MV_SCALING_FIX
     4936   Int iBWidth   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth () - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropLeftOffset() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropRightOffset();
     4937   Int iBHeight  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropTopOffset() - m_pcSlice->getBaseColPic()->getPicYuvRec()->getPicCropBottomOffset();
     4938
     4939   Int iEWidth   = m_pcPic->getPicYuvRec()->getWidth() - m_pcPic->getPicYuvRec()->getPicCropLeftOffset() - m_pcPic->getPicYuvRec()->getPicCropRightOffset();
     4940   Int iEHeight  = m_pcPic->getPicYuvRec()->getHeight() - m_pcPic->getPicYuvRec()->getPicCropTopOffset() - m_pcPic->getPicYuvRec()->getPicCropBottomOffset();
     4941#else
    49354942   Int iBWidth   = m_pcSlice->getBaseColPic()->getPicYuvRec()->getWidth();
    49364943   Int iBHeight  = m_pcSlice->getBaseColPic()->getPicYuvRec()->getHeight();
    … …  
    49384945   Int iEWidth   = m_pcPic->getPicYuvRec()->getWidth();
    49394946   Int iEHeight  = m_pcPic->getPicYuvRec()->getHeight();
     4947#endif
    49404948
    49414949   Int iMvX = (rcMvFieldBase.getHor()*iEWidth + (iBWidth/2 -1) * (rcMvFieldBase.getHor() > 0 ? 1: -1) )/iBWidth;

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

    r38 r40  
    5353#define ENCODER_BUGFIX                   1      ///< L0167: encoder bug fix for inter mode
    5454#define CHROMA_UPSAMPLING                1      ///< L0335: Chroma upsampling with 5 bits coefficients
     55
     56#define MV_SCALING_FIX                   1      ///< fixing the base layer MV scaling
    5557
    5658#define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
Note: See TracChangeset for help on using the changeset viewer.