From b93f00e2ba7d6fa63d5188574efdb10c4f928d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E8=B6=85=E9=80=B8?= <linchaoyi.cy@bytedance.com>
Date: Sat, 7 Jan 2023 23:24:28 +0800
Subject: [PATCH] remove the meaningless symbols
---
source/Lib/CommonLib/TypeDef.h | 3 ---
source/Lib/DecoderLib/SEIread.cpp | 4 +---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 43f79436c..4d34def36 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -55,12 +55,9 @@
// clang-format off
//########### place macros to be removed in next cycle below this line ###############
-<<<<<<< HEAD
#define JVET_AB0051 1 // JVET-AB0051: Modification of SEI processing order SEI message
#define JVET_AB0049 1 // JVET-AB0049: Modification of NNPFC
-=======
#define JVET_AB0050 1 // JVET-AB0050: Add two flags for NNPFA
->>>>>>> ab8d965b (AB0050: Add two flags for NNPFA)
#define JVET_T0056_SEI_MANIFEST 1 // JVET-T0056: SEI manifest SEI message
#define JVET_T0056_SEI_PREFIX_INDICATION 1 // JVET-T0056: SEI prefix indication SEI message
#define JVET_AB0069_SEI_PROCESSING_ORDER 1 // JVET-AB0069: SEI processing order SEI message update
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 076b97ba6..02a492f2b 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -2927,10 +2927,9 @@ void SEIReader::xParseSEINNPostFilterActivation(SEINeuralNetworkPostFilterActiva
sei_read_uvlc( pDecodedMessageOutputStream, val, "nnpfa_id" );
sei.m_id =val;
-<<<<<<< HEAD
#if JVET_AB0049
CHECK((sei.m_id >= 256 && sei.m_id <= 511) || (sei.m_id >= (1<<31) && sei.m_id <= MAX_NNPFA_ID), "Reserved nnpfa_id value, shall ignore the SEI message");
-=======
+#endif
#if JVET_AB0050
sei_read_flag( pDecodedMessageOutputStream, val, "nnpfa_cancel_flag" );
sei.m_cancelFlag = val;
@@ -2940,7 +2939,6 @@ void SEIReader::xParseSEINNPostFilterActivation(SEINeuralNetworkPostFilterActiva
sei_read_flag( pDecodedMessageOutputStream, val, "nnpfa_persistence_flag" );
sei.m_persistenceFlag = val;
}
->>>>>>> ab8d965b (AB0050: Add two flags for NNPFA)
#endif
}
--
GitLab