From 2abebb4c919c0730141aec2fc3e69c0d26a7a834 Mon Sep 17 00:00:00 2001
From: Taoran Lu <tlu@dolby.com>
Date: Mon, 1 Apr 2019 17:08:56 -0700
Subject: [PATCH] N0477 LMCS cleanup
---
source/Lib/CommonLib/TypeDef.h | 2 ++
source/Lib/DecoderLib/DecCu.cpp | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index bc1804254..117c27761 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
+#define JVET_N0477_LMCS_CLEANUP 1
+
#define JCTVC_Y0038_PARAMS 1
#define JVET_MMVD_OFF_MACRO 0
diff --git a/source/Lib/DecoderLib/DecCu.cpp b/source/Lib/DecoderLib/DecCu.cpp
index 04b10286a..30ee7bbb1 100644
--- a/source/Lib/DecoderLib/DecCu.cpp
+++ b/source/Lib/DecoderLib/DecCu.cpp
@@ -203,7 +203,11 @@ void DecCu::xIntraRecBlk( TransformUnit& tu, const ComponentID compID )
}
const Slice &slice = *cs.slice;
bool flag = slice.getReshapeInfo().getUseSliceReshaper() && (slice.isIntra() || (!slice.isIntra() && m_pcReshape->getCTUFlag()));
+#if JVET_N0477_LMCS_CLEANUP
+ if (flag && slice.getReshapeInfo().getSliceReshapeChromaAdj() && (compID != COMPONENT_Y) && (tu.cbf[COMPONENT_Cb] || tu.cbf[COMPONENT_Cr]))
+#else
if (flag && slice.getReshapeInfo().getSliceReshapeChromaAdj() && (compID != COMPONENT_Y))
+#endif
{
const Area area = tu.Y().valid() ? tu.Y() : Area(recalcPosition(tu.chromaFormat, tu.chType, CHANNEL_TYPE_LUMA, tu.blocks[tu.chType].pos()), recalcSize(tu.chromaFormat, tu.chType, CHANNEL_TYPE_LUMA, tu.blocks[tu.chType].size()));
const CompArea &areaY = CompArea(COMPONENT_Y, tu.chromaFormat, area);
@@ -571,7 +575,11 @@ void DecCu::xDecodeInterTexture(CodingUnit &cu)
{
CodingStructure &cs = *cu.cs;
const Slice &slice = *cs.slice;
+#if JVET_N0477_LMCS_CLEANUP
+ if (slice.getReshapeInfo().getUseSliceReshaper() && m_pcReshape->getCTUFlag() && slice.getReshapeInfo().getSliceReshapeChromaAdj() && (compID == COMPONENT_Y) && (currTU.cbf[COMPONENT_Cb] || currTU.cbf[COMPONENT_Cr]))
+#else
if (slice.getReshapeInfo().getUseSliceReshaper() && m_pcReshape->getCTUFlag() && slice.getReshapeInfo().getSliceReshapeChromaAdj() && (compID == COMPONENT_Y))
+#endif
{
const CompArea &areaY = currTU.blocks[COMPONENT_Y];
PelBuf predY = cs.getPredBuf(areaY);
--
GitLab