diff options
| author | Marco Paniconi <marpan@google.com> | 2020-11-11 23:11:16 -0800 |
|---|---|---|
| committer | Marco Paniconi <marpan@google.com> | 2020-11-12 11:31:42 -0800 |
| commit | 7beafefd16b9d41eaf0bfc09e6bbb843ada9e952 (patch) | |
| tree | ead90fb4fcd263bcbae8088b166dfc6fd5cd7ece /test/svc_test.cc | |
| parent | 94384b5c685ad3baac8989f19ee587eb72093a7f (diff) | |
| download | libvpx-7beafefd16b9d41eaf0bfc09e6bbb843ada9e952.tar libvpx-7beafefd16b9d41eaf0bfc09e6bbb843ada9e952.tar.gz libvpx-7beafefd16b9d41eaf0bfc09e6bbb843ada9e952.tar.bz2 libvpx-7beafefd16b9d41eaf0bfc09e6bbb843ada9e952.zip | |
vp9: Allow for disabling loopfilter per spatial layer
For SVC: add parameter to the control SET_SVC_PARAMS to
allow for disabling the loopfilter per spatial layer.
Note this svc setting will override the setting via
VP9E_SET_DISABLE_LOOPFILTER (which should only be used
for non-SVC).
Add unittest to handle both SVC (spatial or temporal layers)
and non-SVC (single layer) case.
Change-Id: I4092f01668bae42aac724a6df5b6f6a604337448
Diffstat (limited to 'test/svc_test.cc')
| -rw-r--r-- | test/svc_test.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/svc_test.cc b/test/svc_test.cc index 4798c7718..cbc0abe03 100644 --- a/test/svc_test.cc +++ b/test/svc_test.cc @@ -43,13 +43,14 @@ void OnePassCbrSvc::PreEncodeFrameHookSetup(::libvpx_test::VideoSource *video, svc_params_.max_quantizers[i] = 63; svc_params_.min_quantizers[i] = 0; } - svc_params_.speed_per_layer[0] = base_speed_setting_; - for (int i = 1; i < VPX_SS_MAX_LAYERS; ++i) { - svc_params_.speed_per_layer[i] = speed_setting_; + if (number_temporal_layers_ > 1 || number_spatial_layers_ > 1) { + svc_params_.speed_per_layer[0] = base_speed_setting_; + for (int i = 1; i < VPX_SS_MAX_LAYERS; ++i) { + svc_params_.speed_per_layer[i] = speed_setting_; + } + encoder->Control(VP9E_SET_SVC, 1); + encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_); } - - encoder->Control(VP9E_SET_SVC, 1); - encoder->Control(VP9E_SET_SVC_PARAMETERS, &svc_params_); encoder->Control(VP8E_SET_CPUUSED, speed_setting_); encoder->Control(VP9E_SET_AQ_MODE, 3); encoder->Control(VP8E_SET_MAX_INTRA_BITRATE_PCT, 300); |