Changeset 332 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecEntropy.h


Ignore:
Timestamp:
21 Apr 2013, 19:13:11 (11 years ago)
Author:
tech
Message:

Merged branch 6.1-Cleanup@329.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecEntropy.h

    r296 r332  
    7272  virtual Void  parseVPS                  ( TComVPS* pcVPS )                       = 0;
    7373#endif
    74 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
     74#if HHI_MPI || H3D_QTL
    7575  virtual Void  parseSPS                  ( TComSPS* pcSPS, Bool bIsDepth )                       = 0;
    7676#else
     
    171171#endif
    172172 
    173 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
     173#if HHI_MPI || H3D_QTL
    174174  Void    decodeSPS                   ( TComSPS* pcSPS, Bool bIsDepth ) { m_pcEntropyDecoderIf->parseSPS(pcSPS, bIsDepth); }
    175175#else
     
    198198  Void decodeMergeFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    199199  Void decodeMergeIndex        ( TComDataCU* pcSubCU, UInt uiPartIdx, UInt uiPartAddr, PartSize eCUMode, UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, UInt uiDepth );
    200 #if H3D_IVRP && !MTK_MDIVRP_C0138
    201   Void decodeResPredFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU, UInt uiPUIdx );
    202 #endif
    203200  Void decodePredMode          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    204201  Void decodePartSize          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
Note: See TracChangeset for help on using the changeset viewer.