Changeset 1374 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIEncoder.cpp

Timestamp:

9 Nov 2015, 21:13:05 (8 years ago)

Author:

tech

Message:

Macro cleanups.

File:

• branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIEncoder.cpp (modified) (2 diffs)

branches/HTM-15.2-dev/source/Lib/TLibEncoder/SEIEncoder.cpp

@@ -653 +653 @@
 
 #if NH_MV
-#if !NH_MV_SEI
-Void SEIEncoder::initSEISubBitstreamProperty(SEISubBitstreamProperty *seiSubBitstreamProperty, const TComSPS *sps)
-{
-  seiSubBitstreamProperty->m_activeVpsId = sps->getVPSId();
-  /* These values can be determined by the encoder; for now we will use the input parameter */  
-  seiSubBitstreamProperty->m_numAdditionalSubStreams = m_pcCfg->getNumAdditionalSubStreams();
-  seiSubBitstreamProperty->m_subBitstreamMode        = m_pcCfg->getSubBitstreamMode();
-  seiSubBitstreamProperty->m_outputLayerSetIdxToVps  = m_pcCfg->getOutputLayerSetIdxToVps();
-  seiSubBitstreamProperty->m_highestSublayerId       = m_pcCfg->getHighestSublayerId();
-  seiSubBitstreamProperty->m_avgBitRate              = m_pcCfg->getAvgBitRate();
-  seiSubBitstreamProperty->m_maxBitRate              = m_pcCfg->getMaxBitRate();  
-}
-#else
 Void SEIEncoder::createAnnexFGISeiMessages( SEIMessages& seiMessage, const TComSlice* slice )
 {
@@ -697 +684 @@
 }
 #endif
-#endif
 
 //! \}