From ed68575e005682a01f3f160033d5a3b9b33ba9a0 Mon Sep 17 00:00:00 2001
From: Wei Chen <Wei.Chen@InterDigital.com>
Date: Wed, 31 Jul 2019 23:41:27 -0700
Subject: [PATCH] 1. change description for PROF MACRO 2. add handling of
JVET_O0108_DIS_DMVR_BDOF_CIIP when PROF is enabled
---
source/Lib/CommonLib/InterPrediction.cpp | 5 ++++-
source/Lib/CommonLib/TypeDef.h | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index 645bf8215f..702f743736 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -971,7 +971,7 @@ void InterPrediction::xPredAffineBlk( const ComponentID& compID, const Predictio
{
for (int idx = 0; idx < blockWidth * blockHeight; idx++)
{
- roundAffineMv(dMvScaleHor[idx], dMvScaleVer[idx], shift); // 1/64-pel
+ roundAffineMv(dMvScaleHor[idx], dMvScaleVer[idx], shift);
dMvScaleHor[idx] = Clip3(-dmvLimit, dmvLimit - 1, dMvScaleHor[idx]);
dMvScaleVer[idx] = Clip3(-dmvLimit, dmvLimit - 1, dMvScaleVer[idx]);
}
@@ -1383,6 +1383,9 @@ void InterPrediction::xWeightedAverage(const PredictionUnit& pu, const CPelUnitB
{
xApplyBiPROF(pu, pcYuvSrc0.bufs[COMPONENT_Y], pcYuvSrc1.bufs[COMPONENT_Y], pcYuvDst.bufs[COMPONENT_Y], clpRngs.comp[COMPONENT_Y]);
pcYuvDst.addWeightedAvg(pcYuvSrc0, pcYuvSrc1, clpRngs, pu.cu->GBiIdx, true);
+#if JVET_O0108_DIS_DMVR_BDOF_CIIP
+ CHECK(yuvDstTmp, "yuvDstTmp is disallowed with PROF");
+#endif
return;
}
#endif
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 049430f2cd..ede0001f5e 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,7 +50,7 @@
#include <assert.h>
#include <cassert>
-#define JVET_O0070_PROF 1 // Prediction refinement with optical flow for affine mode
+#define JVET_O0070_PROF 1 // JVET-O0070 method 4-2.1a: Prediction refinement with optical flow for affine mode
#define JVET_O0159_10BITTCTABLE_DEBLOCKING 1 // tc table for 10-bit video
--
GitLab