Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/App/TAppDecoder/TAppDecTop.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/App/TAppDecoder/TAppDecTop.cpp (modified) (7 diffs)

branches/HTM-16.2-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -405 +405 @@
   // initialize global variables
   initROM();
-#if NH_3D_DMM
+#if NH_3D
   initWedgeLists();
 #endif
@@ -474 +474 @@
   m_cTDecTop.init();
   m_cTDecTop.setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
+#if MCTS_ENC_CHECK
+  m_cTDecTop.setTMctsCheckEnabled(m_tmctsCheck);
+#endif
 #if O0043_BEST_EFFORT_DECODING
   m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth);
@@ -1262 +1265 @@
     m_vps->printLayerSets();
     m_vps->printPTL();
+    m_vps->printRepFormat();
   }
 }
@@ -2223 +2227 @@
   ////////////////////////////////////////////////////////////////////////////////
 
-  const TComDpbSize* dpbSize = m_vps->getDpbSize();
-  m_maxNumReorderPics       = dpbSize->getMaxVpsNumReorderPics      ( m_targetOptLayerSetIdx, m_highestTid );
-  m_maxLatencyIncreasePlus1 = dpbSize->getMaxVpsLatencyIncreasePlus1( m_targetOptLayerSetIdx, m_highestTid );
-  m_maxLatencyValue         = dpbSize->getVpsMaxLatencyPictures     ( m_targetOptLayerSetIdx, m_highestTid );
-
-  for(Int i = 0; i < MAX_NUM_LAYER_IDS; i++)
-  {
-    m_maxDecPicBufferingMinus1[ i ] = MIN_INT;
-  }
-  for( Int i = 0; i <= m_vps->getMaxLayersMinus1(); i++ )
-  {
-    Int currLayerId = m_vps->getLayerIdInNuh( i );
-    for(Int layerIdx = 0 ; layerIdx < m_vps->getNumLayersInIdList( m_targetDecLayerSetIdx); layerIdx++ )
-    {
-      if( m_vps->getLayerSetLayerIdList( m_targetDecLayerSetIdx, layerIdx ) == currLayerId )
-      {
-        m_maxDecPicBufferingMinus1[currLayerId] = dpbSize->getMaxVpsDecPicBufferingMinus1( m_targetDecLayerSetIdx, layerIdx, m_highestTid );
+  // According to spec, no dbpSize values are given for OLS 0, however they are used in F.13.5.2.1. 
+  // This might be an issue of the spec. As workaround use sps for OLS 0 here.
+
+  if ( m_targetOptLayerSetIdx == 0 )
+  { 
+    m_maxNumReorderPics            = m_sps->getSpsMaxNumReorderPics      ( m_highestTid );
+    m_maxLatencyIncreasePlus1      = m_sps->getSpsMaxLatencyIncreasePlus1( m_highestTid );
+    m_maxLatencyValue              = m_sps->getSpsMaxLatencyPictures     ( m_highestTid );
+    m_maxDecPicBufferingMinus1[0]  = m_sps->getMaxDecPicBuffering        ( m_highestTid );
+  }
+  else
+  {
+    const TComDpbSize* dpbSize = m_vps->getDpbSize();
+    m_maxNumReorderPics       = dpbSize->getMaxVpsNumReorderPics      ( m_targetOptLayerSetIdx, m_highestTid );
+    m_maxLatencyIncreasePlus1 = dpbSize->getMaxVpsLatencyIncreasePlus1( m_targetOptLayerSetIdx, m_highestTid );
+    m_maxLatencyValue         = dpbSize->getVpsMaxLatencyPictures     ( m_targetOptLayerSetIdx, m_highestTid );
+
+    for(Int i = 0; i < MAX_NUM_LAYER_IDS; i++)
+    {
+      m_maxDecPicBufferingMinus1[ i ] = MIN_INT;
+    }
+    for( Int i = 0; i <= m_vps->getMaxLayersMinus1(); i++ )
+    {
+      Int currLayerId = m_vps->getLayerIdInNuh( i );
+      for(Int layerIdx = 0 ; layerIdx < m_vps->getNumLayersInIdList( m_targetDecLayerSetIdx); layerIdx++ )
+      {
+        if( m_vps->getLayerSetLayerIdList( m_targetDecLayerSetIdx, layerIdx ) == currLayerId )
+        {
+          m_maxDecPicBufferingMinus1[currLayerId] = dpbSize->getMaxVpsDecPicBufferingMinus1( m_targetDecLayerSetIdx, layerIdx, m_highestTid );
+        }
       }
     }
@@ -2673 +2690 @@
     m_tDecTop[ decIdx ]->setLayerId( layerId );
     m_tDecTop[ decIdx ]->setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
+#if MCTS_ENC_CHECK
+    m_tDecTop[ decIdx ]->setTMctsCheckEnabled( m_tmctsCheck );
+#endif
     m_tDecTop[ decIdx ]->setDpb( &m_dpb );
     m_tDecTop[ decIdx ]->setTargetOlsIdx( m_targetOptLayerSetIdx );
@@ -2678 +2698 @@
     m_tDecTop[ decIdx ]->setPocDecrementedInDPBFlag   ( m_pocDecrementedInDpbFlag    );
     m_tDecTop[ decIdx ]->setLastPresentPocResetIdc    ( m_lastPresentPocResetIdc );
-
-
 #if O0043_BEST_EFFORT_DECODING
     m_cTDecTop[ decIdx ]->setForceDecodeBitDepth(m_forceDecodeBitDepth);