Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecCu.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecCu.h (modified) (7 diffs)

branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecCu.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -45 +45 @@
 #include "TLibCommon/TComTrQuant.h"
 #include "TDecEntropy.h"
+#include "TDecConformance.h"
 
 //! \ingroup TLibDecoder
@@ -62 +63 @@
   TComDataCU**        m_ppcCU;            ///< CU data array
 
-#if NH_3D_DBBP
+#if NH_3D
   TComYuv**           m_ppcYuvRecoDBBP;
 #endif
@@ -70 +71 @@
   TComPrediction*     m_pcPrediction;
   TDecEntropy*        m_pcEntropyDecoder;
+#if MCTS_ENC_CHECK
+  TDecConformanceCheck* m_pConformanceCheck;
+#endif
 
   Bool                m_bDecodeDQP;
@@ -79 +83 @@
 
   /// initialize access channels
+#if MCTS_ENC_CHECK
+  Void  init                    (TDecEntropy* pcEntropyDecoder, TComTrQuant* pcTrQuant, TComPrediction* pcPrediction, TDecConformanceCheck* pConformanceCheck);
+#else
   Void  init                    ( TDecEntropy* pcEntropyDecoder, TComTrQuant* pcTrQuant, TComPrediction* pcPrediction );
+#endif
 
   /// create internal buffers
@@ -102 +110 @@
   Void xReconInter              ( TComDataCU* pcCU, UInt uiDepth );
 
-#if NH_3D_DBBP
+#if NH_3D
   Void xReconInterDBBP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
@@ -124 +132 @@
   Void xFillPCMBuffer           (TComDataCU* pCU, UInt depth);
 
-#if NH_3D_DIS
+#if NH_3D
   Void xReconDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
-#if NH_3D_SDC_INTRA
   Void xReconIntraSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
-#if NH_3D_SDC_INTER
   Void xReconInterSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif