Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCu.h


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

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

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    4545#include "TLibCommon/TComTrQuant.h"
    4646#include "TDecEntropy.h"
     47#include "TDecConformance.h"
    4748
    4849//! \ingroup TLibDecoder
     
    6263  TComDataCU**        m_ppcCU;            ///< CU data array
    6364
    64 #if NH_3D_DBBP
     65#if NH_3D
    6566  TComYuv**           m_ppcYuvRecoDBBP;
    6667#endif
     
    7071  TComPrediction*     m_pcPrediction;
    7172  TDecEntropy*        m_pcEntropyDecoder;
     73#if MCTS_ENC_CHECK
     74  TDecConformanceCheck* m_pConformanceCheck;
     75#endif
    7276
    7377  Bool                m_bDecodeDQP;
     
    7983
    8084  /// initialize access channels
     85#if MCTS_ENC_CHECK
     86  Void  init                    (TDecEntropy* pcEntropyDecoder, TComTrQuant* pcTrQuant, TComPrediction* pcPrediction, TDecConformanceCheck* pConformanceCheck);
     87#else
    8188  Void  init                    ( TDecEntropy* pcEntropyDecoder, TComTrQuant* pcTrQuant, TComPrediction* pcPrediction );
     89#endif
    8290
    8391  /// create internal buffers
     
    102110  Void xReconInter              ( TComDataCU* pcCU, UInt uiDepth );
    103111
    104 #if NH_3D_DBBP
     112#if NH_3D
    105113  Void xReconInterDBBP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    106114#endif
     
    124132  Void xFillPCMBuffer           (TComDataCU* pCU, UInt depth);
    125133
    126 #if NH_3D_DIS
     134#if NH_3D
    127135  Void xReconDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    128 #endif
    129 #if NH_3D_SDC_INTRA
    130136  Void xReconIntraSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    131 #endif
    132 #if NH_3D_SDC_INTER
    133137  Void xReconInterSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    134138#endif
Note: See TracChangeset for help on using the changeset viewer.