commit 2b101d2c9ebcadede6eb7f6082a812c6fac4833b
author Sebastian Jansson <srte@webrtc.org> Mon Nov 12 15:33:39 2018
committer Commit Bot <commit-bot@chromium.org> Mon Nov 12 16:30:21 2018
tree 78b4c67426716904be875810d32d1f55b9f4ecad
parent aee8380894d09fcc80123fa3e00c90a425997eb8

Simplifies audio priority rate config in scenario tests.

Bug: webrtc:9510
Change-Id: Iecd2caa8d4353c64ec351969f999c8ed59c3a07d
Reviewed-on: https://webrtc-review.googlesource.com/c/110614
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25606}

test/scenario/audio_stream.cc

diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc
index 521bcb7..dc8e02c 100644
--- a/test/scenario/audio_stream.cc
+++ b/test/scenario/audio_stream.cc
@@ -9,6 +9,7 @@
  */
 #include "test/scenario/audio_stream.h"
 
+#include "rtc_base/bitrateallocationstrategy.h"
 #include "test/call_test.h"
 
 #if WEBRTC_ENABLE_PROTOBUF
@@ -131,8 +132,12 @@
         {RtpExtension::kTransportSequenceNumberUri, 8}};
   }
 
-  if (config.stream.rate_allocation_priority) {
+  if (config.encoder.priority_rate) {
     send_config.track_id = sender->GetNextPriorityId();
+    sender_->call_->SetBitrateAllocationStrategy(
+        absl::make_unique<rtc::AudioPriorityBitrateAllocationStrategy>(
+            send_config.track_id,
+            config.encoder.priority_rate->bps<uint32_t>()));
   }
   send_stream_ = sender_->call_->CreateAudioSendStream(send_config);
   if (field_trial::IsEnabled("WebRTC-SendSideBwe-WithOverhead")) {

test/scenario/call_client.cc

diff --git a/test/scenario/call_client.cc b/test/scenario/call_client.cc
index f51627b..0fbd2bc 100644
--- a/test/scenario/call_client.cc
+++ b/test/scenario/call_client.cc
@@ -147,12 +147,6 @@
                        fake_audio_setup_.audio_state)),
       transport_(clock_, call_.get()),
       header_parser_(RtpHeaderParser::Create()) {
-  if (!config.priority_target_rate.IsZero() &&
-      config.priority_target_rate.IsFinite()) {
-    call_->SetBitrateAllocationStrategy(
-        absl::make_unique<rtc::AudioPriorityBitrateAllocationStrategy>(
-            kPriorityStreamId, config.priority_target_rate.bps()));
-  }
 }  // namespace test
 
 CallClient::~CallClient() {

test/scenario/scenario_config.h

diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h
index 8606d5f4..a4d55ab 100644
--- a/test/scenario/scenario_config.h
+++ b/test/scenario/scenario_config.h
@@ -51,7 +51,6 @@
 
 struct CallClientConfig {
   TransportControllerConfig transport;
-  DataRate priority_target_rate = DataRate::Zero();
 };
 
 struct SimulatedTimeClientConfig {
@@ -155,6 +154,7 @@
     absl::optional<DataRate> fixed_rate;
     absl::optional<DataRate> min_rate;
     absl::optional<DataRate> max_rate;
+    absl::optional<DataRate> priority_rate;
     TimeDelta initial_frame_length = TimeDelta::ms(20);
   } encoder;
   struct Stream {
@@ -162,7 +162,6 @@
     Stream(const Stream&);
     ~Stream();
     bool in_bandwidth_estimation = false;
-    bool rate_allocation_priority = false;
   } stream;
   struct Render {
     std::string sync_group;