commit 91001f5f377230337e40df045dbeb7babd703629
author Yuan Tong <tongyuan200097@gmail.com> Wed Mar 08 16:29:52 2023 +0800
committer Wan-Teh Chang <wtc@google.com> Fri Jun 07 02:01:24 2024 +0000
tree ebc216a698cebe2ea635877b654a30c13f74ed1b
parent 3a15245e13e347e2016d1077f9d3cd9a62e76c4e

Update progressive test to catch more crash case

Update AVIFProgressiveTest.DimensionChangeLargeImageMultiThread to also catch the crash fixed by Ib3d2a123b159898d7c7e19c81e89ff148920e1f1.

BUG: aomedia:3382
Change-Id: I5a65578c7793fdac96c2d41cd71d63a75f7b0d1d
(cherry picked from commit 00392c6223ac9aefc29e0d67929a943836ad8daf)

test/avif_progressive_test.cc

diff --git a/test/avif_progressive_test.cc b/test/avif_progressive_test.cc
index 2a28ca3..59aebd4 100644
--- a/test/avif_progressive_test.cc
+++ b/test/avif_progressive_test.cc
@@ -225,8 +225,6 @@
   aom_codec_ctx_t enc;
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_init(&enc, iface, &cfg, 0));
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AOME_SET_CQ_LEVEL, 31));
-  EXPECT_EQ(AOM_CODEC_OK,
-            aom_codec_control(&enc, AOME_SET_NUMBER_SPATIAL_LAYERS, 2));
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AOME_SET_CPUUSED, 6));
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AV1E_SET_ROW_MT, 1));  // MultiThread
@@ -234,6 +232,8 @@
             aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_TUNING, AOM_TUNE_SSIM));
+  EXPECT_EQ(AOM_CODEC_OK,
+            aom_codec_control(&enc, AOME_SET_NUMBER_SPATIAL_LAYERS, 2));
 
   // First frame (layer 0)
   EXPECT_EQ(AOM_CODEC_OK,