Changeset 1030 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

30 Jul 2014, 19:51:27 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev2-Samsung@1026.

File:

• branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5967 +5967 @@
     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
     iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
+#if SEC_HLS_CLEANUP_I0100
+    if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag(getSlice()->getLayerIdInVps()) ) 
+#else
     if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag() ) 
+#endif
     {
       rcMv = cColMv.scaleMv( iScale );
@@ -6778 +6782 @@
   if( getSlice()->getIsDepth() )
   {
+#if MTK_I0099_VPS_EX2
+    iSubPUSize = 1<<getSlice()->getVPS()->getSubPUMPILog2Size(getSlice()->getLayerId());
+#else
     iSubPUSize = 1 << getSlice()->getVPS()->getSubPUMPILog2Size();
+#endif
   }