commit f2c0818fa25a3c9c895ea768f682f3fb27e19454
author Mirko Bonadei <mbonadei@webrtc.org> Wed Nov 27 07:47:51 2019
committer Commit Bot <commit-bot@chromium.org> Mon Dec 02 09:30:51 2019
tree 635e0063e0ce328b4a374a5b540c8258705fa85f
parent b0db98cf060d845c9c1b0035c071b4276f284ad2

Minor fixes to ChannelSend.

Bug: None
Change-Id: Ic651174afa2d8b9b105d03adcf725549bcc144df
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160782
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29968}

audio/channel_send.cc

diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index 5bb2cbe..5541d75 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -433,7 +433,7 @@
                                          // 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 @@
   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();