admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds binary proto ANA support in scenario tests.

Browse Source 
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 <jakobi@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30633}
This commit is contained in:
Sebastian Jansson 2020-02-27 12:04:20 +01:00 committed by Commit Bot
parent 8ad3427d7f
commit 7c1ac76f52
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/scenario/audio_stream.cc
View File

@ -96,8 +96,9 @@ SendAudioStream::SendAudioStream(
if (config.encoder.fixed_rate) if (config.encoder.fixed_rate)
send_config.send_codec_spec->target_bitrate_bps = send_config.send_codec_spec->target_bitrate_bps =
config.encoder.fixed_rate->bps(); config.encoder.fixed_rate->bps();
if (!config.adapt.binary_proto.empty()) {
if (config.network_adaptation) { send_config.audio_network_adaptor_config = config.adapt.binary_proto;
} else if (config.network_adaptation) {
send_config.audio_network_adaptor_config = send_config.audio_network_adaptor_config =
CreateAdaptationString(config.adapt); CreateAdaptationString(config.adapt);
} }

1
test/scenario/scenario_config.h
View File

@ -190,6 +190,7 @@ struct AudioStreamConfig {
DataRate min_rate_for_60_ms = DataRate::Zero(); DataRate min_rate_for_60_ms = DataRate::Zero();
DataRate max_rate_for_120_ms = DataRate::Infinity(); DataRate max_rate_for_120_ms = DataRate::Infinity();
} frame; } frame;
std::string binary_proto;
} adapt; } adapt;
struct Encoder { struct Encoder {
Encoder(); Encoder();