FPMT: Add AVxFrameParallelEncodeTest
The test AVxFrameParallelEncodeTest is added to validate frame parallel
encoding. The test compares result of parallel encode of frames using
multiple cpis with the result of simulation of parallel encode of frames
using 1 cpi.
Change-Id: Ie0235e5fe791d2da832e3ac849e663daa6596a55
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c
index 3b26be2..ffcece2 100644
--- a/av1/av1_cx_iface.c
+++ b/av1/av1_cx_iface.c
@@ -2550,12 +2550,12 @@
priv->ppi->num_fp_contexts = av1_compute_num_fp_contexts(
priv->ppi, &priv->ppi->parallel_cpi[i]->oxcf);
#if CONFIG_FPMT_TEST
- assert(priv->ppi->num_fp_contexts > 1);
- // Currently configured 'fmpt_unit_test_cfg' to
- // PARALLEL_SIMULATION_ENCODE.
- // TODO(Remya): The parameter will be later configured from fpmt unit
- // test as required.
- priv->ppi->fpmt_unit_test_cfg = PARALLEL_SIMULATION_ENCODE;
+ // When called from the unit test, if max_threads == 2, simulation of
+ // frame parallel encode using single cpi is enabled, else actual
+ // frame parallel encode using multiple cpis is enabled.
+ priv->ppi->fpmt_unit_test_cfg = (priv->oxcf.max_threads == 2)
+ ? PARALLEL_SIMULATION_ENCODE
+ : PARALLEL_ENCODE;
#endif
}
#if !CONFIG_REALTIME_ONLY
diff --git a/av1/encoder/ethread.c b/av1/encoder/ethread.c
index c140c13..1b6a871 100644
--- a/av1/encoder/ethread.c
+++ b/av1/encoder/ethread.c
@@ -926,6 +926,11 @@
num_fp_contexts = (ppi->num_fp_contexts == 1)
? num_fp_contexts
: AOMMIN(num_fp_contexts, ppi->num_fp_contexts);
+#if CONFIG_FPMT_TEST
+ // For the scope of these tests, ppi->num_fp_contexts are mandated to
+ // MAX_PARALLEL_FRAMES.
+ num_fp_contexts = MAX_PARALLEL_FRAMES;
+#endif
if (num_fp_contexts > 1) {
ppi->p_mt_info.num_mod_workers[MOD_FRAME_ENC] =
AOMMIN(max_num_enc_workers * num_fp_contexts, oxcf->max_threads);
diff --git a/test/frame_parallel_enc_test.cc b/test/frame_parallel_enc_test.cc
new file mode 100644
index 0000000..1679189
--- /dev/null
+++ b/test/frame_parallel_enc_test.cc
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2021, Alliance for Open Media. All rights reserved
+ *
+ * This source code is subject to the terms of the BSD 2 Clause License and
+ * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+ * was not distributed with this source code in the LICENSE file, you can
+ * obtain it at www.aomedia.org/license/software. If the Alliance for Open
+ * Media Patent License 1.0 was not distributed with this source code in the
+ * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+ */
+
+#include <string>
+#include <vector>
+#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "test/codec_factory.h"
+#include "test/encode_test_driver.h"
+#include "test/md5_helper.h"
+#include "test/util.h"
+#include "test/y4m_video_source.h"
+#include "test/yuv_video_source.h"
+
+namespace {
+
+#if (CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST && !CONFIG_REALTIME_ONLY)
+class AVxFrameParallelEncodeTest
+ : public ::libaom_test::CodecTestWith3Params<int, int, int>,
+ public ::libaom_test::EncoderTest {
+ protected:
+ AVxFrameParallelEncodeTest()
+ : EncoderTest(GET_PARAM(0)), encoder_initialized_(false),
+ set_cpu_used_(GET_PARAM(1)), tile_cols_(GET_PARAM(2)),
+ tile_rows_(GET_PARAM(3)) {
+ aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t();
+ cfg.w = 1280;
+ cfg.h = 720;
+ cfg.allow_lowbitdepth = 1;
+ decoder_ = codec_->CreateDecoder(cfg, 0);
+ }
+ virtual ~AVxFrameParallelEncodeTest() { delete decoder_; }
+
+ virtual void SetUp() {
+ InitializeConfig(::libaom_test::kTwoPassGood);
+ cfg_.rc_end_usage = AOM_VBR;
+ cfg_.g_lag_in_frames = 35;
+ cfg_.rc_2pass_vbr_minsection_pct = 5;
+ cfg_.rc_2pass_vbr_maxsection_pct = 2000;
+ cfg_.rc_max_quantizer = 63;
+ cfg_.rc_min_quantizer = 0;
+ }
+
+ virtual void BeginPassHook(unsigned int /*pass*/) {
+ encoder_initialized_ = false;
+ }
+
+ virtual void PreEncodeFrameHook(::libaom_test::VideoSource * /*video*/,
+ ::libaom_test::Encoder *encoder) {
+ if (encoder_initialized_) return;
+ SetTileSize(encoder);
+ encoder->Control(AOME_SET_CPUUSED, set_cpu_used_);
+ encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
+ encoder->Control(AOME_SET_ARNR_MAXFRAMES, 7);
+ encoder->Control(AOME_SET_ARNR_STRENGTH, 5);
+ encoder->Control(AV1E_SET_FRAME_PARALLEL_DECODING, 0);
+
+ encoder_initialized_ = true;
+ }
+
+ virtual void SetTileSize(libaom_test::Encoder *encoder) {
+ encoder->Control(AV1E_SET_TILE_COLUMNS, tile_cols_);
+ encoder->Control(AV1E_SET_TILE_ROWS, tile_rows_);
+ }
+
+ virtual void FramePktHook(const aom_codec_cx_pkt_t *pkt) {
+ size_enc_.push_back(pkt->data.frame.sz);
+
+ ::libaom_test::MD5 md5_enc;
+ md5_enc.Add(reinterpret_cast<uint8_t *>(pkt->data.frame.buf),
+ pkt->data.frame.sz);
+ md5_enc_.push_back(md5_enc.Get());
+
+ const aom_codec_err_t res = decoder_->DecodeFrame(
+ reinterpret_cast<uint8_t *>(pkt->data.frame.buf), pkt->data.frame.sz);
+ if (res != AOM_CODEC_OK) {
+ abort_ = true;
+ ASSERT_EQ(AOM_CODEC_OK, res);
+ }
+ const aom_image_t *img = decoder_->GetDxData().Next();
+
+ if (img) {
+ ::libaom_test::MD5 md5_res;
+ md5_res.Add(img);
+ md5_dec_.push_back(md5_res.Get());
+ }
+ }
+
+ void DoTest(::libaom_test::VideoSource *input_video) {
+ /* This is the actual parallel encode of frames using multiple cpis.
+ * The parallel frames are independently encoded.
+ * Threads are distributed among the parallel frames whereas non-parallel
+ * frames use all the threads. Example: for 8 threads, in case of 4 frames
+ * in a parallel encode set, each frame gets 2 threads. In case of 3 frames
+ * in a parallel encode set, threads are distributed as 2, 3 ,3.
+ */
+ cfg_.g_threads = 8;
+ ASSERT_NO_FATAL_FAILURE(RunLoop(input_video));
+ std::vector<size_t> enc_stream_fpmt_size;
+ std::vector<std::string> enc_stream_fpmt;
+ std::vector<std::string> dec_stream_fpmt;
+ enc_stream_fpmt_size = size_enc_;
+ enc_stream_fpmt = md5_enc_;
+ dec_stream_fpmt = md5_dec_;
+ size_enc_.clear();
+ md5_enc_.clear();
+ md5_dec_.clear();
+
+ /* This is the simulation of parallel encode of frames using single cpi.
+ * This mode is enabled in library by checking if threads = 2.
+ * In simulation, it should be ensured to have no dependency across frames
+ * (similar to parallel encode).
+ * Each frame uses all the threads configured.
+ */
+ cfg_.g_threads = 2;
+ ASSERT_NO_FATAL_FAILURE(RunLoop(input_video));
+ std::vector<size_t> enc_stream_sim_size;
+ std::vector<std::string> enc_stream_sim;
+ std::vector<std::string> dec_stream_sim;
+ enc_stream_sim_size = size_enc_;
+ enc_stream_sim = md5_enc_;
+ dec_stream_sim = md5_dec_;
+ size_enc_.clear();
+ md5_enc_.clear();
+ md5_dec_.clear();
+
+ // Check that the vectors are equal.
+ ASSERT_EQ(enc_stream_sim_size, enc_stream_fpmt_size);
+ ASSERT_EQ(enc_stream_sim, enc_stream_fpmt);
+ ASSERT_EQ(dec_stream_sim, dec_stream_fpmt);
+ }
+
+ bool encoder_initialized_;
+ int set_cpu_used_;
+ int tile_cols_;
+ int tile_rows_;
+ ::libaom_test::Decoder *decoder_;
+ std::vector<size_t> size_enc_;
+ std::vector<std::string> md5_enc_;
+ std::vector<std::string> md5_dec_;
+};
+
+class AVxFrameParallelEncodeHDResTest : public AVxFrameParallelEncodeTest {};
+
+TEST_P(AVxFrameParallelEncodeHDResTest, FrameParallelEncodeTest) {
+ ::libaom_test::Y4mVideoSource video("niklas_1280_720_30.y4m", 0, 60);
+ cfg_.rc_target_bitrate = 500;
+ DoTest(&video);
+}
+
+class AVxFrameParallelEncodeLowResTest : public AVxFrameParallelEncodeTest {};
+
+TEST_P(AVxFrameParallelEncodeLowResTest, FrameParallelEncodeTest) {
+ ::libaom_test::YUVVideoSource video("hantro_collage_w352h288.yuv",
+ AOM_IMG_FMT_I420, 352, 288, 30, 1, 0, 60);
+ cfg_.rc_target_bitrate = 200;
+ DoTest(&video);
+}
+
+AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelEncodeHDResTest,
+ ::testing::Values(2, 4, 6), ::testing::Values(0, 2),
+ ::testing::Values(0, 1));
+
+AV1_INSTANTIATE_TEST_SUITE(AVxFrameParallelEncodeLowResTest,
+ ::testing::Values(1, 2), ::testing::Values(0),
+ ::testing::Values(0));
+#endif // CONFIG_FRAME_PARALLEL_ENCODE && CONFIG_FPMT_TEST &&
+ // !CONFIG_REALTIME_ONLY
+
+} // namespace
diff --git a/test/test.cmake b/test/test.cmake
index 31ae14b..1fb5494 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -164,6 +164,7 @@
"${AOM_ROOT}/test/error_resilience_test.cc"
"${AOM_ROOT}/test/ethread_test.cc"
"${AOM_ROOT}/test/film_grain_table_test.cc"
+ "${AOM_ROOT}/test/frame_parallel_enc_test.cc"
"${AOM_ROOT}/test/kf_test.cc"
"${AOM_ROOT}/test/lossless_test.cc"
"${AOM_ROOT}/test/quant_test.cc"
