rtc: Fix to crash for SVC with resize.
Add new test SmallerFrameSizeSVC that
repros the crash.
Bug: chromium:1410766
Change-Id: Idbe897340d5ca41f0a38a82c1c6d412fb4f4d89a
(cherry picked from commit 50dfbacb57aefb9ed55c0f83f2238d22114ec9fe)
diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 44a9356..f4c1ba3 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -1682,11 +1682,15 @@
// For SVC: keep track of the (unscaled) source corresponding to the
// refresh of LAST reference (base temporal layer- TL0). Copy only for the
- // top spatial enhancement layer only so all spatial layers of the next
+ // top spatial enhancement layer so all spatial layers of the next
// superframe have last_source to be aligned with previous TL0 superframe.
+ // Avoid cases where resolution changes for unscaled source (top spatial
+ // layer).
if (cpi->ppi->use_svc &&
cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1 &&
- cpi->svc.temporal_layer_id == 0) {
+ cpi->svc.temporal_layer_id == 0 &&
+ cpi->unscaled_source->y_width == cpi->svc.source_last_TL0.y_width &&
+ cpi->unscaled_source->y_height == cpi->svc.source_last_TL0.y_height) {
aom_yv12_copy_y(cpi->unscaled_source, &cpi->svc.source_last_TL0);
aom_yv12_copy_u(cpi->unscaled_source, &cpi->svc.source_last_TL0);
aom_yv12_copy_v(cpi->unscaled_source, &cpi->svc.source_last_TL0);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index e5491d1..78eb411 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2461,7 +2461,8 @@
av1_set_size_dependent_vars(cpi, &q, &bottom_index, &top_index);
av1_set_mv_search_params(cpi);
- if (cm->current_frame.frame_number == 0 && cpi->ppi->use_svc) {
+ if (cm->current_frame.frame_number == 0 && cpi->ppi->use_svc &&
+ cpi->svc.temporal_layer_id == 0) {
const SequenceHeader *seq_params = cm->seq_params;
if (aom_alloc_frame_buffer(
&cpi->svc.source_last_TL0, cpi->oxcf.frm_dim_cfg.width,
diff --git a/test/resize_test.cc b/test/resize_test.cc
index e12fbac..d015ff0 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -912,4 +912,70 @@
EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
}
+// A test that reproduces crbug.com/1410766. In realtime usage mode
+// for SVC with temporal layers, encode frames of sizes 600x600,
+// 600x600, and 100x480. ASan should report no memory errors.
+TEST(ResizeSimpleTest, SmallerFrameSizeSVC) {
+ constexpr int kWidth = 600;
+ constexpr int kHeight = 600;
+ // Dummy buffer of zero samples.
+ constexpr size_t kBufferSize =
+ kWidth * kHeight + 2 * (kWidth + 1) / 2 * (kHeight + 1) / 2;
+ std::vector<unsigned char> buffer(kBufferSize);
+
+ aom_image_t img;
+ EXPECT_EQ(&img, aom_img_wrap(&img, AOM_IMG_FMT_I420, kWidth, kHeight, 1,
+ buffer.data()));
+ aom_image_t img2;
+ EXPECT_EQ(&img2,
+ aom_img_wrap(&img2, AOM_IMG_FMT_I420, 100, 480, 1, buffer.data()));
+
+ 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_REALTIME));
+ cfg.g_w = kWidth;
+ cfg.g_h = kHeight;
+ 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_CPUUSED, 5));
+
+ aom_svc_params_t svc_params = {};
+ aom_svc_layer_id_t layer_id;
+ svc_params.number_spatial_layers = 1;
+ svc_params.framerate_factor[0] = 2;
+ svc_params.framerate_factor[1] = 1;
+ svc_params.number_temporal_layers = 2;
+ // Bitrate allocation L0: 60% L1: 40%
+ svc_params.layer_target_bitrate[0] = 60 * cfg.rc_target_bitrate / 100;
+ svc_params.layer_target_bitrate[1] = cfg.rc_target_bitrate;
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AV1E_SET_SVC_PARAMS, &svc_params));
+
+ layer_id.spatial_layer_id = 0;
+ layer_id.temporal_layer_id = 0;
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AV1E_SET_SVC_LAYER_ID, &layer_id));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 0, 1, 0));
+
+ cfg.g_w = kWidth;
+ cfg.g_h = kHeight;
+ layer_id.temporal_layer_id = 1;
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AV1E_SET_SVC_LAYER_ID, &layer_id));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_config_set(&enc, &cfg));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img, 1, 1, 0));
+
+ cfg.g_w = 100;
+ cfg.g_h = 480;
+ layer_id.temporal_layer_id = 0;
+ EXPECT_EQ(AOM_CODEC_OK,
+ aom_codec_control(&enc, AV1E_SET_SVC_LAYER_ID, &layer_id));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_enc_config_set(&enc, &cfg));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, &img2, 2, 1, 0));
+
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_encode(&enc, nullptr, 0, 0, 0));
+ EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&enc));
+}
+
} // namespace
