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

Timestamp:

5 Apr 2015, 23:09:21 (9 years ago)

Author:

tech

Message:

Fixed ticket 97 (Iv Mv scaling in AMVP) H_3D_TMVP_FIX_TICKET_97

File:

• branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)

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

@@ -5812 +5812 @@
     if ( iCurrRefViewId != iCurrViewId && iColViewId != iColRefViewId )
 #endif
-    iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
-
+      iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
+#if H_3D_TMVP_FIX_TICKET_97 
+    if ( bMRG && iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) ) 
+#else
     if ( iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) )
+#endif
     {
       rcMv = cColMv.scaleMv( iScale );