From 8fcbf9af411187948a6583fe1b5c592def6ee71a Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Mon, 4 Feb 2019 08:47:49 -0500
Subject: [PATCH] Fix #155: Don't set GBiIdx too early
---
source/Lib/CommonLib/UnitTools.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 8768b5ade..a491122ee 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -1092,9 +1092,6 @@ bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter
#endif
#endif
mrgCtx.interDirNeighbours[cnt] = miNeighbor.interDir;
-#if JVET_M0264_HMVP_WITH_GBIIDX
- mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? miNeighbor.GBiIdx : GBI_DEFAULT;
-#endif
mrgCtx.mvFieldNeighbours[cnt << 1].setMvField(miNeighbor.mv[0], miNeighbor.refIdx[0]);
if (slice.isInterB())
{
@@ -1109,6 +1106,9 @@ bool PU::addMergeHMVPCand(const Slice &slice, MergeCtx& mrgCtx, bool isCandInter
#if !JVET_L0090_PAIR_AVG
isCandInter[cnt] = true;
#endif
+#if JVET_M0264_HMVP_WITH_GBIIDX
+ mrgCtx.GBiIdx[cnt] = (mrgCtx.interDirNeighbours[cnt] == 3) ? miNeighbor.GBiIdx : GBI_DEFAULT;
+#endif
#if JVET_M0483_IBC==0
if (miNeighbor.interDir == 1 && slice.getRefPic(REF_PIC_LIST_0, miNeighbor.refIdx[0])->getPOC() == slice.getPOC())
{
--
GitLab