Changeset 254 in SHVCSoftware for branches/SHM-2.1-multilayers-dev/source/Lib

Timestamp:

3 Jun 2013, 20:38:44 (12 years ago)

Author:

seregin

Message:

include reference layerId into scaling MV function

Location:

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComDataCU.h (modified) (1 diff)
• TComPic.cpp (modified) (1 diff)

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4319 +4319 @@
 }
 
-Void TComDataCU::scaleBaseMV( TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase )
+Void TComDataCU::scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase )
 {
   TComMvField cMvFieldBase;
   TComMv cMv;
 #if SIMPLIFIED_MV_POS_SCALING
-  cMv = rcMvFieldBase.getMv().scaleMv( g_mvScalingFactor[m_layerId][0], g_mvScalingFactor[m_layerId][1] );
+  cMv = rcMvFieldBase.getMv().scaleMv( g_mvScalingFactor[refLayerIdc][0], g_mvScalingFactor[refLayerIdc][1] );
 #else
   const Window &confBL = m_pcSlice->getBaseColPic()->getPicYuvRec()->getConformanceWindow();

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -556 +556 @@
   TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase );
   TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiPelX, UInt uiPelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase );
-  Void          scaleBaseMV( TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase );
+  Void          scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase );
 #endif
 };

branches/SHM-2.1-multilayers-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -614 +614 @@
           TComMvField sMvFieldBase, sMvField;
           pcColCU->getMvField( pcColCU, baseAbsPartIdx, (RefPicList)refPicList, sMvFieldBase);
-          pcCUDes->scaleBaseMV( sMvField, sMvFieldBase );
+          pcCUDes->scaleBaseMV( refLayerIdc, sMvField, sMvFieldBase );
 
           pcCUDes->getCUMvField((RefPicList)refPicList)->setMvField(sMvField, absPartIdx);