From 005ca8c8761fe105a2e7f0ce55171c33dbcea5b1 Mon Sep 17 00:00:00 2001
From: Valeri George <valeri.george@hhi.fraunhofer.de>
Date: Wed, 20 Feb 2019 09:13:31 +0100
Subject: [PATCH] encoder global MCTS constraint variable removed
---
source/App/EncoderApp/EncAppCfg.cpp | 1 -
source/Lib/CommonLib/Rom.cpp | 3 ---
source/Lib/CommonLib/Rom.h | 3 ---
3 files changed, 7 deletions(-)
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 8a6a01371..b552158dd 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -2844,7 +2844,6 @@ bool EncAppCfg::xCheckParameter()
}
#if JVET_M0445_MCTS
- g_mctsEncConstraint = m_MCTSEncConstraint;
if ((m_MCTSEncConstraint) && (m_bLFCrossTileBoundaryFlag))
{
printf("Warning: Constrained Encoding for Motion Constrained Tile Sets (MCTS) is enabled. Disabling filtering across tile boundaries!\n");
diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp
index e9e873d57..8494ab1b8 100644
--- a/source/Lib/CommonLib/Rom.cpp
+++ b/source/Lib/CommonLib/Rom.cpp
@@ -51,9 +51,6 @@
#if ENABLE_TRACING
CDTrace *g_trace_ctx = NULL;
#endif
-#if JVET_M0445_MCTS
-bool g_mctsEncConstraint = false;
-#endif
#if JVET_M0445_MCTS_DEC_CHECK
bool g_mctsDecCheckEnabled = false;
#endif
diff --git a/source/Lib/CommonLib/Rom.h b/source/Lib/CommonLib/Rom.h
index 712092901..4feac253d 100644
--- a/source/Lib/CommonLib/Rom.h
+++ b/source/Lib/CommonLib/Rom.h
@@ -262,9 +262,6 @@ extern const uint8_t g_triangleCombination[TRIANGLE_MAX_NUM_CANDS][3];
extern const uint8_t g_triangleIdxBins[TRIANGLE_MAX_NUM_CANDS];
#endif
-#if JVET_M0445_MCTS
-extern bool g_mctsEncConstraint;
-#endif
#if JVET_M0445_MCTS_DEC_CHECK
extern bool g_mctsDecCheckEnabled;
#endif
--
GitLab