diff options
author | Marco Paniconi <marpan@google.com> | 2020-03-30 09:16:09 -0700 |
---|---|---|
committer | Marco Paniconi <marpan@google.com> | 2020-03-30 11:55:37 -0700 |
commit | 4b0422ad096c64bef9d7f972c092f5090510bdc1 (patch) | |
tree | 1dfced33b20c30a821968de8742d094303dccad1 /test/svc_datarate_test.cc | |
parent | 31326b5bbd37bd461ad354d993a02f85b7761b1f (diff) | |
download | libvpx-4b0422ad096c64bef9d7f972c092f5090510bdc1.tar libvpx-4b0422ad096c64bef9d7f972c092f5090510bdc1.tar.gz libvpx-4b0422ad096c64bef9d7f972c092f5090510bdc1.tar.bz2 libvpx-4b0422ad096c64bef9d7f972c092f5090510bdc1.zip |
rtc: Increase resize limit resoln for rtc
Increase resize limit to avoid resized frame
from going below 320x180.
Change-Id: If736ac3fac4731b47844e4d8c771ecf5c66550de
Diffstat (limited to 'test/svc_datarate_test.cc')
-rw-r--r-- | test/svc_datarate_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/svc_datarate_test.cc b/test/svc_datarate_test.cc index f995e4c08..7260d8ec8 100644 --- a/test/svc_datarate_test.cc +++ b/test/svc_datarate_test.cc @@ -337,7 +337,7 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc { } else if (dynamic_drop_layer_ && single_layer_resize_) { // Change layer bitrates to set top layers to 0. This will trigger skip // encoding/dropping of top spatial layers. - if (video->frame() == 10) { + if (video->frame() == 2) { cfg_.rc_target_bitrate -= (cfg_.layer_target_bitrate[1] + cfg_.layer_target_bitrate[2]); middle_bitrate_ = cfg_.layer_target_bitrate[1]; @@ -348,9 +348,9 @@ class DatarateOnePassCbrSvc : public OnePassCbrSvc { cfg_.layer_target_bitrate[0] = 30; cfg_.rc_target_bitrate = cfg_.layer_target_bitrate[0]; encoder->Config(&cfg_); - } else if (video->frame() == 300) { + } else if (video->frame() == 100) { // Set base spatial layer to very high to go back up to original size. - cfg_.layer_target_bitrate[0] = 300; + cfg_.layer_target_bitrate[0] = 400; cfg_.rc_target_bitrate = cfg_.layer_target_bitrate[0]; encoder->Config(&cfg_); } @@ -838,7 +838,7 @@ TEST_P(DatarateOnePassCbrSvcSingleBR, OnePassCbrSvc3SL_DisableEnableLayers) { // the fly switching to 1 spatial layer with dynamic resize enabled. // The resizer will resize the single layer down and back up again, as the // bitrate goes back up. -TEST_P(DatarateOnePassCbrSvcSingleBR, OnePassCbrSvc3SL_SingleLayerResize) { +TEST_P(DatarateOnePassCbrSvcSingleBR, OnePassCbrSvc2SL_SingleLayerResize) { SetSvcConfig(2, 1); cfg_.rc_buf_initial_sz = 500; cfg_.rc_buf_optimal_sz = 500; @@ -850,10 +850,10 @@ TEST_P(DatarateOnePassCbrSvcSingleBR, OnePassCbrSvc3SL_SingleLayerResize) { cfg_.rc_dropframe_thresh = 30; cfg_.kf_max_dist = 9999; cfg_.rc_resize_allowed = 1; - ::libvpx_test::I420VideoSource video("niklas_640_480_30.yuv", 640, 480, 30, 1, - 0, 400); - top_sl_width_ = 640; - top_sl_height_ = 480; + ::libvpx_test::I420VideoSource video("desktop_office1.1280_720-020.yuv", 1280, + 720, 15, 1, 0, 300); + top_sl_width_ = 1280; + top_sl_height_ = 720; cfg_.rc_target_bitrate = 800; ResetModel(); dynamic_drop_layer_ = true; |