From 94d71abbabbced3a0dc0b2919fbf430881c2ef4d Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Fri, 17 Jan 2020 15:29:54 +0100
Subject: [PATCH] remove macro JVET_P1023_DMVR_BDOF_RP_CONDITION
---
source/Lib/CommonLib/InterPrediction.cpp | 8 --------
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/CommonLib/UnitTools.cpp | 19 -------------------
source/Lib/CommonLib/UnitTools.h | 3 ---
4 files changed, 31 deletions(-)
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index 6c96e7d12..f4d62bae3 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -535,11 +535,7 @@ void InterPrediction::xPredInterBi(PredictionUnit &pu, PelUnitBuf &pcYuvPred, co
const bool biocheck1 = !(pps.getUseWP() && slice.getSliceType() == P_SLICE);
if (biocheck0
&& biocheck1
-#if JVET_P1023_DMVR_BDOF_RP_CONDITION
&& PU::isBiPredFromDifferentDirEqDistPoc(pu)
-#else
- && PU::isBiPredFromDifferentDir(pu)
-#endif
&& (pu.Y().height >= 8)
&& (pu.Y().width >= 8)
&& ((pu.Y().height * pu.Y().width) >= 128)
@@ -1520,11 +1516,7 @@ void InterPrediction::motionCompensation( PredictionUnit &pu, PelUnitBuf &predBu
const bool biocheck1 = !(pps.getUseWP() && slice.getSliceType() == P_SLICE);
if (biocheck0
&& biocheck1
-#if JVET_P1023_DMVR_BDOF_RP_CONDITION
&& PU::isBiPredFromDifferentDirEqDistPoc(pu)
-#else
- && PU::isBiPredFromDifferentDir(pu)
-#endif
&& (pu.Y().height >= 8)
&& (pu.Y().width >= 8)
&& ((pu.Y().height * pu.Y().width) >= 128)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index d31f50acf..d26a0d6f9 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -126,7 +126,6 @@
-#define JVET_P1023_DMVR_BDOF_RP_CONDITION 1 // JVET_P1023: Reference picture conditions in DMVR and BDOF
#define JVET_P0162_REMOVE_ALF_CTB_FIRST_USE_APS_FLAG 1 // JVET-P0162: Removal of alf_ctb_use_first_aps_flag
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 691a2e34e..e9e528f47 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -3083,35 +3083,16 @@ void PU::applyImv( PredictionUnit& pu, MergeCtx &mrgCtx, InterPrediction *interP
PU::spanMotionInfo( pu, mrgCtx );
}
-#if !JVET_P1023_DMVR_BDOF_RP_CONDITION
-bool PU::isBiPredFromDifferentDir( const PredictionUnit& pu )
-{
- if ( pu.refIdx[0] >= 0 && pu.refIdx[1] >= 0 )
- {
- const int iPOC0 = pu.cu->slice->getRefPOC( REF_PIC_LIST_0, pu.refIdx[0] );
- const int iPOC1 = pu.cu->slice->getRefPOC( REF_PIC_LIST_1, pu.refIdx[1] );
- const int iPOC = pu.cu->slice->getPOC();
- if ( (iPOC - iPOC0)*(iPOC - iPOC1) < 0 )
- {
- return true;
- }
- }
-
- return false;
-}
-#endif
bool PU::isBiPredFromDifferentDirEqDistPoc(const PredictionUnit& pu)
{
if (pu.refIdx[0] >= 0 && pu.refIdx[1] >= 0)
{
-#if JVET_P1023_DMVR_BDOF_RP_CONDITION
if (pu.cu->slice->getRefPic(REF_PIC_LIST_0, pu.refIdx[0])->longTerm
|| pu.cu->slice->getRefPic(REF_PIC_LIST_1, pu.refIdx[1])->longTerm)
{
return false;
}
-#endif
const int poc0 = pu.cu->slice->getRefPOC(REF_PIC_LIST_0, pu.refIdx[0]);
const int poc1 = pu.cu->slice->getRefPOC(REF_PIC_LIST_1, pu.refIdx[1]);
const int poc = pu.cu->slice->getPOC();
diff --git a/source/Lib/CommonLib/UnitTools.h b/source/Lib/CommonLib/UnitTools.h
index e0a18c070..8cead3c5c 100644
--- a/source/Lib/CommonLib/UnitTools.h
+++ b/source/Lib/CommonLib/UnitTools.h
@@ -162,9 +162,6 @@ namespace PU
void setAllAffineMv ( PredictionUnit &pu, Mv affLT, Mv affRT, Mv affLB, RefPicList eRefList, bool clipCPMVs = false );
bool getInterMergeSubPuMvpCand(const PredictionUnit &pu, MergeCtx &mrgCtx, bool& LICFlag, const int count, int mmvdList);
bool getInterMergeSubPuRecurCand(const PredictionUnit &pu, MergeCtx &mrgCtx, const int count);
-#if !JVET_P1023_DMVR_BDOF_RP_CONDITION
- bool isBiPredFromDifferentDir (const PredictionUnit &pu);
-#endif
bool isBiPredFromDifferentDirEqDistPoc(const PredictionUnit &pu);
void restrictBiPredMergeCandsOne (PredictionUnit &pu);
--
GitLab