From ddcf658be3d50cf1fd4359fcbf20d59e64a10980 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Thu, 3 Oct 2019 12:43:24 +0200
Subject: [PATCH] Fix encapsulation of HEVC_SEI macro
---
source/App/EncoderApp/EncApp.cpp | 2 ++
source/App/EncoderApp/EncAppCfg.cpp | 2 +-
source/App/EncoderApp/EncAppCfg.h | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index d27bdee92..fdae7c868 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -535,7 +535,9 @@ void EncApp::xInitLibCfg()
m_cEncLib.setSOPDescriptionSEIEnabled ( m_SOPDescriptionSEIEnabled );
m_cEncLib.setScalableNestingSEIEnabled ( m_scalableNestingSEIEnabled );
m_cEncLib.setTMCTSSEIEnabled ( m_tmctsSEIEnabled );
+#endif
m_cEncLib.setMCTSEncConstraint ( m_MCTSEncConstraint);
+#if HEVC_SEI
m_cEncLib.setTimeCodeSEIEnabled ( m_timeCodeSEIEnabled );
m_cEncLib.setNumberOfTimeSets ( m_timeCodeSEINumTs );
for(int i = 0; i < m_timeCodeSEINumTs; i++)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index bd9d67a18..0ff2cf023 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -2257,6 +2257,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
}
+ #if HEVC_SEI
if( m_masteringDisplay.colourVolumeSEIEnabled )
{
for(uint32_t idx=0; idx<6; idx++)
@@ -2269,7 +2270,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
}
}
-#if HEVC_SEI
if( m_toneMappingInfoSEIEnabled && !m_toneMapCancelFlag )
{
if( m_toneMapModelId == 2 && !cfg_startOfCodedInterval.values.empty() )
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 27d236ae3..3e907d0b1 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -252,8 +252,10 @@ protected:
#if SHARP_LUMA_DELTA_QP
LumaLevelToDeltaQPMapping m_lumaLevelToDeltaQPMapping; ///< mapping from luma level to Delta QP.
#endif
+#if HEVC_SEI
SEIMasteringDisplay m_masteringDisplay;
-
+#endif
+
bool m_bUseAdaptiveQP; ///< Flag for enabling QP adaptation based on a psycho-visual model
int m_iQPAdaptationRange; ///< dQP range by QP adaptation
#if ENABLE_QPA
--
GitLab