Changeset 1025 in 3DVCSoftware for branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

29 Jul 2014, 04:18:55 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-I0100: vps_extension2 and slice_segment_header clean-up

File:

• branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5900 +5900 @@
     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 );