From 794d0ff507a31c7c7dec2ef04da53b3aad23eccc Mon Sep 17 00:00:00 2001
From: biaowang <biao.wang@huawei.com>
Date: Wed, 11 Mar 2020 22:46:30 +0100
Subject: [PATCH] fix nalu type, remove NAL_UNIT_RESERVED_VCL_15
---
source/Lib/CommonLib/TypeDef.h | 3 ---
source/Lib/DecoderLib/DecLib.cpp | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index e34f8cd35e..692348224a 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -1009,9 +1009,6 @@ enum NalUnitType
NAL_UNIT_RESERVED_IRAP_VCL_11,
NAL_UNIT_RESERVED_IRAP_VCL_12,
-#if JVET_P0124_MIXED_NALU
- NAL_UNIT_RESERVED_VCL_15,
-#endif
#if JVET_Q0117_PARAMETER_SETS_CLEANUP
NAL_UNIT_DCI, // 13
#else
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index 56e44261c1..228334a480 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -2797,7 +2797,7 @@ void DecLib::xCheckMixedNalUnit(Slice* pcSlice, SPS *sps, InputNALUnit &nalu)
{
num1stSetSlice++;
}
- else if ((naluType >= NAL_UNIT_CODED_SLICE_TRAIL && naluType <= NAL_UNIT_RESERVED_VCL_15) || naluType == NAL_UNIT_CODED_SLICE_GDR)
+ else if ((naluType >= NAL_UNIT_CODED_SLICE_TRAIL && naluType <= NAL_UNIT_RESERVED_VCL_6) || naluType == NAL_UNIT_CODED_SLICE_GDR)
{
num2ndSetSlice++;
}
--
GitLab