From b435919eebe7ed14f9ee9d1e04cee9378f43b832 Mon Sep 17 00:00:00 2001
From: zhipin <zhipin.deng@bytedance.com>
Date: Sat, 23 May 2020 13:14:41 +0800
Subject: [PATCH] fix a bug
---
source/Lib/CommonLib/InterPrediction.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index ac3ac1fea..4adf3ac3c 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -476,11 +476,7 @@ void InterPrediction::xPredInterUni(const PredictionUnit& pu, const RefPicList&
if( !pu.cu->affine )
{
-#if JVET_R0058
- if (!isIBC)
-#else
if( !isIBC && pu.cu->slice->getRefPic( eRefPicList, iRefIdx )->isRefScaled( pu.cs->pps ) == false )
-#endif
{
#if JVET_Q0764_WRAP_AROUND_WITH_RPR
if( !pu.cs->pps->getWrapAroundEnabledFlag() )
@@ -1099,9 +1095,7 @@ void InterPrediction::xPredAffineBlk(const ComponentID &compID, const Prediction
{
wrapRef = false;
m_storedMv[h / AFFINE_MIN_BLOCK_SIZE * MVBUFFER_SIZE + w / AFFINE_MIN_BLOCK_SIZE].set(iMvScaleTmpHor, iMvScaleTmpVer);
-#if !JVET_R0058
if (refPic->isRefScaled(pu.cs->pps) == false)
-#endif
{
clipMv(tmpMv, pu.lumaPos(), pu.lumaSize(), *pu.cs->sps, *pu.cs->pps);
iMvScaleTmpHor = tmpMv.getHor();
@@ -1125,9 +1119,7 @@ void InterPrediction::xPredAffineBlk(const ComponentID &compID, const Prediction
else
{
wrapRef = false;
-#if !JVET_R0058
if (refPic->isRefScaled(pu.cs->pps) == false)
-#endif
{
clipMv(curMv, pu.lumaPos(), pu.lumaSize(), *pu.cs->sps, *pu.cs->pps);
}
--
GitLab