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 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/file_player.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
17 #include "webrtc/base/logging.h"
18 #include "webrtc/base/safe_minmax.h"
19 #include "webrtc/call/rtp_transport_controller_send_interface.h" 16 #include "webrtc/call/rtp_transport_controller_send_interface.h"
17 #include "webrtc/rtc_base/checks.h"
18 #include "webrtc/rtc_base/logging.h"
19 #include "webrtc/rtc_base/safe_minmax.h"
20 #include "webrtc/voice_engine/channel.h" 20 #include "webrtc/voice_engine/channel.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 namespace voe { 23 namespace voe {
24 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {} 24 ChannelProxy::ChannelProxy() : channel_owner_(nullptr) {}
25 25
26 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) : 26 ChannelProxy::ChannelProxy(const ChannelOwner& channel_owner) :
27 channel_owner_(channel_owner) { 27 channel_owner_(channel_owner) {
28 RTC_CHECK(channel_owner_.channel()); 28 RTC_CHECK(channel_owner_.channel());
29 module_process_thread_checker_.DetachFromThread(); 29 module_process_thread_checker_.DetachFromThread();
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 return channel()->GetSources(); 333 return channel()->GetSources();
334 } 334 }
335 335
336 Channel* ChannelProxy::channel() const { 336 Channel* ChannelProxy::channel() const {
337 RTC_DCHECK(channel_owner_.channel()); 337 RTC_DCHECK(channel_owner_.channel());
338 return channel_owner_.channel(); 338 return channel_owner_.channel();
339 } 339 }
340 340
341 } // namespace voe 341 } // namespace voe
342 } // namespace webrtc 342 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/channel_proxy.h ('k') | webrtc/voice_engine/file_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698