commit 3c46738581a2dff3d14f9a3f44881427688d74c1
author Wan-Teh Chang <wtc@google.com> Wed Jan 25 06:37:04 2023 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Jan 25 10:16:57 2023 -0800
tree 165bb4865d933575bf02058a3a31dace9143489f
parent 68c6bfe4749cbb6183608cf6991de6e5e95047d0

Clean up test/avif_progressive_test.cc

Call aom_codec_control(AV1E_SET_COLOR_RANGE) only once, before encoding
the first frame, because it sets a syntax element (color_range) in the
sequence header OBU.

Include <cstddef> for size_t.

Remove unneeded #include "config/aom_config.h".

Merge first uses of `iter` and `pkt` with their declarations.

Bug: aomedia:3348
Change-Id: Ia442c00f78413aa95cc3a1aac2ac2b22e8034c60

test/avif_progressive_test.cc

diff --git a/test/avif_progressive_test.cc b/test/avif_progressive_test.cc
index e32ab6e..457891c 100644
--- a/test/avif_progressive_test.cc
+++ b/test/avif_progressive_test.cc
@@ -9,13 +9,13 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
+#include <cstddef>
 #include <vector>
 
 #include "aom/aomcx.h"
 #include "aom/aom_codec.h"
 #include "aom/aom_encoder.h"
 #include "aom/aom_image.h"
-#include "config/aom_config.h"
 #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
 
 namespace {
@@ -54,18 +54,16 @@
             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_COLOR_RANGE, AOM_CR_FULL_RANGE));
+  EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_TUNING, AOM_TUNE_SSIM));
 
   // First frame (layer 0)
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 0));
-  EXPECT_EQ(AOM_CODEC_OK,
-            aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
-  const aom_codec_cx_pkt_t *pkt;
-  aom_codec_iter_t iter;
-  iter = nullptr;
-  pkt = aom_codec_get_cx_data(&enc, &iter);
+  aom_codec_iter_t iter = nullptr;
+  const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter);
   EXPECT_NE(pkt, nullptr);
   EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
   // pkt->data.frame.flags is 0x1f0011.
@@ -81,8 +79,6 @@
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_control(&enc, AV1E_SET_LOSSLESS, 1));
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 1));
-  EXPECT_EQ(AOM_CODEC_OK,
-            aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
   aom_enc_frame_flags_t encode_flags =
       AOM_EFLAG_NO_REF_GF | AOM_EFLAG_NO_REF_ARF | AOM_EFLAG_NO_REF_BWD |
       AOM_EFLAG_NO_REF_ARF2 | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF;
@@ -142,6 +138,8 @@
             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_COLOR_RANGE, AOM_CR_FULL_RANGE));
+  EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_TUNING, AOM_TUNE_SSIM));
 
   // First frame (layer 0)
@@ -150,13 +148,9 @@
   aom_scaling_mode_t scaling_mode = { AOME_ONETWO, AOME_ONETWO };
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_SCALEMODE, &scaling_mode));
-  EXPECT_EQ(AOM_CODEC_OK,
-            aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
   EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
-  const aom_codec_cx_pkt_t *pkt;
-  aom_codec_iter_t iter;
-  iter = nullptr;
-  pkt = aom_codec_get_cx_data(&enc, &iter);
+  aom_codec_iter_t iter = nullptr;
+  const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter);
   EXPECT_NE(pkt, nullptr);
   EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
   // pkt->data.frame.flags is 0x1f0011.
@@ -167,8 +161,6 @@
   // Second frame (layer 1)
   EXPECT_EQ(AOM_CODEC_OK,
             aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 1));
-  EXPECT_EQ(AOM_CODEC_OK,
-            aom_codec_control(&enc, AV1E_SET_COLOR_RANGE, AOM_CR_FULL_RANGE));
   aom_enc_frame_flags_t encode_flags =
       AOM_EFLAG_NO_REF_GF | AOM_EFLAG_NO_REF_ARF | AOM_EFLAG_NO_REF_BWD |
       AOM_EFLAG_NO_REF_ARF2 | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF;