Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMv.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/TComMv.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/TComMv.h

@@ -57 +57 @@
 public:
   
-#if LGE_DVMCP_A0126
+#if H3D_NBDV
   Bool  m_bDvMcp;       // is dv-mcp ?
   Int   m_iDvMcpDispX;  // disparity for dv-mcp
+#if MTK_RELEASE_DV_CONSTRAINT_C0129
+  Int   m_iDvMcpDispY;  // disparity for dv-mcp
+#endif
 #endif
 
@@ -69 +72 @@
   m_iHor(0),
   m_iVer(0)
-#if LGE_DVMCP_A0126
+#if H3D_NBDV
   , m_bDvMcp(false)
   , m_iDvMcpDispX(0)
+#if MTK_RELEASE_DV_CONSTRAINT_C0129
+  , m_iDvMcpDispY(0)
+#endif
 #endif
   {
@@ -79 +85 @@
   m_iHor(iHor),
   m_iVer(iVer)
-#if LGE_DVMCP_A0126
+#if H3D_NBDV
   , m_bDvMcp(false)
   , m_iDvMcpDispX(0)
+#if MTK_RELEASE_DV_CONSTRAINT_C0129
+  , m_iDvMcpDispY(0)
+#endif
 #endif
   {
@@ -158 +167 @@
   const TComMv scaleMv( Int iScale ) const
   {
-#if CLIPSCALEDMVP
     Int mvx = Clip3( -32768, 32767, (iScale * getHor() + 127 + (iScale * getHor() < 0)) >> 8 );
     Int mvy = Clip3( -32768, 32767, (iScale * getVer() + 127 + (iScale * getVer() < 0)) >> 8 );
     return TComMv( mvx, mvy );
-#else
-    return TComMv( (iScale * getHor() + 127 + (iScale * getHor() < 0)) >> 8, (iScale * getVer() + 127 + (iScale * getVer() < 0)) >> 8);
-#endif
   }
 };// END CLASS DEFINITION TComMV