From bf91e062d5c9780bad42022bade22a23996975ec Mon Sep 17 00:00:00 2001
From: urbanf <fabrice.urban@interdigital.com>
Date: Tue, 14 Mar 2023 10:20:57 +0100
Subject: [PATCH] fix PicHeader::m_maxNumAffineMergeCand value when Affine is
OFF
---
source/Lib/EncoderLib/EncGOP.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index a52fb7a00..4bb132d6d 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -3024,6 +3024,11 @@ void EncGOP::compressGOP(int pocLast, int numPicRcvd, PicList &rcListPic, std::l
}
}
+ if (!pcSlice->getSPS()->getUseAffine())
+ {
+ picHeader->setMaxNumAffineMergeCand(pcSlice->getSPS()->getSbTMVPEnabledFlag() && picHeader->getEnableTMVPFlag());
+ }
+
pcSlice->scaleRefPicList( scaledRefPic, pcPic->cs->picHeader, m_pcEncLib->getApss(), picHeader->getLmcsAPS(), picHeader->getScalingListAPS(), false );
// set adaptive search range for non-intra-slices
--
GitLab