Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

Timestamp:

1 Sep 2013, 22:47:26 (12 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibCommon/TComMotionInfo.cpp (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -328 +328 @@
  * \param scale      Factor by which to subsample motion information
  */
-#if HHI_MPI
-Void TComCUMvField::compress(Char* pePredMode, UChar* puhInterDir, Int scale)
-#else
 Void TComCUMvField::compress(Char* pePredMode, Int scale)
-#endif
 {
   Int N = scale * scale;
@@ -351 +347 @@
       pePredMode[ uiPartIdx + i ] = predMode;
       m_piRefIdx[ uiPartIdx + i ] = iRefIdx;
-#if HHI_MPI
-      puhInterDir[ uiPartIdx + i ] = puhInterDir[ uiPartIdx ];
-#endif
     }
   }
 } 
-
-#if HHI_FULL_PEL_DEPTH_MAP_MV_ACC
-Void TComCUMvField::decreaseMvAccuracy( Int iPartAddr, Int iNumPart, Int iShift )
-{
-  assert( iShift > 0 );
-  const TComMv cAdd( 1 << ( iShift - 1 ), 1 << ( iShift - 1 ) );
-
-  for ( Int i = 0; i < iNumPart; i++ )
-  {
-    m_pcMv[iPartAddr+i] += cAdd;
-    m_pcMv[iPartAddr+i] >>= iShift;
-
-    m_pcMvd[iPartAddr+i] += cAdd;
-    m_pcMvd[iPartAddr+i] >>= iShift;
-  }
-}
-#endif
-
-
-
-#if MTK_UNCONSTRAINED_MVI_B0083
-Void TComCUMvField::setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir 
-                                   )
-{
-  PredMode predMode = MODE_INTRA;
-  TComMv cMv(0,0); 
-
-  for ( Int i = 0; i < iNumPart; i++ )
-  { 
-    predMode = static_cast<PredMode>( pePredMode[ iPartAddr+i ] );
-    if( predMode == MODE_INTRA )
-    {
-      m_pcMv[iPartAddr+i] = cMv;
-      puhInterDir[iPartAddr+i] = InterDir; 
-      m_piRefIdx[iPartAddr+i] = refIdx;
-    }
-  }
-}
-#endif
-
 //! \}