From 7dc8cb39a8694e42d26133b07a57631e5f255b58 Mon Sep 17 00:00:00 2001
From: Kyungyong Kim <kyungyong.kim@wilusgroup.com>
Date: Wed, 1 Feb 2023 17:46:02 +0000
Subject: [PATCH] Cleanup about directional planar
---
source/Lib/CommonLib/TrQuant.cpp | 8 ++++----
source/Lib/CommonLib/UnitTools.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/Lib/CommonLib/TrQuant.cpp b/source/Lib/CommonLib/TrQuant.cpp
index 62f0e3a2e..3adb8c795 100644
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -548,7 +548,7 @@ void TrQuant::xInvLfnst( const TransformUnit &tu, const ComponentID compID )
CHECK( intraMode >= NUM_INTRA_MODE - 1, "Invalid intra mode" );
#if JVET_AC0105_DIRECTIONAL_PLANAR
- if (intraMode == PLANAR_IDX)
+ if (compID == COMPONENT_Y && intraMode == PLANAR_IDX)
{
if (tu.cu->plIdx == 2)
{
@@ -815,7 +815,7 @@ void TrQuant::xFwdLfnst( const TransformUnit &tu, const ComponentID compID, cons
CHECK( intraMode >= NUM_INTRA_MODE - 1, "Invalid intra mode" );
#if JVET_AC0105_DIRECTIONAL_PLANAR
- if (intraMode == PLANAR_IDX)
+ if (compID == COMPONENT_Y && intraMode == PLANAR_IDX)
{
if (tu.cu->plIdx == 2)
{
@@ -1253,7 +1253,7 @@ void TrQuant::getTrTypes(const TransformUnit tu, const ComponentID compID, int &
CHECK(predMode < -(NUM_EXT_LUMA_MODE >> 1) || predMode >= NUM_LUMA_MODE + (NUM_EXT_LUMA_MODE >> 1), "luma mode out of range");
predMode = (predMode < 0) ? 2 : (predMode >= NUM_LUMA_MODE) ? 66 : predMode;
#if JVET_AC0105_DIRECTIONAL_PLANAR
- if (predMode == PLANAR_IDX)
+ if (compID == COMPONENT_Y && predMode == PLANAR_IDX)
{
if (tu.cu->plIdx == 2)
{
@@ -2656,7 +2656,7 @@ int TrQuant::getLfnstIdx(const TransformUnit &tu, ComponentID compID)
}
#endif
#if JVET_AC0105_DIRECTIONAL_PLANAR
- if (intraMode == PLANAR_IDX)
+ if (compID == COMPONENT_Y && intraMode == PLANAR_IDX)
{
if (tu.cu->plIdx == 2)
{
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index fb69f5fb3..fd898d5c2 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -17874,7 +17874,7 @@ uint32_t PU::getFinalIntraModeForTransform( const TransformUnit &tu, const Compo
}
#endif
#if JVET_AC0105_DIRECTIONAL_PLANAR
- if (intraMode == PLANAR_IDX)
+ if (compID == COMPONENT_Y && intraMode == PLANAR_IDX)
{
if (tu.cu->plIdx == 2)
{
--
GitLab