From 7c1ac76f52210b075c53f3deb28f5f8d45b93e7b Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Thu, 27 Feb 2020 12:04:20 +0100 Subject: [PATCH] Adds binary proto ANA support in scenario tests. This makes it easier to reuse existing audio network adaptation configurations in the scenario framework. Bug: webrtc:9510 Change-Id: I06ab08684d449fef7fffe265d1078738d526a43d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169363 Reviewed-by: Jakob Ivarsson Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#30633} --- test/scenario/audio_stream.cc | 5 +++-- test/scenario/scenario_config.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc index 577b9352ff..a4ec5aa292 100644 --- a/test/scenario/audio_stream.cc +++ b/test/scenario/audio_stream.cc @@ -96,8 +96,9 @@ SendAudioStream::SendAudioStream( if (config.encoder.fixed_rate) send_config.send_codec_spec->target_bitrate_bps = config.encoder.fixed_rate->bps(); - - if (config.network_adaptation) { + if (!config.adapt.binary_proto.empty()) { + send_config.audio_network_adaptor_config = config.adapt.binary_proto; + } else if (config.network_adaptation) { send_config.audio_network_adaptor_config = CreateAdaptationString(config.adapt); } diff --git a/test/scenario/scenario_config.h b/test/scenario/scenario_config.h index fa998b89eb..c9d636a67f 100644 --- a/test/scenario/scenario_config.h +++ b/test/scenario/scenario_config.h @@ -190,6 +190,7 @@ struct AudioStreamConfig { DataRate min_rate_for_60_ms = DataRate::Zero(); DataRate max_rate_for_120_ms = DataRate::Infinity(); } frame; + std::string binary_proto; } adapt; struct Encoder { Encoder();