Add the DimensionChangeBigImageMultiThread2 test
It is a variant of the DimensionChangeBigImageMultiThread test. The only
difference is that it doesn't have the spatial layers.
This test passes after James Zern's commit e42f4b1980:
https://aomedia-review.googlesource.com/c/aom/+/190181
Bug: aomedia:3382
Change-Id: Ic21e3a71645ac96ebda0b1f2bdcbf709b8f079d5
(cherry picked from commit 6e3e2227eae988a7639d251d042c4fabb7db54d1)
diff --git a/test/avif_progressive_test.cc b/test/avif_progressive_test.cc
index 59aebd4..f3e2ef2 100644
--- a/test/avif_progressive_test.cc
+++ b/test/avif_progressive_test.cc
@@ -25,7 +25,7 @@
TEST(AVIFProgressiveTest, QualityChange) {
constexpr int kWidth = 256;
constexpr int kHeight = 256;
- // Dummy buffer of neutral gray samples.
+ // A buffer of neutral gray samples.
constexpr size_t kBufferSize = 3 * kWidth * kHeight;
std::vector<unsigned char> buffer(kBufferSize,
static_cast<unsigned char>(128));
@@ -110,7 +110,7 @@
TEST(AVIFProgressiveTest, DimensionChange) {
constexpr int kWidth = 256;
constexpr int kHeight = 256;
- // Dummy buffer of neutral gray samples.
+ // A buffer of neutral gray samples.
constexpr size_t kBufferSize = 3 * kWidth * kHeight;
std::vector<unsigned char> buffer(kBufferSize,
static_cast<unsigned char>(128));
@@ -151,7 +151,7 @@
// First frame (layer 0)
EXPECT_EQ(AOM_CODEC_OK,
aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 0));
- aom_scaling_mode_t scaling_mode = { AOME_ONETWO, AOME_ONETWO };
+ const 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_encode(&enc, &img, 0, 1, 0));
@@ -192,10 +192,10 @@
// This test reproduces bug aomedia:3382. Certain parameters such as width,
// height, g_threads, usage, etc. were carefully chosen based on the
// complicated logic of av1_select_sb_size() to cause an inconsistent sb_size.
-TEST(AVIFProgressiveTest, DimensionChangeLargeImageMultiThread) {
+TEST(AVIFProgressiveTest, DimensionChangeBigImageMultiThread) {
constexpr int kWidth = 1920;
constexpr int kHeight = 1080;
- // Dummy buffer of neutral gray samples.
+ // A buffer of neutral gray samples.
constexpr size_t kBufferSize = 2 * kWidth * kHeight;
std::vector<unsigned char> buffer(kBufferSize,
static_cast<unsigned char>(128));
@@ -238,7 +238,7 @@
// First frame (layer 0)
EXPECT_EQ(AOM_CODEC_OK,
aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 0));
- aom_scaling_mode_t scaling_mode = { AOME_ONETWO, AOME_ONETWO };
+ const 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_encode(&enc, &img, 0, 1, 0));
@@ -276,4 +276,83 @@
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
}
+// A variant of the previous test, without the spatial layers.
+TEST(AVIFProgressiveTest, DimensionChangeBigImageMultiThread2) {
+ constexpr int kWidth = 1920;
+ constexpr int kHeight = 1080;
+ // A buffer of neutral gray samples.
+ constexpr size_t kBufferSize = 2 * kWidth * kHeight;
+ std::vector<unsigned char> buffer(kBufferSize,
+ static_cast<unsigned char>(128));
+
+ aom_image_t img;
+ EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidth, kHeight, 1,
+ buffer.data()));
+ img.cp = AOM_CICP_CP_UNSPECIFIED;
+ img.tc = AOM_CICP_TC_UNSPECIFIED;
+ img.mc = AOM_CICP_MC_UNSPECIFIED;
+ img.range = AOM_CR_FULL_RANGE;
+
+ aom_codec_iface_t *iface = aom_codec_av1_cx();
+ aom_codec_enc_cfg_t cfg;
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_enc_config_default(iface, &cfg, AOM_USAGE_GOOD_QUALITY));
+ cfg.g_profile = 0;
+ cfg.g_w = img.w;
+ cfg.g_h = img.h;
+ cfg.g_bit_depth = AOM_BITS_8;
+ cfg.g_input_bit_depth = 8;
+ cfg.g_lag_in_frames = 0;
+ cfg.g_threads = 2; // MultiThread
+ cfg.rc_end_usage = AOM_Q;
+ cfg.rc_min_quantizer = 0;
+ cfg.rc_max_quantizer = 63;
+ 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_CPUUSED, 6));
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AV1E_SET_ROW_MT, 1)); // MultiThread
+ 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
+ const 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_encode(&enc, &img, 0, 1, 0));
+ aom_codec_iter_t iter = nullptr;
+ const aom_codec_cx_pkt_t *pkt = aom_codec_get_cx_data(&enc, &iter);
+ ASSERT_NE(pkt, nullptr);
+ EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
+ // pkt->data.frame.flags is 0x1f0011.
+ EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, AOM_FRAME_IS_KEY);
+ pkt = aom_codec_get_cx_data(&enc, &iter);
+ EXPECT_EQ(pkt, nullptr);
+
+ // Second frame
+ 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;
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, encode_flags));
+ iter = nullptr;
+ pkt = aom_codec_get_cx_data(&enc, &iter);
+ ASSERT_NE(pkt, nullptr);
+ EXPECT_EQ(pkt->kind, AOM_CODEC_CX_FRAME_PKT);
+ // pkt->data.frame.flags is 0.
+ EXPECT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY, 0u);
+ pkt = aom_codec_get_cx_data(&enc, &iter);
+ EXPECT_EQ(pkt, nullptr);
+
+ // Flush encoder
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, nullptr, 0, 1, 0));
+ iter = nullptr;
+ pkt = aom_codec_get_cx_data(&enc, &iter);
+ EXPECT_EQ(pkt, nullptr);
+
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
+}
+
} // namespace
