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

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

Issue 1479023002: Prepare the AudioSendStream to be hooked up to send-side BWE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix GN bots. Created 5 years 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 "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
the sun 2015/11/30 12:37:20 not needed?
stefan-webrtc 2015/11/30 15:22:02 Done.
14 #include "webrtc/voice_engine/channel.h" 15 #include "webrtc/voice_engine/channel.h"
15 16
16 namespace webrtc { 17 namespace webrtc {
17 namespace voe { 18 namespace voe {
18 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {} 19 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {}
19 20
20 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) : 21 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) :
21 channel_owner_(channel_owner) { 22 channel_owner_(channel_owner) {
22 RTC_CHECK(channel_owner_.channel()); 23 RTC_CHECK(channel_owner_.channel());
23 } 24 }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 106
106 uint32_t ChannelProxy::GetDelayEstimate() const { 107 uint32_t ChannelProxy::GetDelayEstimate() const {
107 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 108 RTC_DCHECK(thread_checker_.CalledOnValidThread());
108 return channel()->GetDelayEstimate(); 109 return channel()->GetDelayEstimate();
109 } 110 }
110 111
111 Channel* ChannelProxy::channel() const { 112 Channel* ChannelProxy::channel() const {
112 RTC_DCHECK(channel_owner_.channel()); 113 RTC_DCHECK(channel_owner_.channel());
113 return channel_owner_.channel(); 114 return channel_owner_.channel();
114 } 115 }
116
117 void ChannelProxy::SetSendTransportSequenceNumber(int id) {
118 RTC_DCHECK(channel_owner_.channel());
119 channel_owner_.channel()->SetSendTransportSequenceNumber(id);
the sun 2015/11/30 12:37:20 Use the channel() helper instead of the DCHECK+cal
stefan-webrtc 2015/11/30 15:22:02 Ah, I don't think channel() was available when I w
120 }
121
122 void ChannelProxy::SetCongestionControlObjects(
123 RtpPacketSender* rtp_packet_sender,
124 TransportFeedbackObserver* transport_feedback_observer,
125 PacketRouter* packet_router) {
126 RTC_DCHECK(channel_owner_.channel());
127 channel_owner_.channel()->SetCongestionControlObjects(
128 rtp_packet_sender, transport_feedback_observer, packet_router);
129 }
115 } // namespace voe 130 } // namespace voe
116 } // namespace webrtc 131 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698