From 721a7a31bb84e3d4dafc4d2b47ca8fa32ae2c25c Mon Sep 17 00:00:00 2001
From: roberta <antoine.robert@interdigital.com>
Date: Fri, 25 Oct 2019 12:43:58 +0200
Subject: [PATCH] remove spatialCandPos
---
source/Lib/CommonLib/UnitTools.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index b13e6e2c9..c132b9816 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -757,7 +757,6 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
return;
}
-
// above
const PredictionUnit *puAbove = cs.getPURestricted(posRT.offset(0, -1), pu, pu.chType);
bool isAvailableB1 = puAbove && isDiffMER(pu, *puAbove) && pu.cu != puAbove->cu && CU::isIBC(*puAbove->cu);
@@ -790,8 +789,6 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
return;
}
- int spatialCandPos = cnt;
-
if (cnt != maxNumMergeCand)
{
#if !JVET_P0400_REMOVE_SHARED_MERGE_LIST
@@ -814,7 +811,6 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
}
}
-
while (cnt < maxNumMergeCand)
{
mrgCtx.mvFieldNeighbours[cnt * 2].setMvField(Mv(0, 0), MAX_NUM_REF);
@@ -827,7 +823,6 @@ void PU::getIBCMergeCandidates(const PredictionUnit &pu, MergeCtx& mrgCtx, const
}
mrgCtx.numValidMergeCand = cnt;
-
}
void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx,
@@ -1001,8 +996,6 @@ void PU::getInterMergeCandidates( const PredictionUnit &pu, MergeCtx& mrgCtx,
return;
}
- int spatialCandPos = cnt;
-
// above right
const PredictionUnit *puAboveRight = cs.getPURestricted( posRT.offset( 1, -1 ), pu, pu.chType );
--
GitLab