From d973020b3b384b70b142a4d36a92b90b28d937f6 Mon Sep 17 00:00:00 2001
From: zhangkai <zhangkai.video@bytedance.com>
Date: Mon, 27 Jan 2020 18:12:05 -0800
Subject: [PATCH] Fix the compiling issues in gcc
---
source/App/Parcat/parcat.cpp | 8 +++++++-
source/Lib/EncoderLib/EncLib.cpp | 1 -
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/source/App/Parcat/parcat.cpp b/source/App/Parcat/parcat.cpp
index 08a1b1d39..87f8a6e62 100644
--- a/source/App/Parcat/parcat.cpp
+++ b/source/App/Parcat/parcat.cpp
@@ -393,7 +393,13 @@ std::vector<uint8_t> filter_segment(const std::vector<uint8_t> & v, int idx, int
idr_found = true;
}
- if( ( idx > 1 && ( nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP ) ) || ( ( idx > 1 && !idr_found ) && ( nalu_type == NAL_UNIT_DPS || nalu_type == NAL_UNIT_VPS || nalu_type == NAL_UNIT_SPS || nalu_type == NAL_UNIT_PPS || nalu_type == NAL_UNIT_PREFIX_APS || nalu_type == NAL_UNIT_SUFFIX_APS || nalu_type == NAL_UNIT_PH || nalu_type == NAL_UNIT_ACCESS_UNIT_DELIMITER ) )
+ if( ( idx > 1 && ( nalu_type == NAL_UNIT_CODED_SLICE_IDR_W_RADL || nalu_type == NAL_UNIT_CODED_SLICE_IDR_N_LP ) ) || ( ( idx > 1 && !idr_found )
+#if JVET_Q0117_PARAMETER_SETS_CLEANUP
+ && ( nalu_type == NAL_UNIT_DCI
+#else
+ && ( nalu_type == NAL_UNIT_DPS
+#endif
+ || nalu_type == NAL_UNIT_VPS || nalu_type == NAL_UNIT_SPS || nalu_type == NAL_UNIT_PPS || nalu_type == NAL_UNIT_PREFIX_APS || nalu_type == NAL_UNIT_SUFFIX_APS || nalu_type == NAL_UNIT_PH || nalu_type == NAL_UNIT_ACCESS_UNIT_DELIMITER ) )
|| (nalu_type == NAL_UNIT_SUFFIX_SEI && skip_next_sei))
{
}
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index a4b469c63..0f73677b9 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -243,7 +243,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
=======
#if JVET_Q0117_PARAMETER_SETS_CLEANUP
- int dciId = getDCIEnabled() ? 1 : 0;
xInitDCI(m_dci, sps0);
#else
>>>>>>> effa8e16... Commit Q0117. HLS clenup: DPS is changed to DCI
--
GitLab