commit e97719974bdd29917e4bdc97b6a5218f8ad095d4
author Niels Möller <nisse@webrtc.org> Mon Nov 26 10:55:07 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Nov 26 13:08:41 2018 +0000
tree 7616c06de0a50646393fd6da2090dd690a88abd2
parent b2533031a00a2056c8fb9b64dc3e7dc3f3434de0

Delete ChannelSend::RegisterTransport, replacing by construction argument

Bug: webrtc:9719
Change-Id: If3960de660cfa7a65c8bf9375ceb0af0a67d376c
Reviewed-on: https://webrtc-review.googlesource.com/c/111256
Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25784}

audio/channel_send.cc

diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index 31fe25f..c458fe4 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -91,6 +91,7 @@
   ChannelSend(rtc::TaskQueue* encoder_queue,
               ProcessThread* module_process_thread,
               MediaTransportInterface* media_transport,
+              Transport* rtp_transport,
               RtcpRttStats* rtcp_rtt_stats,
               RtcEventLog* rtc_event_log,
               FrameEncryptorInterface* frame_encryptor,
@@ -115,7 +116,6 @@
   int GetBitrate() const override;
 
   // Network
-  void RegisterTransport(Transport* transport) override;
   bool ReceivedRTCPPacket(const uint8_t* data, size_t length) override;
 
   // Muting, Volume and Level.
@@ -254,7 +254,7 @@
 
   // uses
   ProcessThread* const _moduleProcessThreadPtr;
-  Transport* _transportPtr;  // WebRtc socket or external transport
+  Transport* const _transportPtr;  // WebRtc socket or external transport
   RmsLevel rms_level_ RTC_GUARDED_BY(encoder_queue_);
   bool input_mute_ RTC_GUARDED_BY(volume_settings_critsect_);
   bool previous_frame_muted_ RTC_GUARDED_BY(encoder_queue_);
@@ -683,6 +683,7 @@
 ChannelSend::ChannelSend(rtc::TaskQueue* encoder_queue,
                          ProcessThread* module_process_thread,
                          MediaTransportInterface* media_transport,
+                         Transport* rtp_transport,
                          RtcpRttStats* rtcp_rtt_stats,
                          RtcEventLog* rtc_event_log,
                          FrameEncryptorInterface* frame_encryptor,
@@ -694,7 +695,7 @@
                       // random offset
       send_sequence_number_(0),
       _moduleProcessThreadPtr(module_process_thread),
-      _transportPtr(NULL),
+      _transportPtr(rtp_transport),
       input_mute_(false),
       previous_frame_muted_(false),
       _includeAudioLevelIndication(false),
@@ -953,12 +954,6 @@
   });
 }
 
-void ChannelSend::RegisterTransport(Transport* transport) {
-  RTC_DCHECK_RUN_ON(&worker_thread_checker_);
-  rtc::CritScope cs(&_callbackCritSect);
-  _transportPtr = transport;
-}
-
 // TODO(nisse): Delete always-true return value.
 bool ChannelSend::ReceivedRTCPPacket(const uint8_t* data, size_t length) {
   // May be called on either worker thread or network thread.
@@ -1344,6 +1339,7 @@
     rtc::TaskQueue* encoder_queue,
     ProcessThread* module_process_thread,
     MediaTransportInterface* media_transport,
+    Transport* rtp_transport,
     RtcpRttStats* rtcp_rtt_stats,
     RtcEventLog* rtc_event_log,
     FrameEncryptorInterface* frame_encryptor,
@@ -1351,9 +1347,9 @@
     bool extmap_allow_mixed,
     int rtcp_report_interval_ms) {
   return absl::make_unique<ChannelSend>(
-      encoder_queue, module_process_thread, media_transport, rtcp_rtt_stats,
-      rtc_event_log, frame_encryptor, crypto_options, extmap_allow_mixed,
-      rtcp_report_interval_ms);
+      encoder_queue, module_process_thread, media_transport, rtp_transport,
+      rtcp_rtt_stats, rtc_event_log, frame_encryptor, crypto_options,
+      extmap_allow_mixed, rtcp_report_interval_ms);
 }
 
 }  // namespace voe