From 4b00f0ecae8869226cb4fccaa8a1262a34a44196 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 26 Feb 2016 15:14:46 -0800 Subject: [PATCH] datarate_test/ChangingDropFrameThresh: set kf interval restore the value for VP9 to 9999 to satisfy the current test expectations; without this VP9/DatarateTestVP9Large.ChangingDropFrameThresh/8 will overshoot. Change-Id: I88dad574ae4ab10f923579824c7347ff468c7045 --- test/datarate_test.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/datarate_test.cc b/test/datarate_test.cc index 1f69512f2..14989238f 100644 --- a/test/datarate_test.cc +++ b/test/datarate_test.cc @@ -519,6 +519,9 @@ TEST_P(DatarateTestVP9Large, ChangingDropFrameThresh) { cfg_.rc_end_usage = VPX_CBR; cfg_.rc_target_bitrate = 200; cfg_.g_lag_in_frames = 0; + // TODO(marpan): Investigate datarate target failures with a smaller keyframe + // interval (128). + cfg_.kf_max_dist = 9999; ::libvpx_test::I420VideoSource video("hantro_collage_w352h288.yuv", 352, 288, 30, 1, 0, 140); @@ -947,6 +950,7 @@ TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc3SpatialLayers) { svc_params_.scaling_factor_num[2] = 288; svc_params_.scaling_factor_den[2] = 288; cfg_.rc_dropframe_thresh = 10; + cfg_.kf_max_dist = 9999; ::libvpx_test::I420VideoSource video("niklas_1280_720_30.y4m", 1280, 720, 30, 1, 0, 300); cfg_.rc_target_bitrate = 800; @@ -984,6 +988,7 @@ TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc2SpatialLayers4threads) { svc_params_.scaling_factor_num[1] = 288; svc_params_.scaling_factor_den[1] = 288; cfg_.rc_dropframe_thresh = 10; + cfg_.kf_max_dist = 9999; ::libvpx_test::I420VideoSource video("niklas_1280_720_30.y4m", 1280, 720, 30, 1, 0, 300); cfg_.rc_target_bitrate = 800; @@ -1023,6 +1028,7 @@ TEST_P(DatarateOnePassCbrSvc, OnePassCbrSvc3SpatialLayers4threads) { svc_params_.scaling_factor_num[2] = 288; svc_params_.scaling_factor_den[2] = 288; cfg_.rc_dropframe_thresh = 10; + cfg_.kf_max_dist = 9999; ::libvpx_test::I420VideoSource video("niklas_1280_720_30.y4m", 1280, 720, 30, 1, 0, 300); cfg_.rc_target_bitrate = 800; -- 2.40.0