From 53e0436c7f9e4331e1742eefd9e7968661182b64 Mon Sep 17 00:00:00 2001
From: Xiang Li <xlxiangli@google.com>
Date: Thu, 29 Dec 2022 23:16:08 +0000
Subject: [PATCH] Fix #28 encoding crash when affine off
---
source/Lib/CommonLib/InterPrediction.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/source/Lib/CommonLib/InterPrediction.cpp b/source/Lib/CommonLib/InterPrediction.cpp
index 0790c8d73..557aa4beb 100644
--- a/source/Lib/CommonLib/InterPrediction.cpp
+++ b/source/Lib/CommonLib/InterPrediction.cpp
@@ -6250,11 +6250,7 @@ void InterPrediction::sortInterMergeMMVDCandidates(PredictionUnit &pu, MergeCtx
{
const int tempNum = (const int) (std::min<int>(MMVD_BASE_MV_NUM, mrgCtx.numValidMergeCand) * MMVD_MAX_REFINE_NUM);
const int groupSize = std::min<int>(tempNum, ADAPTIVE_SUB_GROUP_SIZE_MMVD);
-#if _WINDOWS
Distortion candCostList[MMVD_BASE_MV_NUM* MMVD_MAX_REFINE_NUM];
-#else
- Distortion candCostList[tempNum] ;
-#endif
for (uint32_t i = 0; i < tempNum; i++)
{
@@ -6760,11 +6756,7 @@ void InterPrediction::sortAffineMergeCandidates(PredictionUnit pu, AffineMergeC
int baseCount = std::min<int>((int)AF_MMVD_BASE_NUM, affMrgCtx.numValidMergeCand - baseIdxToMergeIdxOffset);
const int tempNum = baseCount * AF_MMVD_MAX_REFINE_NUM;
const int groupSize = std::min<int>(tempNum, ADAPTIVE_SUB_GROUP_SIZE_MMVD_AFF);
-#if _WINDOWS
Distortion candCostList[AF_MMVD_BASE_NUM * AF_MMVD_MAX_REFINE_NUM];
-#else
- Distortion candCostList[tempNum];
-#endif
for (uint32_t i = 0; i < tempNum; i++)
{
affMmvdLUT[i] = i;
--
GitLab