Choose sb_size by ppi instead of svc
svc.number_spatial_layers is only set by AV1E_SET_SVC_PARAMS,
while ppi->number_spatial_layers is set by both AV1E_SET_SVC_PARAMS
and AOME_SET_NUMBER_SPATIAL_LAYERS.
Use svc.number_spatial_layers causes inconsistency of superblock size.
BUG: aomedia:3382
Change-Id: I4ba0b9be0d98c850607b42aab18cde2167904d76
(cherry picked from commit 0189e1a3b460d54c5498fc2413dc8637b011f613)
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index d1f027f..178d966 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2930,7 +2930,7 @@
AV1EncoderConfig *oxcf = &cpi->oxcf;
const BLOCK_SIZE sb_size = av1_select_sb_size(
oxcf, oxcf->frm_dim_cfg.width, oxcf->frm_dim_cfg.height,
- cpi->svc.number_spatial_layers);
+ ppi->number_spatial_layers);
oxcf->border_in_pixels =
av1_get_enc_border_size(av1_is_resize_needed(oxcf),
oxcf->kf_cfg.key_freq_max == 0, sb_size);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 78eb411..aef55cb 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -342,7 +342,7 @@
if (!cpi->ppi->seq_params_locked)
set_sb_size(cm->seq_params,
av1_select_sb_size(&cpi->oxcf, cm->width, cm->height,
- cpi->svc.number_spatial_layers));
+ cpi->ppi->number_spatial_layers));
set_tile_info(cm, &cpi->oxcf.tile_cfg);
}
diff --git a/av1/encoder/encoder_utils.c b/av1/encoder/encoder_utils.c
index beb8f54..ad99ec6 100644
--- a/av1/encoder/encoder_utils.c
+++ b/av1/encoder/encoder_utils.c
@@ -847,7 +847,7 @@
if (!cpi->ppi->seq_params_locked) {
set_sb_size(cm->seq_params,
av1_select_sb_size(&cpi->oxcf, cm->width, cm->height,
- cpi->svc.number_spatial_layers));
+ cpi->ppi->number_spatial_layers));
}
} else {
const RefCntBuffer *const primary_ref_buf = get_primary_ref_frame_buf(cm);
diff --git a/test/avif_progressive_test.cc b/test/avif_progressive_test.cc
index cf94fd5..4a00a5a 100644
--- a/test/avif_progressive_test.cc
+++ b/test/avif_progressive_test.cc
@@ -181,4 +181,88 @@
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
}
+TEST(AVIFProgressiveTest, DimensionChangeLargeImageMultiThread) {
+ constexpr int kWidth = 1920;
+ constexpr int kHeight = 1080;
+ // Dummy 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_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
+ 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));
+ 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);
+ EXPECT_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 (layer 1)
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AOME_SET_SPATIAL_LAYER_ID, 1));
+ 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);
+ EXPECT_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
