Changeset 1166 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibEncoder


Ignore:
Timestamp:
16 Mar 2015, 13:37:35 (10 years ago)
Author:
tech
Message:

Fixed erroneous #ifdefs.

Location:
branches/HTM-13.1-dev0/source/Lib/TLibEncoder
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncCfg.h

    r1164 r1166  
    180180  Int       m_iSearchRange;                     //  0:Full frame
    181181  Int       m_bipredSearchRange;
    182 #ifdef SONY_MV_V_CONST_C0078
     182#if SONY_MV_V_CONST_C0078
    183183  Bool      m_bUseDisparitySearchRangeRestriction;
    184184  Int       m_iVerticalDisparitySearchRange;
    … …  
    505505  Void      setSearchRange                  ( Int   i )      { m_iSearchRange = i; }
    506506  Void      setBipredSearchRange            ( Int   i )      { m_bipredSearchRange = i; }
    507 #ifdef SONY_MV_V_CONST_C0078
     507#if SONY_MV_V_CONST_C0078
    508508  Void      setUseDisparitySearchRangeRestriction ( Bool   b )      { m_bUseDisparitySearchRangeRestriction = b; }
    509509  Void      setVerticalDisparitySearchRange ( Int   i )      { m_iVerticalDisparitySearchRange = i; }
    … …  
    561561  Int       getFastSearch                   ()      { return  m_iFastSearch; }
    562562  Int       getSearchRange                  ()      { return  m_iSearchRange; }
    563 #ifdef SONY_MV_V_CONST_C0078
     563#if SONY_MV_V_CONST_C0078
    564564  Bool      getUseDisparitySearchRangeRestriction ()      { return  m_bUseDisparitySearchRangeRestriction; }
    565565  Int       getVerticalDisparitySearchRange ()            { return  m_iVerticalDisparitySearchRange; }

  • branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

    r1164 r1166  
    55005500  TComMv      cMvPred = *pcMvPred;
    55015501 
    5502 #ifdef SONY_MV_V_CONST_C0078
     5502#if SONY_MV_V_CONST_C0078
    55035503  Bool bMv_VRng_Restricted = false;
    55045504  if( m_pcEncCfg->getUseDisparitySearchRangeRestriction()
    … …  
    55675567
    55685568
    5569 #ifdef SONY_MV_V_CONST_C0078
     5569#if SONY_MV_V_CONST_C0078
    55705570Void TEncSearch::xSetSearchRange ( TComDataCU* pcCU, TComMv& cMvPred, Int iSrchRng, TComMv& rcMvSrchRngLT, TComMv& rcMvSrchRngRB, Bool bMv_VRng_Restricted, Int iVerDispSrchRng )
    55715571#else
    … …  
    55875587  rcMvSrchRngRB.setVer( cTmpMvPred.getVer() + (iSrchRng << iMvShift) );
    55885588 
    5589 #ifdef SONY_MV_V_CONST_C0078
     5589#if SONY_MV_V_CONST_C0078
    55905590  if ( bMv_VRng_Restricted ) {
    55915591    Int iRestrictMvVrange = ( iVerDispSrchRng - 1 ) << iMvShift ; // -1 to consider subpel search

  • branches/HTM-13.1-dev0/source/Lib/TLibEncoder/TEncSearch.h

    r1164 r1166  
    480480                                    UInt&         ruiSAD );
    481481 
    482 #ifdef SONY_MV_V_CONST_C0078
     482#if SONY_MV_V_CONST_C0078
    483483  Void xSetSearchRange           (  TComDataCU* pcCU,
    484484                                    TComMv& cMvPred,
Note: See TracChangeset for help on using the changeset viewer.