Changeset 1467 in SHVCSoftware

Timestamp:

26 Aug 2015, 19:34:17 (9 years ago)

Author:

seregin

Message:

enable check for SEI messages

File:

• branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -657 +657 @@
 #endif
   {
-    m_apcTDecTop[layer]->init();
-    m_apcTDecTop[layer]->setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
-#if CONFORMANCE_BITSTREAM_MODE
-    m_apcTDecTop[layer]->setNumLayer( MAX_LAYERS );
-#else
-    m_apcTDecTop[layer]->setNumLayer( m_tgtLayerId + 1 );
-#endif
-    m_apcTDecTop[layer]->setCommonDecoderParams( &m_commonDecoderParams );
-  }
-#if CONFORMANCE_BITSTREAM_MODE
-  for(UInt layer = 0; layer < MAX_VPS_LAYER_IDX_PLUS1; layer++)
-  {
-    m_apcTDecTop[layer]->setConfModeFlag( m_confModeFlag );
-  }
-#endif
-#else
+    TDecTop& m_cTDecTop = *m_apcTDecTop[layer];
+#endif
+
   m_cTDecTop.init();
   m_cTDecTop.setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
@@ -678 +665 @@
   m_cTDecTop.setForceDecodeBitDepth(m_forceDecodeBitDepth);
 #endif
+
   if (!m_outputDecodedSEIMessagesFilename.empty())
   {
@@ -683 +671 @@
     m_cTDecTop.setDecodedSEIMessageOutputStream(&os);
   }
-#endif
+
+#if SVC_EXTENSION  
+#if CONFORMANCE_BITSTREAM_MODE
+    m_cTDecTop.setNumLayer( MAX_LAYERS );
+#else
+    m_cTDecTop.setNumLayer( m_tgtLayerId + 1 );
+#endif
+    m_cTDecTop.setCommonDecoderParams( &m_commonDecoderParams );
+    m_cTDecTop.setConfModeFlag( m_confModeFlag );
+  }
+#endif
+
 #if Q0074_COLOUR_REMAPPING_SEI
   if (m_pcSeiColourRemappingInfoPrevious != NULL)