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

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

Issue 1909333002: Switch voice transport to use Call and Stream instead of VoENetwork. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove VoENetwork from perf test. Created 4 years, 8 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
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) { 151 bool ChannelProxy::SendTelephoneEventOutband(int event, int duration_ms) {
152 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 152 RTC_DCHECK(thread_checker_.CalledOnValidThread());
153 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0; 153 return channel()->SendTelephoneEventOutband(event, duration_ms) == 0;
154 } 154 }
155 155
156 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) { 156 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
157 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 157 RTC_DCHECK(thread_checker_.CalledOnValidThread());
158 channel()->SetSink(std::move(sink)); 158 channel()->SetSink(std::move(sink));
159 } 159 }
160 160
161 void ChannelProxy::RegisterExternalTransport(Transport* transport) {
the sun 2016/04/22 12:40:32 Add: RTC_DCHECK(thread_checker_.CalledOnValidThrea
mflodman 2016/04/27 13:42:18 Done.
162 channel()->RegisterExternalTransport(*transport);
the sun 2016/04/22 12:40:32 Change Channel::RegisterExternalTransport() to tak
mflodman 2016/04/27 13:42:18 Done. And agree is should be safe, but the logic c
163 }
164
165 void ChannelProxy::DeRegisterExternalTransport() {
the sun 2016/04/22 12:40:32 Add: RTC_DCHECK(thread_checker_.CalledOnValidThrea
mflodman 2016/04/27 13:42:18 Done.
166 channel()->DeRegisterExternalTransport();
167 }
168
169 bool ChannelProxy::ReceivedRTPPacket(const uint8_t* packet,
170 size_t length,
171 const PacketTime& packet_time) {
the sun 2016/04/22 12:40:32 Add: // May be called on either worker thread or n
mflodman 2016/04/27 13:42:18 Done.
172 return channel()->ReceivedRTPPacket(packet, length, packet_time) == 0;
173 }
174
175 bool ChannelProxy::ReceivedRTCPPacket(const uint8_t* packet, size_t length) {
176 return channel()->ReceivedRTCPPacket(packet, length) == 0;
177 }
178
161 Channel* ChannelProxy::channel() const { 179 Channel* ChannelProxy::channel() const {
162 RTC_DCHECK(channel_owner_.channel()); 180 RTC_DCHECK(channel_owner_.channel());
163 return channel_owner_.channel(); 181 return channel_owner_.channel();
164 } 182 }
165 183
166 } // namespace voe 184 } // namespace voe
167 } // namespace webrtc 185 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698