Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecTop.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/TDecTop.cpp (modified) (18 diffs)

branches/HTM-16.2-dev/source/Lib/TLibDecoder/TDecTop.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 "NALread.h"
 #include "TDecTop.h"
+#include "TDecConformance.h"
+
 #if NH_MV
 ParameterSetManager TDecTop::m_parameterSetManager;
@@ -227 +229 @@
   }
 
-#if !H_3D_FCO
   if ( pcSlice->getIsDepth())
   {
     return;
   }
-#endif
 
   Int curPoc = pcSlice->getPOC();
@@ -376 +376 @@
   , m_warningMessageSkipPicture(false)
 #endif
+#if MCTS_ENC_CHECK
+  , m_tmctsCheckEnabled(false)
+#endif
   , m_prefixSEINALUs()
 {
@@ -471 +474 @@
 #endif
   m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO);
-  m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
+  m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder, &m_conformanceCheck );
+#if MCTS_ENC_CHECK
+  m_cEntropyDecoder.init(&m_cPrediction, &m_conformanceCheck );
+#else
   m_cEntropyDecoder.init(&m_cPrediction);
+#endif
 }
 
@@ -506 +513 @@
     rpcPic = new TComPic();
 
+#if REDUCED_ENCODER_MEMORY
+    rpcPic->create ( sps, pps, false, true);
+#else
     rpcPic->create ( sps, pps, true);
+#endif
 
     m_cListPic.pushBack( rpcPic );
@@ -543 +554 @@
   }
   rpcPic->destroy();
+#if REDUCED_ENCODER_MEMORY
+  rpcPic->create ( sps, pps, false, true);
+#else
   rpcPic->create ( sps, pps, true);
+#endif
 }
 
@@ -692 +707 @@
 
     xParsePrefixSEImessages();
+#if MCTS_ENC_CHECK
+    xAnalysePrefixSEImessages();
+#endif
 
 #if RExt__HIGH_BIT_DEPTH_SUPPORT==0
@@ -726 +744 @@
     sps=pSlice->getSPS();
 
-#if NH_MV
+#if NH_MV    
     pSlice->setPic( m_pcPic );
     vps=pSlice->getVPS();
@@ -772 +790 @@
     // Recursive structure
     m_cCuDecoder.create ( sps->getMaxTotalCUDepth(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getChromaFormatIdc() );
+#if MCTS_ENC_CHECK
+    m_cCuDecoder.init   ( &m_cEntropyDecoder, &m_cTrQuant, &m_cPrediction, &m_conformanceCheck );
+#else
     m_cCuDecoder.init   ( &m_cEntropyDecoder, &m_cTrQuant, &m_cPrediction );
+#endif
     m_cTrQuant.init     ( sps->getMaxTrSize() );
 
@@ -807 +829 @@
     xParsePrefixSEImessages();
 
+#if MCTS_ENC_CHECK
+    xAnalysePrefixSEImessages();
+#endif
     // Check if any new SEI has arrived
     if(!m_SEIs.empty())
@@ -845 +870 @@
   }
 }
+
+#if MCTS_ENC_CHECK
+Void TDecTop::xAnalysePrefixSEImessages()
+{
+  if (m_tmctsCheckEnabled)
+  {
+    SEIMessages mctsSEIs = getSeisByType(m_SEIs, SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS);
+    for (SEIMessages::iterator it = mctsSEIs.begin(); it != mctsSEIs.end(); it++)
+    {
+      SEITempMotionConstrainedTileSets *mcts = (SEITempMotionConstrainedTileSets*)(*it);
+      if (!mcts->m_each_tile_one_tile_set_flag)
+      {
+        printf("cannot (yet) check Temporal constrained MCTS if each_tile_one_tile_set_flag is not enabled\n");
+        exit(1);
+      }
+      else
+      {
+        printf("MCTS check enabled!\n");
+        m_conformanceCheck.enableTMctsCheck(true);
+      }
+    }
+  }
+}
+#endif
+
 
 #if !NH_MV
@@ -1023 +1073 @@
   xActivateParameterSets();
 
+
+
+  TComSlice* pcSlice = m_pcPic->getPicSym()->getSlice(m_uiSliceIdx);
+
+  if (TDecConformanceCheck::doChecking())
+  {
+    m_conformanceCheck.checkSliceActivation(*pcSlice, nalu, *m_pcPic, m_bFirstSliceInBitstream, m_bFirstSliceInSequence, m_bFirstSliceInPicture);
+  }
+
   m_bFirstSliceInSequence = false;
   m_bFirstSliceInBitstream  = false;
-
-
-  TComSlice* pcSlice = m_pcPic->getPicSym()->getSlice(m_uiSliceIdx);
 
 #endif
@@ -1105 +1161 @@
         }
       }
-#if NH_3D_NBDV
+#if NH_3D
       pcSlice->setDefaultRefView();
-#endif
-#if NH_3D_ARP
       pcSlice->setPocsInCurrRPSs();
       pcSlice->setARPStepNum(m_dpb);
@@ -1155 +1209 @@
       //---------------
       pcSlice->setRefPOCList();
-#if  NH_3D_TMVP
+#if  NH_3D
       if(pcSlice->getLayerId())
       {
@@ -1253 +1307 @@
   pps->setLayerId( getLayerId() );
 #endif
-#if NH_3D_DLT
+#if NH_3D
   // create mapping from depth layer indexes to layer ids
   Int j=0;
@@ -1863 +1917 @@
     {
       Int profileIdc = vps->getPTL( vps->getProfileTierLevelIdx( m_targetOlsIdx, lIdx ) )->getGeneralPTL()->getProfileIdc();
-      assert( profileIdc == 1 || profileIdc == 6 || profileIdc == 8 );
-
-      if (  profileIdc == 6 )
+
+#if !NH_MV_ALLOW_NON_CONFORMING
+      assert( profileIdc == Profile::MAIN || profileIdc == Profile::MULTIVIEWMAIN|| profileIdc == Profile::MAIN3D );
+#else
+      assert( profileIdc == Profile::MAIN || profileIdc == Profile::MAIN10 || profileIdc == Profile::MULTIVIEWMAIN|| profileIdc == Profile::MAIN3D || profileIdc == Profile::NONE || profileIdc == Profile::MULTIVIEWMAIN_NONCONFORMING || profileIdc == Profile::MAIN3D_NONCONFORMING  );
+#endif 
+
+      if (   profileIdc == Profile::MULTIVIEWMAIN
+#if NH_MV_ALLOW_NON_CONFORMING
+      ||     profileIdc == Profile::MULTIVIEWMAIN_NONCONFORMING
+#endif
+        )
       {
         m_decodingProcess = ANNEX_G;
@@ -1873 +1936 @@
         m_decodingProcess = ANNEX_H;
       }
-      else if (profileIdc == 8 )
+      else if (profileIdc == Profile::MAIN3D 
+#if NH_MV_ALLOW_NON_CONFORMING
+      ||     profileIdc == Profile::MAIN3D_NONCONFORMING
+#endif  
+        )
       {
         m_decodingProcess = ANNEX_I;