From 07885dcf84dd58e78b58004b38d4bc5a6b64af86 Mon Sep 17 00:00:00 2001
From: urbanf <fabrice.urban@interdigital.com>
Date: Thu, 16 Mar 2023 09:19:37 +0100
Subject: [PATCH] use getMaxNumAffineMergeCand() with the current picture
header instead of the current SPS and remove other conditions
---
source/Lib/EncoderLib/EncCu.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index a555f699c..da4978124 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -3477,8 +3477,7 @@ void EncCu::xCheckRDCostUnifiedMerge(CodingStructure *&tempCS, CodingStructure *
numMergeSatdCand += m_pcEncCfg->getMergeRdCandQuotaCiip();
}
- if (sps.getMaxNumAffineMergeCand() > 0 && pu->lwidth() >= 8 && pu->lheight() >= 8
- && (sps.getUseAffine() || (sps.getSbTMVPEnabledFlag() && tempCS->picHeader->getEnableTMVPFlag())))
+ if (tempCS->picHeader->getMaxNumAffineMergeCand() > 0 && pu->lwidth() >= 8 && pu->lheight() >= 8)
{
PU::getAffineMergeCand(*pu, affineMergeCtx);
numMergeSatdCand += std::min(m_pcEncCfg->getMergeRdCandQuotaSubBlk(), affineMergeCtx.numValidMergeCand);
--
GitLab