From f66eb4d2a16c89117dac6ecde595633db477cef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Le=20L=C3=A9annec?=
<fabrice.leleannec@interdigital.com>
Date: Tue, 21 May 2024 21:50:46 +0000
Subject: [PATCH] Fix: valgrind error in IntraPrediction::predChromaTM
---
source/Lib/CommonLib/IntraPrediction.cpp | 8 ++++----
source/Lib/CommonLib/UnitTools.cpp | 6 +++---
source/Lib/CommonLib/UnitTools.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index e642307b8..b2fd00716 100644
--- a/source/Lib/CommonLib/IntraPrediction.cpp
+++ b/source/Lib/CommonLib/IntraPrediction.cpp
@@ -11275,7 +11275,7 @@ void IntraPrediction::predChromaTM(const CompArea &areaCb, const CompArea &areaC
#endif
mvTop += mvCurr;
#if JVET_AD0208_IBC_ADAPT_FOR_CAM_CAPTURED_CONTENTS
- if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvTop, filterIdx, true, true))
+ if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvTop, line, filterIdx, true, true))
{
#if JVET_AA0070_RRIBC
if (pu.cu->rribcFlipType == 2)
@@ -11376,7 +11376,7 @@ void IntraPrediction::predChromaTM(const CompArea &areaCb, const CompArea &areaC
#endif
mvLeft += mvCurr;
#if JVET_AD0208_IBC_ADAPT_FOR_CAM_CAPTURED_CONTENTS
- if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvLeft, filterIdx, true, false))
+ if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvLeft, line, filterIdx, true, false))
{
#if JVET_AA0070_RRIBC
if (pu.cu->rribcFlipType == 1)
@@ -23571,7 +23571,7 @@ bool IntraPrediction::xCflmCreateChromaPred(const PredictionUnit& pu, const Comp
#endif
mvTop += mvCurr;
#if JVET_AD0208_IBC_ADAPT_FOR_CAM_CAPTURED_CONTENTS
- if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvTop, filterIdx, true, true))
+ if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvTop, tmpSize, filterIdx, true, true))
{
#if JVET_AA0070_RRIBC
if (pu.cu->rribcFlipType == 2)
@@ -23663,7 +23663,7 @@ bool IntraPrediction::xCflmCreateChromaPred(const PredictionUnit& pu, const Comp
#endif
mvLeft += mvCurr;
#if JVET_AD0208_IBC_ADAPT_FOR_CAM_CAPTURED_CONTENTS
- if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvLeft, filterIdx, true, false))
+ if (!PU::checkIsChromaBvCandidateValidChromaTm(pu, mvLeft, tmpSize, filterIdx, true, false))
{
#if JVET_AA0070_RRIBC
if (pu.cu->rribcFlipType == 1)
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 9a3d34e98..417e2bd8d 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -5634,11 +5634,11 @@ bool PU::checkIsChromaBvCandidateValid(const PredictionUnit &pu
#endif
#if JVET_AH0136_CHROMA_REORDERING
-bool PU::checkIsChromaBvCandidateValidChromaTm(const PredictionUnit &pu, const Mv mv, int filterIdx, bool isRefTemplate, bool isRefAbove)
+bool PU::checkIsChromaBvCandidateValidChromaTm(const PredictionUnit &pu, const Mv mv, const int tmpSize, int filterIdx, bool isRefTemplate, bool isRefAbove)
{
#if JVET_AD0208_IBC_ADAPT_FOR_CAM_CAPTURED_CONTENTS
- int roiWidth = (isRefTemplate && !isRefAbove) ? 2 : pu.Cb().width;
- int roiHeight = (isRefTemplate && isRefAbove) ? 2 : pu.Cb().height;
+ int roiWidth = (isRefTemplate && !isRefAbove) ? tmpSize : pu.Cb().width;
+ int roiHeight = (isRefTemplate && isRefAbove) ? tmpSize : pu.Cb().height;
uint32_t validType = checkValidBv(pu, COMPONENT_Cb, roiWidth, roiHeight, mv, true, filterIdx);
return validType != IBC_BV_INVALID;
#else
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index c4d63cbab..1ec488897 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -307,7 +307,7 @@ namespace PU
, bool isRefTemplate = false, bool isRefAbove = false);
#endif
#if JVET_AH0136_CHROMA_REORDERING
- bool checkIsChromaBvCandidateValidChromaTm(const PredictionUnit &pu, const Mv mv, int filterIdx = 0, bool isRefTemplate = false, bool isRefAbove = false);
+ bool checkIsChromaBvCandidateValidChromaTm(const PredictionUnit &pu, const Mv mv, const int tmpSize, int filterIdx = 0, bool isRefTemplate = false, bool isRefAbove = false);
#endif
int getWideAngle ( const TransformUnit &tu, const uint32_t dirMode, const ComponentID compID );
#if MULTI_PASS_DMVR || JVET_W0097_GPM_MMVD_TM
--
GitLab