Changeset 1174 in 3DVCSoftware for branches

Timestamp:

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

Author:

tech

Message:

Fixed ticket 97 (Iv Mv scaling in AMVP) H_3D_TMVP_FIX_TICKET_97

Location:

branches/HTM-13.1-dev0

Files:

• codingresults/1174_IvScalAMVPOff_vs_1173_MoveSE.xls (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (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 );

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -337 +337 @@
 #define HHI_MOVE_SYN_K0052                     1
 #define H_3D_ANNEX_SELECTION_FIX               1
+#define H_3D_TMVP_FIX_TICKET_97                1
+
 #endif
 #define H_MV_FIX_REF_LAYER_PIC_FLAG            1