From cb69cd7497fccf41c272adf6f582c766249fe961 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Wed, 21 Oct 2020 17:08:29 +0200
Subject: [PATCH] remove macro JVET_S0208_ASPECT6
---
source/Lib/CommonLib/Slice.cpp | 8 --------
source/Lib/CommonLib/TypeDef.h | 1 -
2 files changed, 9 deletions(-)
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index 4f6ad2688..3d2b000be 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2491,15 +2491,7 @@ VPS::~VPS()
void VPS::deriveOutputLayerSets()
{
-#if JVET_S0208_ASPECT6
if( m_vpsEachLayerIsAnOlsFlag || m_vpsOlsModeIdc < 2 )
-#else
- if( m_maxLayers == 1 )
- {
- m_totalNumOLSs = 1;
- }
- else if( m_vpsEachLayerIsAnOlsFlag || m_vpsOlsModeIdc < 2 )
-#endif
{
m_totalNumOLSs = m_maxLayers;
}
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 61156cead..86a159329 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -56,7 +56,6 @@
-#define JVET_S0208_ASPECT6 1 // JVET-S0208 aspect 6: Modify the derivation process for the variable TotalNumOlss by removing unnecessary text.
#define JVET_S0212_BITDEPTH_RANGE 1 // JVET-S0212 aspect 2: Specify a value range of 0..2 for vps_ols_dpb_bitdepth_minus8[ i ]. Also for sps_bitdepth_minus8[ i ]
--
GitLab