From c0bbb75dc4e5170a94a2957d7d76df445a92ef15 Mon Sep 17 00:00:00 2001 From: Huanbang Chen <chenhuanbang@huawei.com> Date: Tue, 13 Nov 2018 20:43:18 +0800 Subject: [PATCH] fix ambiguous parameters for BIO and CPR flag in xPredInterBlk --- source/Lib/CommonLib/InterPrediction.cpp | 5 ++++- source/Lib/EncoderLib/InterSearch.cpp | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp index 42e4b3a5d7..a8921273ae 100644 --- a/source/Lib/CommonLib/InterPrediction.cpp +++ b/source/Lib/CommonLib/InterPrediction.cpp @@ -730,7 +730,10 @@ void InterPrediction::xPredAffineBlk( const ComponentID& compID, const Predictio { Mv mvTemp = _mv[0]; clipMv( mvTemp, pu.cu->lumaPos(), *pu.cs->sps ); - xPredInterBlk( compID, pu, refPic, mvTemp, dstPic, bi, clpRng + xPredInterBlk( compID, pu, refPic, mvTemp, dstPic, bi, clpRng +#if JVET_L0256_BIO + , false +#endif #if JVET_L0293_CPR , false #endif diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp index 8d04f1a35c..a3f4fbe8fc 100644 --- a/source/Lib/EncoderLib/InterSearch.cpp +++ b/source/Lib/EncoderLib/InterSearch.cpp @@ -2483,6 +2483,9 @@ Distortion InterSearch::xGetTemplateCost( const PredictionUnit& pu, xPredInterBlk( COMPONENT_Y, pu, picRef, cMvCand, predBuf, bi, pu.cu->slice->clpRng( COMPONENT_Y ) +#if JVET_L0256_BIO + , false +#endif #if JVET_L0293_CPR , false #endif -- GitLab