From 455d27c49abfff587babed348ae90f1aba75969e Mon Sep 17 00:00:00 2001 From: Minyue Li Date: Mon, 7 Jan 2019 13:14:30 +0100 Subject: [PATCH] Adding audio network adaptor to video quality test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: b/122445011 Change-Id: I2f652f972e500fa700b65d89cb044f98bcfb1eed Reviewed-on: https://webrtc-review.googlesource.com/c/116282 Reviewed-by: Erik Språng Reviewed-by: Per Kjellander Commit-Queue: Minyue Li Cr-Commit-Position: refs/heads/master@{#26158} --- api/test/video_quality_test_fixture.h | 1 + video/video_quality_test.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h index 069a24353d..1c82a0de13 100644 --- a/api/test/video_quality_test_fixture.h +++ b/api/test/video_quality_test_fixture.h @@ -66,6 +66,7 @@ class VideoQualityTestFixtureInterface { bool sync_video; bool dtx; bool use_real_adm; + absl::optional ana_config; } audio; struct Screenshare { bool enabled; diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index b3cf33bc20..28b5f2a403 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -1214,6 +1214,8 @@ void VideoQualityTest::SetupAudio(Transport* transport) { audio_send_config.min_bitrate_bps = kOpusMinBitrateBps; audio_send_config.max_bitrate_bps = kOpusBitrateFbBps; audio_send_config.send_codec_spec->transport_cc_enabled = true; + // Only allow ANA when send-side BWE is enabled. + audio_send_config.audio_network_adaptor_config = params_.audio.ana_config; } audio_send_config.encoder_factory = audio_encoder_factory_; SetAudioConfig(audio_send_config);