From 33dae9297bfc374c59aee9dd8a426c9ab9b2682b Mon Sep 17 00:00:00 2001
From: Philippe Bordes <philippe.bordes@interdigital.com>
Date: Tue, 19 Oct 2021 15:58:11 +0000
Subject: [PATCH] Pps for clip mv intra constraint
---
source/Lib/CommonLib/TrQuant.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/Lib/CommonLib/TrQuant.cpp b/source/Lib/CommonLib/TrQuant.cpp
index 3be3938ad..ce6634820 100644
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -487,7 +487,7 @@ void clipMvIntraConstraint(CodingUnit* pcCU, int regionId, int& iHorMin, int& iH
int iBlkHeight = uiBlkHeight;
if (regionId == 0) //above outside LCU
{
- iHorMax = std::min((iCurrX + searchRangeWidth) << iMvShift, (int)((pcCU->cs->sps->getMaxPicWidthInLumaSamples() - iBlkWidth) << iMvShift));
+ iHorMax = std::min((iCurrX + searchRangeWidth) << iMvShift, (int)((pcCU->cs->pps->getPicWidthInLumaSamples() - iBlkWidth) << iMvShift) );
iHorMin = std::max((iTemplateSize) << iMvShift, (iCurrX - searchRangeWidth) << iMvShift);
iVerMax = (iCurrY - iBlkHeight - offsetLCUY) << iMvShift;
@@ -516,7 +516,7 @@ void clipMvIntraConstraint(CodingUnit* pcCU, int regionId, int& iHorMin, int& iH
iHorMin = std::max((iTemplateSize) << iMvShift, (iCurrX - searchRangeWidth) << iMvShift);
iHorMax = (iCurrX - offsetLCUX - iBlkWidth) << iMvShift;
iVerMin = (iCurrY + 1) << iMvShift;
- iVerMax = std::min(pcCU->cs->sps->getMaxPicHeightInLumaSamples() - iBlkHeight, (iCurrY - offsetLCUY + pcCU->cs->sps->getCTUSize() - iBlkHeight) << iMvShift);
+ iVerMax = std::min(pcCU->cs->pps->getPicHeightInLumaSamples() - iBlkHeight, (iCurrY - offsetLCUY + pcCU->cs->sps->getCTUSize() - iBlkHeight) << iMvShift);
iHorMin = iHorMin - iCurrX;
iHorMax = iHorMax - iCurrX;
--
GitLab