91 lines
3.1 KiB
Diff
91 lines
3.1 KiB
Diff
From af6dedd715f4307669366944cca6e0417b290282 Mon Sep 17 00:00:00 2001
|
|
From: James Zern <jzern@google.com>
|
|
Date: Mon, 25 Sep 2023 18:53:41 -0700
|
|
Subject: [PATCH] encode_api_test: add ConfigResizeChangeThreadCount
|
|
|
|
Update thread counts and resolution to ensure allocations are updated
|
|
correctly. VP8 is disabled to avoid a crash.
|
|
|
|
Bug: chromium:1486441
|
|
Change-Id: Ie89776d9818d27dc351eff298a44c699e850761b
|
|
---
|
|
test/encode_api_test.cc | 50 ++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 49 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc
|
|
index ecdf92834..02aedc057 100644
|
|
--- a/test/encode_api_test.cc
|
|
+++ b/test/encode_api_test.cc
|
|
@@ -304,7 +304,6 @@ TEST(EncodeAPI, SetRoi) {
|
|
|
|
void InitCodec(const vpx_codec_iface_t &iface, int width, int height,
|
|
vpx_codec_ctx_t *enc, vpx_codec_enc_cfg_t *cfg) {
|
|
- ASSERT_EQ(vpx_codec_enc_config_default(&iface, cfg, 0), VPX_CODEC_OK);
|
|
cfg->g_w = width;
|
|
cfg->g_h = height;
|
|
cfg->g_lag_in_frames = 0;
|
|
@@ -342,6 +341,7 @@ TEST(EncodeAPI, ConfigChangeThreadCount) {
|
|
vpx_codec_ctx_t ctx = {};
|
|
} enc;
|
|
|
|
+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
|
|
EXPECT_NO_FATAL_FAILURE(
|
|
InitCodec(*iface, kWidth, kHeight, &enc.ctx, &cfg));
|
|
if (IsVP9(iface)) {
|
|
@@ -360,4 +360,52 @@ TEST(EncodeAPI, ConfigChangeThreadCount) {
|
|
}
|
|
}
|
|
|
|
+TEST(EncodeAPI, ConfigResizeChangeThreadCount) {
|
|
+ constexpr int kInitWidth = 1024;
|
|
+ constexpr int kInitHeight = 1024;
|
|
+
|
|
+ for (const auto *iface : kCodecIfaces) {
|
|
+ SCOPED_TRACE(vpx_codec_iface_name(iface));
|
|
+ if (!IsVP9(iface)) {
|
|
+ GTEST_SKIP() << "TODO(https://crbug.com/1486441) remove this condition "
|
|
+ "after VP8 is fixed.";
|
|
+ }
|
|
+ for (int i = 0; i < (IsVP9(iface) ? 2 : 1); ++i) {
|
|
+ vpx_codec_enc_cfg_t cfg = {};
|
|
+ struct Encoder {
|
|
+ ~Encoder() { EXPECT_EQ(vpx_codec_destroy(&ctx), VPX_CODEC_OK); }
|
|
+ vpx_codec_ctx_t ctx = {};
|
|
+ } enc;
|
|
+
|
|
+ ASSERT_EQ(vpx_codec_enc_config_default(iface, &cfg, 0), VPX_CODEC_OK);
|
|
+ // Start in threaded mode to ensure resolution and thread related
|
|
+ // allocations are updated correctly across changes in resolution and
|
|
+ // thread counts. See https://crbug.com/1486441.
|
|
+ cfg.g_threads = 4;
|
|
+ EXPECT_NO_FATAL_FAILURE(
|
|
+ InitCodec(*iface, kInitWidth, kInitHeight, &enc.ctx, &cfg));
|
|
+ if (IsVP9(iface)) {
|
|
+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_TILE_COLUMNS, 6),
|
|
+ VPX_CODEC_OK);
|
|
+ EXPECT_EQ(vpx_codec_control_(&enc.ctx, VP9E_SET_ROW_MT, i),
|
|
+ VPX_CODEC_OK);
|
|
+ }
|
|
+
|
|
+ cfg.g_w = 1000;
|
|
+ cfg.g_h = 608;
|
|
+ EXPECT_EQ(vpx_codec_enc_config_set(&enc.ctx, &cfg), VPX_CODEC_OK)
|
|
+ << vpx_codec_error_detail(&enc.ctx);
|
|
+
|
|
+ cfg.g_w = 16;
|
|
+ cfg.g_h = 720;
|
|
+
|
|
+ for (const auto threads : { 1, 4, 8, 6, 2, 1 }) {
|
|
+ cfg.g_threads = threads;
|
|
+ EXPECT_NO_FATAL_FAILURE(EncodeWithConfig(cfg, &enc.ctx))
|
|
+ << "iteration: " << i << " threads: " << threads;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
} // namespace
|
|
--
|
|
2.41.0
|
|
|