Changeset 345 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.h


Ignore:
Timestamp:
17 Aug 2013, 06:27:19 (11 years ago)
Author:
seregin
Message:

merge SHM-3.0-dev branch

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/source

  • trunk/source/Lib/TLibEncoder/TEncSearch.h

    r313 r345  
    9999#if SVC_EXTENSION
    100100  TEncTop**       m_ppcTEncTop;
    101 #if INTRA_BL
    102   TComPicYuv*     m_pcPicYuvRecBase;       ///< reconstructed base layer
    103 #endif
    104101#endif
    105102 
    … …  
    192189                                  TComYuv*    pcRecoYuv,
    193190                                  UInt        uiPreCalcDistC );
    194  
    195 #if INTRA_BL
    196   Void setBaseRecPic            ( TComPicYuv* pcPicYuvRecBase ) { m_pcPicYuvRecBase = pcPicYuvRecBase; } 
    197   TComPicYuv* getBaseRecPic     ()                              { return m_pcPicYuvRecBase; }
    198   Void  estIntraBLPredQT        ( TComDataCU* pcCU,
    199                                   TComYuv*    pcOrgYuv,
    200                                   TComYuv*    pcPredYuv,
    201                                   TComYuv*    pcResiYuv,
    202                                   TComYuv*    pcRecoYuv );
    203 #endif
    204191 
    205192  /// encoder estimation - inter prediction (non-skip)
Note: See TracChangeset for help on using the changeset viewer.