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


Ignore:
Timestamp:
1 Sep 2013, 22:47:26 (11 years ago)
Author:
tech
Message:

Merged DEV-2.0-dev0@604.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

    r296 r608  
    44 * granted under this license. 
    55 *
    6  * Copyright (c) 2010-2012, ITU/ISO/IEC
     6 * Copyright (c) 2010-2013, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    328328 * \param scale      Factor by which to subsample motion information
    329329 */
    330 #if HHI_MPI
    331 Void TComCUMvField::compress(Char* pePredMode, UChar* puhInterDir, Int scale)
    332 #else
    333330Void TComCUMvField::compress(Char* pePredMode, Int scale)
    334 #endif
    335331{
    336332  Int N = scale * scale;
     
    351347      pePredMode[ uiPartIdx + i ] = predMode;
    352348      m_piRefIdx[ uiPartIdx + i ] = iRefIdx;
    353 #if HHI_MPI
    354       puhInterDir[ uiPartIdx + i ] = puhInterDir[ uiPartIdx ];
    355 #endif
    356349    }
    357350  }
    358351}
    359 
    360 #if HHI_FULL_PEL_DEPTH_MAP_MV_ACC
    361 Void TComCUMvField::decreaseMvAccuracy( Int iPartAddr, Int iNumPart, Int iShift )
    362 {
    363   assert( iShift > 0 );
    364   const TComMv cAdd( 1 << ( iShift - 1 ), 1 << ( iShift - 1 ) );
    365 
    366   for ( Int i = 0; i < iNumPart; i++ )
    367   {
    368     m_pcMv[iPartAddr+i] += cAdd;
    369     m_pcMv[iPartAddr+i] >>= iShift;
    370 
    371     m_pcMvd[iPartAddr+i] += cAdd;
    372     m_pcMvd[iPartAddr+i] >>= iShift;
    373   }
    374 }
    375 #endif
    376 
    377 
    378 
    379 #if MTK_UNCONSTRAINED_MVI_B0083
    380 Void TComCUMvField::setUndefinedMv( Int iPartAddr, Int iNumPart, Char* pePredMode, UChar* puhInterDir, Int refIdx, Int InterDir
    381                                    )
    382 {
    383   PredMode predMode = MODE_INTRA;
    384   TComMv cMv(0,0);
    385 
    386   for ( Int i = 0; i < iNumPart; i++ )
    387   {
    388     predMode = static_cast<PredMode>( pePredMode[ iPartAddr+i ] );
    389     if( predMode == MODE_INTRA )
    390     {
    391       m_pcMv[iPartAddr+i] = cMv;
    392       puhInterDir[iPartAddr+i] = InterDir;
    393       m_piRefIdx[iPartAddr+i] = refIdx;
    394     }
    395   }
    396 }
    397 #endif
    398 
    399352//! \}
Note: See TracChangeset for help on using the changeset viewer.