Add unit test to check the presence of S_FRAME
This patch adds unit test to check the presence
of S_FRAME configured using encoder option. Also
adds additional test case for existing S_FRAME
test configured using frame_flags.
Change-Id: Ide0fa8494fcdd69156186bb56e3e43212699dc13
diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index f9ef680..5449303 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_test.cc
@@ -27,12 +27,13 @@
const int kCpuUsed = 1;
class ErrorResilienceTestLarge
- : public ::libaom_test::CodecTestWithParam<libaom_test::TestMode>,
+ : public ::libaom_test::CodecTestWith2Params<libaom_test::TestMode, int>,
public ::libaom_test::EncoderTest {
protected:
ErrorResilienceTestLarge()
: EncoderTest(GET_PARAM(0)), psnr_(0.0), nframes_(0), mismatch_psnr_(0.0),
- mismatch_nframes_(0), encoding_mode_(GET_PARAM(1)), allow_mismatch_(0) {
+ mismatch_nframes_(0), encoding_mode_(GET_PARAM(1)), allow_mismatch_(0),
+ enable_altref_(GET_PARAM(2)) {
Reset();
}
@@ -77,7 +78,10 @@
virtual void PreEncodeFrameHook(libaom_test::VideoSource *video,
libaom_test::Encoder *encoder) {
- if (video->frame() == 0) encoder->Control(AOME_SET_CPUUSED, kCpuUsed);
+ if (video->frame() == 0) {
+ encoder->Control(AOME_SET_CPUUSED, kCpuUsed);
+ encoder->Control(AOME_SET_ENABLEAUTOALTREF, enable_altref_);
+ }
frame_flags_ &=
~(AOM_EFLAG_NO_UPD_LAST | AOM_EFLAG_NO_UPD_GF | AOM_EFLAG_NO_UPD_ARF |
AOM_EFLAG_NO_REF_FRAME_MVS | AOM_EFLAG_ERROR_RESILIENT |
@@ -134,7 +138,6 @@
encoder->Control(AV1E_SET_S_FRAME_MODE, 0);
if (s_nframes_ > 0 &&
(cfg_.g_pass == AOM_RC_LAST_PASS || cfg_.g_pass == AOM_RC_ONE_PASS)) {
- if (video->frame() == 0) encoder->Control(AOME_SET_ENABLEAUTOALTREF, 0);
for (unsigned int i = 0; i < s_nframes_; ++i) {
if (s_frames_[i] == video->frame()) {
std::cout << " Encoding S frame: " << s_frames_[i]
@@ -321,6 +324,7 @@
unsigned int s_frames_[kMaxSFrames];
libaom_test::TestMode encoding_mode_;
int allow_mismatch_;
+ int enable_altref_;
};
TEST_P(ErrorResilienceTestLarge, OnVersusOff) {
@@ -456,5 +460,76 @@
EXPECT_LE(GetMismatchFrames(), GetEncodedFrames() - s_frame_list[0]);
}
-AV1_INSTANTIATE_TEST_SUITE(ErrorResilienceTestLarge, NONREALTIME_TEST_MODES);
+AV1_INSTANTIATE_TEST_SUITE(ErrorResilienceTestLarge, NONREALTIME_TEST_MODES,
+ ::testing::Values(0, 1));
+
+// This class is used to check the presence of SFrame.
+class SFramePresenceTestLarge
+ : public ::libaom_test::CodecTestWith2Params<libaom_test::TestMode,
+ aom_rc_mode>,
+ public ::libaom_test::EncoderTest {
+ protected:
+ SFramePresenceTestLarge()
+ : EncoderTest(GET_PARAM(0)), encoding_mode_(GET_PARAM(1)),
+ rc_end_usage_(GET_PARAM(2)) {
+ is_sframe_present_ = 0;
+ }
+ virtual ~SFramePresenceTestLarge() {}
+
+ virtual void SetUp() {
+ InitializeConfig();
+ SetMode(encoding_mode_);
+ const aom_rational timebase = { 1, 30 };
+ cfg_.g_timebase = timebase;
+ cfg_.rc_end_usage = rc_end_usage_;
+ cfg_.g_threads = 1;
+ cfg_.kf_min_dist = 0;
+ cfg_.kf_max_dist = 60;
+ cfg_.g_lag_in_frames = 35;
+ cfg_.sframe_dist = 5;
+ }
+
+ virtual bool DoDecode() const { return 1; }
+
+ virtual void PreEncodeFrameHook(::libaom_test::VideoSource *video,
+ ::libaom_test::Encoder *encoder) {
+ if (video->frame() == 0) {
+ encoder->Control(AOME_SET_CPUUSED, 5);
+ encoder->Control(AOME_SET_ENABLEAUTOALTREF, 0);
+ }
+ }
+
+ virtual bool HandleDecodeResult(const aom_codec_err_t res_dec,
+ libaom_test::Decoder *decoder) {
+ EXPECT_EQ(AOM_CODEC_OK, res_dec) << decoder->DecodeError();
+ if (is_sframe_present_ != 1 && AOM_CODEC_OK == res_dec) {
+ aom_codec_ctx_t *ctx_dec = decoder->GetDecoder();
+ int frame_flags = 0;
+ AOM_CODEC_CONTROL_TYPECHECKED(ctx_dec, AOMD_GET_FRAME_FLAGS,
+ &frame_flags);
+ if ((frame_flags & AOM_FRAME_IS_SWITCH) ==
+ static_cast<aom_codec_frame_flags_t>(AOM_FRAME_IS_SWITCH)) {
+ is_sframe_present_ = 1;
+ }
+ }
+ return AOM_CODEC_OK == res_dec;
+ }
+
+ ::libaom_test::TestMode encoding_mode_;
+ aom_rc_mode rc_end_usage_;
+ int is_sframe_present_;
+};
+
+TEST_P(SFramePresenceTestLarge, SFramePresenceTest) {
+ libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
+ cfg_.g_timebase.den, cfg_.g_timebase.num,
+ 0, 10);
+ ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ ASSERT_EQ(is_sframe_present_, 1);
+}
+
+AV1_INSTANTIATE_TEST_SUITE(SFramePresenceTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood),
+ ::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
} // namespace
diff --git a/test/test.cmake b/test/test.cmake
index 423777a..0726112 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -68,7 +68,6 @@
"${AOM_ROOT}/test/end_to_end_test.cc"
"${AOM_ROOT}/test/gf_pyr_height_test.cc"
"${AOM_ROOT}/test/rt_end_to_end_test.cc"
- "${AOM_ROOT}/test/error_resilience_test.cc"
"${AOM_ROOT}/test/frame_size_tests.cc"
"${AOM_ROOT}/test/horz_superres_test.cc"
"${AOM_ROOT}/test/i420_video_source.h"
@@ -123,6 +122,7 @@
"${AOM_ROOT}/test/divu_small_test.cc"
"${AOM_ROOT}/test/dr_prediction_test.cc"
"${AOM_ROOT}/test/ec_test.cc"
+ "${AOM_ROOT}/test/error_resilience_test.cc"
"${AOM_ROOT}/test/ethread_test.cc"
"${AOM_ROOT}/test/film_grain_table_test.cc"
"${AOM_ROOT}/test/fwd_kf_test.cc"
