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

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/TDecSlice.cpp (modified) (6 diffs)

branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -37 +37 @@
 
 #include "TDecSlice.h"
+#include "TDecConformance.h"
 
 //! \ingroup TLibDecoder
@@ -61 +62 @@
 }
 
-Void TDecSlice::init(TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder)
+Void TDecSlice::init(TDecEntropy* pcEntropyDecoder, TDecCu* pcCuDecoder, TDecConformanceCheck *pDecConformanceCheck)
 {
   m_pcEntropyDecoder  = pcEntropyDecoder;
   m_pcCuDecoder       = pcCuDecoder;
+  m_pDecConformanceCheck = pDecConformanceCheck;
 }
 
@@ -130 +132 @@
     }
   }
-#if  NH_3D_DLT
+#if  NH_3D
   if( pcSlice->getPPS()->getDLT() != NULL )
   {
@@ -186 +188 @@
 #endif
 
+#if DECODER_PARTIAL_CONFORMANCE_CHECK != 0
+    const UInt numRemainingBitsPriorToCtu=ppcSubstreams[uiSubStrm]->getNumBitsLeft();
+#endif
+
     if ( pcSlice->getSPS()->getUseSAO() )
     {
@@ -224 +230 @@
 
     m_pcCuDecoder->decodeCtu     ( pCtu, isLastCtuOfSliceSegment );
+
+#if DECODER_PARTIAL_CONFORMANCE_CHECK != 0
+    const UInt numRemainingBitsPostCtu=ppcSubstreams[uiSubStrm]->getNumBitsLeft(); // NOTE: Does not account for changes in buffered bits in CABAC decoder, although it's probably good enough.
+    if (TDecConformanceCheck::doChecking() && m_pDecConformanceCheck)
+    {
+      m_pDecConformanceCheck->checkCtuDecoding(numRemainingBitsPriorToCtu-numRemainingBitsPostCtu);
+    }
+#endif
+
     m_pcCuDecoder->decompressCtu ( pCtu );