From 101d8abe0c69288b13d5f7f4844d9f3bc6e00c7f Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Thu, 14 Sep 2023 09:23:07 -0400
Subject: [PATCH] Use proper type for array
---
source/Lib/EncoderLib/EncCu.cpp | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index caf7e006da..abd8280421 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -2511,11 +2511,8 @@ void EncCu::xCheckRDCostIBCModeMerge2Nx2N(CodingStructure *&tempCS, CodingStruct
tempCS->sps->getGDREnabledFlag() && tempCS->pcv->isEncoder && tempCS->picture->gdrParam.inGdrInterval && gdrClean;
#endif
- int candHasNoResidual[MRG_MAX_NUM_CANDS];
- for (unsigned int ui = 0; ui < mergeCtx.numValidMergeCand; ui++)
- {
- candHasNoResidual[ui] = 0;
- }
+ std::array<bool, MRG_MAX_NUM_CANDS> candHasNoResidual;
+ candHasNoResidual.fill(false); // TODO: this isn't set to any other value
#if GDR_ENABLED
std::array<bool, MRG_MAX_NUM_CANDS> MrgSolid;
@@ -2667,7 +2664,7 @@ void EncCu::xCheckRDCostIBCModeMerge2Nx2N(CodingStructure *&tempCS, CodingStruct
for (unsigned int mrgHADIdx = 0; mrgHADIdx < numMrgSATDCand; mrgHADIdx++)
{
unsigned int mergeCand = rdModeList[mrgHADIdx];
- if (!(numResidualPass == 1 && candHasNoResidual[mergeCand] == 1))
+ if (!(numResidualPass == 1 && candHasNoResidual[mergeCand]))
{
if (!(bestIsSkip && (numResidualPass == 0)))
{
--
GitLab