Add test cases to application forced kf unit test
Added some corner cases which may introduce failures
in application forced key frame test. This commit also
changes the key frame presence check to use the decoder
API instead of the encoder's frame packet flags.
Change-Id: Ib47060797dfa705dbeb8339708310a147389ae4a
diff --git a/test/kf_test.cc b/test/kf_test.cc
index 2929a1e..6e7d1c9 100644
--- a/test/kf_test.cc
+++ b/test/kf_test.cc
@@ -109,27 +109,37 @@
ASSERT_EQ(is_kf_interval_violated_, false) << kf_dist_param_;
}
-class AltRefForcedKeyTestLarge
- : public ::libaom_test::CodecTestWith2Params<libaom_test::TestMode, int>,
+// This class tests for presence and placement of application forced key frames.
+class ForcedKeyTestLarge
+ : public ::libaom_test::CodecTestWith5Params<libaom_test::TestMode, int,
+ int, int, aom_rc_mode>,
public ::libaom_test::EncoderTest {
protected:
- AltRefForcedKeyTestLarge()
+ ForcedKeyTestLarge()
: EncoderTest(GET_PARAM(0)), encoding_mode_(GET_PARAM(1)),
- cpu_used_(GET_PARAM(2)), forced_kf_frame_num_(1), frame_num_(0) {}
- virtual ~AltRefForcedKeyTestLarge() {}
+ auto_alt_ref_(GET_PARAM(2)), fwd_kf_enabled_(GET_PARAM(3)),
+ cpu_used_(GET_PARAM(4)), rc_end_usage_(GET_PARAM(5)) {
+ forced_kf_frame_num_ = 1;
+ frame_num_ = 0;
+ is_kf_placement_violated_ = false;
+ }
+ virtual ~ForcedKeyTestLarge() {}
virtual void SetUp() {
InitializeConfig();
SetMode(encoding_mode_);
- cfg_.rc_end_usage = AOM_VBR;
+ cfg_.rc_end_usage = rc_end_usage_;
cfg_.g_threads = 0;
+ cfg_.kf_max_dist = 30;
+ cfg_.kf_min_dist = 0;
+ cfg_.fwd_kf_enabled = fwd_kf_enabled_;
}
virtual void PreEncodeFrameHook(::libaom_test::VideoSource *video,
::libaom_test::Encoder *encoder) {
if (video->frame() == 0) {
encoder->Control(AOME_SET_CPUUSED, cpu_used_);
- encoder->Control(AOME_SET_ENABLEAUTOALTREF, 1);
+ encoder->Control(AOME_SET_ENABLEAUTOALTREF, auto_alt_ref_);
#if CONFIG_AV1_ENCODER
// override test default for tile columns if necessary.
if (GET_PARAM(0) == &libaom_test::kAV1) {
@@ -141,22 +151,36 @@
(video->frame() == forced_kf_frame_num_) ? AOM_EFLAG_FORCE_KF : 0;
}
- virtual void FramePktHook(const aom_codec_cx_pkt_t *pkt) {
- if (frame_num_ == forced_kf_frame_num_) {
- ASSERT_EQ(pkt->data.frame.flags & AOM_FRAME_IS_KEY,
- static_cast<aom_codec_frame_flags_t>(AOM_FRAME_IS_KEY))
- << "Frame #" << frame_num_ << " isn't a keyframe!";
+ virtual bool HandleDecodeResult(const aom_codec_err_t res_dec,
+ libaom_test::Decoder *decoder) {
+ EXPECT_EQ(AOM_CODEC_OK, res_dec) << decoder->DecodeError();
+ if (AOM_CODEC_OK == res_dec) {
+ if (frame_num_ == forced_kf_frame_num_) {
+ 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_KEY) !=
+ static_cast<aom_codec_frame_flags_t>(AOM_FRAME_IS_KEY)) {
+ is_kf_placement_violated_ = true;
+ }
+ }
+ ++frame_num_;
}
- ++frame_num_;
+ return AOM_CODEC_OK == res_dec;
}
::libaom_test::TestMode encoding_mode_;
+ int auto_alt_ref_;
+ int fwd_kf_enabled_;
int cpu_used_;
+ aom_rc_mode rc_end_usage_;
unsigned int forced_kf_frame_num_;
unsigned int frame_num_;
+ bool is_kf_placement_violated_;
};
-TEST_P(AltRefForcedKeyTestLarge, Frame1IsKey) {
+TEST_P(ForcedKeyTestLarge, Frame1IsKey) {
const aom_rational timebase = { 1, 30 };
const int lag_values[] = { 3, 15, 25, -1 };
@@ -164,13 +188,19 @@
for (int i = 0; lag_values[i] != -1; ++i) {
frame_num_ = 0;
cfg_.g_lag_in_frames = lag_values[i];
+ is_kf_placement_violated_ = false;
libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
- timebase.den, timebase.num, 0, 30);
+ timebase.den, timebase.num, 0,
+ fwd_kf_enabled_ ? 60 : 30);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ ASSERT_EQ(is_kf_placement_violated_, false)
+ << "Frame #" << frame_num_ << " isn't a keyframe!";
}
}
-TEST_P(AltRefForcedKeyTestLarge, ForcedFrameIsKey) {
+// This class checks the presence and placement of application
+// forced key frames.
+TEST_P(ForcedKeyTestLarge, ForcedFrameIsKey) {
const aom_rational timebase = { 1, 30 };
const int lag_values[] = { 3, 15, 25, -1 };
@@ -178,9 +208,42 @@
frame_num_ = 0;
forced_kf_frame_num_ = lag_values[i] - 1;
cfg_.g_lag_in_frames = lag_values[i];
+ is_kf_placement_violated_ = false;
libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
- timebase.den, timebase.num, 0, 30);
+ timebase.den, timebase.num, 0,
+ fwd_kf_enabled_ ? 60 : 30);
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ ASSERT_EQ(is_kf_placement_violated_, false)
+ << "Frame #" << frame_num_ << " isn't a keyframe!";
+
+ // Two pass and single pass CBR are currently segfaulting for the case when
+ // forced kf is placed after lag in frames.
+ // TODO(anyone): Enable(uncomment) below test once above bug is fixed.
+ // frame_num_ = 0;
+ // forced_kf_frame_num_ = lag_values[i] + 1;
+ // cfg_.g_lag_in_frames = lag_values[i];
+ // is_kf_placement_violated_ = false;
+ // ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ // ASSERT_EQ(is_kf_placement_violated_, false)
+ // << "Frame #" << frame_num_ << " isn't a keyframe!";
+ }
+}
+
+TEST_P(ForcedKeyTestLarge, ForcedFrameIsKeyCornerCases) {
+ const aom_rational timebase = { 1, 30 };
+ const int kf_offsets[] = { -2, -1, 1, 2, 0 };
+ cfg_.g_lag_in_frames = 35;
+
+ for (int i = 0; kf_offsets[i] != 0; ++i) {
+ frame_num_ = 0;
+ forced_kf_frame_num_ = cfg_.kf_max_dist + kf_offsets[i];
+ is_kf_placement_violated_ = false;
+ libaom_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288,
+ timebase.den, timebase.num, 0,
+ fwd_kf_enabled_ ? 60 : 30);
+ ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
+ ASSERT_EQ(is_kf_placement_violated_, false)
+ << "Frame #" << frame_num_ << " isn't a keyframe!";
}
}
@@ -190,7 +253,12 @@
::testing::ValuesIn(kfTestParams),
::testing::Values(AOM_Q, AOM_VBR, AOM_CBR, AOM_CQ));
-AV1_INSTANTIATE_TEST_SUITE(AltRefForcedKeyTestLarge,
- ::testing::Values(::libaom_test::kOnePassGood),
- ::testing::Values(2, 5));
+// TODO(anyone): Add CBR to list of rc_modes once forced kf placement after
+// lag in frames bug is fixed.
+AV1_INSTANTIATE_TEST_SUITE(ForcedKeyTestLarge,
+ ::testing::Values(::libaom_test::kOnePassGood,
+ ::libaom_test::kTwoPassGood),
+ ::testing::Values(0, 1), ::testing::Values(0, 1),
+ ::testing::Values(2, 5),
+ ::testing::Values(AOM_Q, AOM_VBR, AOM_CQ));
} // namespace
