From ed971167ddd36eba46b2e4435bb5baf2ec55a9b7 Mon Sep 17 00:00:00 2001 From: Jakob Ivarsson Date: Tue, 11 Aug 2020 14:05:07 +0200 Subject: [PATCH] Log audio network adaptor and DSCP in AudioSendStream. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: chromium:1086942 Change-Id: I94177a3a0cf10e6af62b7787dcf5d14329443c8a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/180661 Reviewed-by: Per Åhgren Reviewed-by: Sebastian Jansson Commit-Queue: Jakob Ivarsson Cr-Commit-Position: refs/heads/master@{#31928} --- audio/audio_send_stream.cc | 20 ++++++++++---------- audio/audio_send_stream_unittest.cc | 4 +++- call/audio_send_stream.cc | 3 +++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc index 1856902d5e..24f8ce908e 100644 --- a/audio/audio_send_stream.cc +++ b/audio/audio_send_stream.cc @@ -638,11 +638,11 @@ bool AudioSendStream::SetupSendCodec(const Config& new_config) { if (new_config.audio_network_adaptor_config) { if (encoder->EnableAudioNetworkAdaptor( *new_config.audio_network_adaptor_config, event_log_)) { - RTC_DLOG(LS_INFO) << "Audio network adaptor enabled on SSRC " - << new_config.rtp.ssrc; + RTC_LOG(LS_INFO) << "Audio network adaptor enabled on SSRC " + << new_config.rtp.ssrc; } else { - RTC_DLOG(LS_INFO) << "Failed to enable Audio network adaptor on SSRC " - << new_config.rtp.ssrc; + RTC_LOG(LS_INFO) << "Failed to enable Audio network adaptor on SSRC " + << new_config.rtp.ssrc; } } @@ -737,18 +737,18 @@ void AudioSendStream::ReconfigureANA(const Config& new_config) { channel_send_->CallEncoder([&](AudioEncoder* encoder) { if (encoder->EnableAudioNetworkAdaptor( *new_config.audio_network_adaptor_config, event_log_)) { - RTC_DLOG(LS_INFO) << "Audio network adaptor enabled on SSRC " - << new_config.rtp.ssrc; + RTC_LOG(LS_INFO) << "Audio network adaptor enabled on SSRC " + << new_config.rtp.ssrc; } else { - RTC_DLOG(LS_INFO) << "Failed to enable Audio network adaptor on SSRC " - << new_config.rtp.ssrc; + RTC_LOG(LS_INFO) << "Failed to enable Audio network adaptor on SSRC " + << new_config.rtp.ssrc; } }); } else { channel_send_->CallEncoder( [&](AudioEncoder* encoder) { encoder->DisableAudioNetworkAdaptor(); }); - RTC_DLOG(LS_INFO) << "Audio network adaptor disabled on SSRC " - << new_config.rtp.ssrc; + RTC_LOG(LS_INFO) << "Audio network adaptor disabled on SSRC " + << new_config.rtp.ssrc; } } diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc index d094198721..481405c297 100644 --- a/audio/audio_send_stream_unittest.cc +++ b/audio/audio_send_stream_unittest.cc @@ -366,6 +366,7 @@ TEST(AudioSendStreamTest, ConfigToString) { config.rtp.c_name = kCName; config.min_bitrate_bps = 12000; config.max_bitrate_bps = 34000; + config.has_dscp = true; config.send_codec_spec = AudioSendStream::Config::SendCodecSpec(kIsacPayloadType, kIsacFormat); config.send_codec_spec->nack_enabled = true; @@ -382,7 +383,8 @@ TEST(AudioSendStreamTest, ConfigToString) { "urn:ietf:params:rtp-hdrext:ssrc-audio-level, id: 2}], " "c_name: foo_name}, rtcp_report_interval_ms: 2500, " "send_transport: null, " - "min_bitrate_bps: 12000, max_bitrate_bps: 34000, " + "min_bitrate_bps: 12000, max_bitrate_bps: 34000, has " + "audio_network_adaptor_config: false, has_dscp: true, " "send_codec_spec: {nack_enabled: true, transport_cc_enabled: false, " "cng_payload_type: 42, red_payload_type: 43, payload_type: 103, " "format: {name: isac, clockrate_hz: 16000, num_channels: 1, " diff --git a/call/audio_send_stream.cc b/call/audio_send_stream.cc index 1f5bf0518b..5acdc9618f 100644 --- a/call/audio_send_stream.cc +++ b/call/audio_send_stream.cc @@ -34,6 +34,9 @@ std::string AudioSendStream::Config::ToString() const { ss << ", send_transport: " << (send_transport ? "(Transport)" : "null"); ss << ", min_bitrate_bps: " << min_bitrate_bps; ss << ", max_bitrate_bps: " << max_bitrate_bps; + ss << ", has audio_network_adaptor_config: " + << (audio_network_adaptor_config ? "true" : "false"); + ss << ", has_dscp: " << (has_dscp ? "true" : "false"); ss << ", send_codec_spec: " << (send_codec_spec ? send_codec_spec->ToString() : ""); ss << '}';