Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: webrtc/voice_engine/channel_proxy.cc

Issue 2685673003: Define RtpTransportControllerSendInterface. (Closed)
Patch Set: Fix rebasing error. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/voice_engine/channel_proxy.h" 11 #include "webrtc/voice_engine/channel_proxy.h"
12 12
13 #include <utility> 13 #include <utility>
14 14
15 #include "webrtc/api/call/audio_sink.h" 15 #include "webrtc/api/call/audio_sink.h"
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/call/rtp_transport_controller.h"
17 #include "webrtc/voice_engine/channel.h" 18 #include "webrtc/voice_engine/channel.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 namespace voe { 21 namespace voe {
21 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {} 22 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {}
22 23
23 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) : 24 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) :
24 channel_owner_(channel_owner) { 25 channel_owner_(channel_owner) {
25 RTC_CHECK(channel_owner_.channel()); 26 RTC_CHECK(channel_owner_.channel());
26 } 27 }
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 67 RTC_DCHECK(thread_checker_.CalledOnValidThread());
67 channel()->EnableSendTransportSequenceNumber(id); 68 channel()->EnableSendTransportSequenceNumber(id);
68 } 69 }
69 70
70 void ChannelProxy::EnableReceiveTransportSequenceNumber(int id) { 71 void ChannelProxy::EnableReceiveTransportSequenceNumber(int id) {
71 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 72 RTC_DCHECK(thread_checker_.CalledOnValidThread());
72 channel()->EnableReceiveTransportSequenceNumber(id); 73 channel()->EnableReceiveTransportSequenceNumber(id);
73 } 74 }
74 75
75 void ChannelProxy::RegisterSenderCongestionControlObjects( 76 void ChannelProxy::RegisterSenderCongestionControlObjects(
76 RtpPacketSender* rtp_packet_sender, 77 RtpTransportControllerSendInterface* transport,
77 TransportFeedbackObserver* transport_feedback_observer,
78 PacketRouter* packet_router,
79 RtcpBandwidthObserver* bandwidth_observer) { 78 RtcpBandwidthObserver* bandwidth_observer) {
80 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 79 RTC_DCHECK(thread_checker_.CalledOnValidThread());
81 channel()->RegisterSenderCongestionControlObjects( 80 channel()->RegisterSenderCongestionControlObjects(transport,
82 rtp_packet_sender, transport_feedback_observer, packet_router, 81 bandwidth_observer);
83 bandwidth_observer);
84 } 82 }
85 83
86 void ChannelProxy::RegisterReceiverCongestionControlObjects( 84 void ChannelProxy::RegisterReceiverCongestionControlObjects(
87 PacketRouter* packet_router) { 85 PacketRouter* packet_router) {
88 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 86 RTC_DCHECK(thread_checker_.CalledOnValidThread());
89 channel()->RegisterReceiverCongestionControlObjects(packet_router); 87 channel()->RegisterReceiverCongestionControlObjects(packet_router);
90 } 88 }
91 89
92 void ChannelProxy::ResetCongestionControlObjects() { 90 void ChannelProxy::ResetCongestionControlObjects() {
93 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 91 RTC_DCHECK(thread_checker_.CalledOnValidThread());
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 return channel()->SetSendCNPayloadType(type, frequency) == 0; 365 return channel()->SetSendCNPayloadType(type, frequency) == 0;
368 } 366 }
369 367
370 Channel* ChannelProxy::channel() const { 368 Channel* ChannelProxy::channel() const {
371 RTC_DCHECK(channel_owner_.channel()); 369 RTC_DCHECK(channel_owner_.channel());
372 return channel_owner_.channel(); 370 return channel_owner_.channel();
373 } 371 }
374 372
375 } // namespace voe 373 } // namespace voe
376 } // namespace webrtc 374 } // namespace webrtc
OLDNEW
« webrtc/call/rtp_transport_controller.h ('K') | « webrtc/voice_engine/channel_proxy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698