ref: e8bfbf53174a80440d7251085ac8d8e16ac8ed3c
parent: 5bcc0017dfac1ca3777cf49b8139213acfb185bc
parent: d9c1496bff3563ff8c86748264dd89a01569af3a
author: Jerome Jiang <jianj@google.com>
date: Thu Apr 11 16:00:55 EDT 2019
Merge "vp9 svc test: test KSVC and other inter layer pred mode."
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -1063,10 +1063,11 @@
}
#if CONFIG_VP9_TEMPORAL_DENOISING
-// Params: speed setting, noise sensitivity and index for bitrate array.
+// Params: speed setting, noise sensitivity, index for bitrate array and inter
+// layer pred mode.
class DatarateOnePassCbrSvcDenoiser
: public DatarateOnePassCbrSvc,
- public ::libvpx_test::CodecTestWith3Params<int, int, int> {
+ public ::libvpx_test::CodecTestWith4Params<int, int, int, int> {
public:
DatarateOnePassCbrSvcDenoiser() : DatarateOnePassCbrSvc(GET_PARAM(0)) {
memset(&svc_params_, 0, sizeof(svc_params_));
@@ -1078,6 +1079,7 @@
InitializeConfig();
SetMode(::libvpx_test::kRealTime);
speed_setting_ = GET_PARAM(1);
+ inter_layer_pred_mode_ = GET_PARAM(3);
ResetModel();
}
};
@@ -1417,7 +1419,7 @@
#if CONFIG_VP9_TEMPORAL_DENOISING
VP9_INSTANTIATE_TEST_CASE(DatarateOnePassCbrSvcDenoiser,
::testing::Range(5, 10), ::testing::Range(1, 3),
- ::testing::Range(0, 3));
+ ::testing::Range(0, 3), ::testing::Range(0, 4));
#endif
VP9_INSTANTIATE_TEST_CASE(DatarateOnePassCbrSvcSmallKF, ::testing::Range(5, 10),