From e3901771d61a75eee12a6c8ba9f68ec79354895a Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:08:59 +0200
Subject: [PATCH] remove macro JVET_P0125_ASPECT_TID_LAYER_ID_NUH
---
source/App/DecoderApp/DecApp.cpp | 2 --
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/DecoderLib/DecLib.cpp | 6 ------
source/Lib/DecoderLib/DecLib.h | 4 ----
4 files changed, 13 deletions(-)
diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 47ef9a4514..f74c65cf61 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -325,10 +325,8 @@ uint32_t DecApp::decode()
}
if(bNewAccessUnit)
{
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
m_cDecLib.checkTidLayerIdInAccessUnit();
m_cDecLib.resetAccessUnitSeiTids();
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
m_cDecLib.checkSEIInAccessUnit();
m_cDecLib.resetAccessUnitSeiPayLoadTypes();
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 1fb26426be..2db30318f0 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -65,7 +65,6 @@
-#define JVET_P0125_ASPECT_TID_LAYER_ID_NUH 1 // JVET-P0125: Aspects of constraints on TemporalId and nuh_layer_id
#define JVET_P0125_SEI_CONSTRAINTS 1 // JVET-P0125: 4th aspect: SEI constraints
#define JVET_Q0471_CHROMA_QT_SPLIT 1 // JVET-Q0471: Chroma QT split
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 2ae293705f..14dbf0469a 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -934,7 +934,6 @@ void DecLib::xCreateUnavailablePicture(int iUnavailablePoc, bool longTermFlag, c
}
}
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
void DecLib::checkTidLayerIdInAccessUnit()
{
int firstPicTid = m_accessUnitPicInfo.begin()->m_temporalId;
@@ -975,7 +974,6 @@ void DecLib::checkTidLayerIdInAccessUnit()
CHECK(!isFdNaluLayerIdSameAsVclNaluLayerId, "The nuh_layer_id of a filler data NAL unit shall be equal to the nuh_layer_id of associated VCL NAL unit");
}
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
void DecLib::checkSEIInAccessUnit()
{
@@ -1680,9 +1678,7 @@ void DecLib::xParsePrefixSEImessages()
while (!m_prefixSEINALUs.empty())
{
InputNALUnit &nalu=*m_prefixSEINALUs.front();
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
m_accessUnitSeiTids.push_back(nalu.m_temporalId);
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
const SPS *sps = m_parameterSetManager.getActiveSPS();
const VPS *vps = m_parameterSetManager.getVPS(sps->getVPSId());
@@ -2574,9 +2570,7 @@ bool DecLib::decode(InputNALUnit& nalu, int& iSkipFrame, int& iPOCLastDisplay)
case NAL_UNIT_SUFFIX_SEI:
if (m_pcPic)
{
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
m_accessUnitSeiTids.push_back(nalu.m_temporalId);
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
const SPS *sps = m_parameterSetManager.getActiveSPS();
const VPS *vps = m_parameterSetManager.getVPS(sps->getVPSId());
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 7c01db0d40..50798d0330 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -162,9 +162,7 @@ private:
std::vector<NalUnitInfo> m_nalUnitInfo[MAX_VPS_LAYERS];
#endif
std::vector<int> m_accessUnitApsNals;
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
std::vector<int> m_accessUnitSeiTids;
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
// NAL unit type, layer ID, and SEI payloadType
@@ -240,10 +238,8 @@ public:
void resetAccessUnitPicInfo() { m_accessUnitPicInfo.clear(); }
#endif
void resetAccessUnitApsNals() { m_accessUnitApsNals.clear(); }
-#if JVET_P0125_ASPECT_TID_LAYER_ID_NUH
void resetAccessUnitSeiTids() { m_accessUnitSeiTids.clear(); }
void checkTidLayerIdInAccessUnit();
-#endif
#if JVET_P0125_SEI_CONSTRAINTS
void resetAccessUnitSeiPayLoadTypes() { m_accessUnitSeiPayLoadTypes.clear(); }
void checkSEIInAccessUnit();
--
GitLab