From 086de82f51ca99a150c25dddddddc7b87e819c2a Mon Sep 17 00:00:00 2001 From: Rasmus Brandt Date: Thu, 7 Jun 2018 09:13:32 +0200 Subject: [PATCH] Add bitrate_priority to GetSimulcastConfig call. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9368 Change-Id: I72317493db02835362c0e6127e6e4c25a5709d63 Reviewed-on: https://webrtc-review.googlesource.com/81661 Reviewed-by: Åsa Persson Commit-Queue: Rasmus Brandt Cr-Commit-Position: refs/heads/master@{#23540} --- .../codecs/test/videocodec_test_fixture_impl.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc index 7a69768826..dc41f7d38f 100644 --- a/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc +++ b/modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc @@ -44,13 +44,15 @@ using VideoStatistics = VideoCodecTestStats::VideoStatistics; namespace { const int kBaseKeyFrameInterval = 3000; const int kMaxBitrateBps = 5000 * 1000; // From kSimulcastFormats. +const double kBitratePriority = 1.0; const int kMaxFramerateFps = 30; const int kMaxQp = 56; void ConfigureSimulcast(VideoCodec* codec_settings) { const std::vector streams = cricket::GetSimulcastConfig( codec_settings->numberOfSimulcastStreams, codec_settings->width, - codec_settings->height, kMaxBitrateBps, kMaxQp, kMaxFramerateFps, false); + codec_settings->height, kMaxBitrateBps, kBitratePriority, kMaxQp, + kMaxFramerateFps, /* is_screenshare = */ false); for (size_t i = 0; i < streams.size(); ++i) { SimulcastStream* ss = &codec_settings->simulcastStream[i]; @@ -72,7 +74,8 @@ void ConfigureSvc(VideoCodec* codec_settings) { const std::vector layers = GetSvcConfig(codec_settings->width, codec_settings->height, codec_settings->VP9()->numberOfSpatialLayers, - codec_settings->VP9()->numberOfTemporalLayers, false); + codec_settings->VP9()->numberOfTemporalLayers, + /* is_screen_sharing = */ false); for (size_t i = 0; i < layers.size(); ++i) { codec_settings->spatialLayers[i] = layers[i];