From d9ed26599df9cf65bf69773c23e9ce25a97c61e2 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Tue, 27 Oct 2020 23:28:58 +0100
Subject: [PATCH] Fix merge conflict
---
source/App/DecoderApp/DecApp.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 1991d5e7f..e2fa972b0 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -382,11 +382,19 @@ uint32_t DecApp::decode()
}
}
#if JVET_S0078_NOOUTPUTPRIORPICFLAG
+#if JVET_S0163_ON_TARGETOLS_SUBLAYERS
+ if ((nalu.m_nalUnitType >= NAL_UNIT_CODED_SLICE_TRAIL && nalu.m_nalUnitType <= NAL_UNIT_OPI)
+ || (nalu.m_nalUnitType >= NAL_UNIT_CODED_SLICE_IDR_W_RADL && nalu.m_nalUnitType <= NAL_UNIT_CODED_SLICE_GDR))
+ {
+ firstSliceInAU = false;
+ }
+#else
if ((nalu.m_nalUnitType >= NAL_UNIT_CODED_SLICE_TRAIL && nalu.m_nalUnitType <= NAL_UNIT_RESERVED_IRAP_VCL_12)
|| (nalu.m_nalUnitType >= NAL_UNIT_CODED_SLICE_IDR_W_RADL && nalu.m_nalUnitType <= NAL_UNIT_CODED_SLICE_GDR))
{
firstSliceInAU = false;
}
+#endif
#endif
if( bNewPicture )
{
--
GitLab