From f2c0818fa25a3c9c895ea768f682f3fb27e19454 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 27 Nov 2019 08:47:51 +0100 Subject: [PATCH] Minor fixes to ChannelSend. Bug: None Change-Id: Ic651174afa2d8b9b105d03adcf725549bcc144df Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160782 Reviewed-by: Gustaf Ullberg Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#29968} --- audio/channel_send.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/audio/channel_send.cc b/audio/channel_send.cc index 5bb2cbeb2c..5541d75c10 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -433,7 +433,7 @@ int32_t ChannelSend::SendRtpAudio(AudioFrameType frameType, // undefined for voice for now. -1, payloadType, /*force_sender_report=*/false)) { - return false; + return -1; } // RTCPSender has it's own copy of the timestamp offset, added in @@ -491,9 +491,8 @@ ChannelSend::ChannelSend(Clock* clock, configuration.overhead_observer = overhead_observer; configuration.bandwidth_callback = rtcp_observer_.get(); configuration.transport_feedback_callback = feedback_observer_proxy_.get(); - configuration.clock = clock; + configuration.clock = (clock ? clock : Clock::GetRealTimeClock()); configuration.audio = true; - configuration.clock = Clock::GetRealTimeClock(); configuration.outgoing_transport = rtp_transport; configuration.paced_sender = rtp_packet_pacer_proxy_.get();