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

Side by Side Diff: webrtc/pc/channelmanager.h

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/pc/channel_unittest.cc ('k') | webrtc/pc/channelmanager.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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 #ifndef WEBRTC_PC_CHANNELMANAGER_H_ 11 #ifndef WEBRTC_PC_CHANNELMANAGER_H_
12 #define WEBRTC_PC_CHANNELMANAGER_H_ 12 #define WEBRTC_PC_CHANNELMANAGER_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/fileutils.h"
19 #include "webrtc/base/thread.h"
20 #include "webrtc/media/base/mediaengine.h" 18 #include "webrtc/media/base/mediaengine.h"
21 #include "webrtc/pc/voicechannel.h" 19 #include "webrtc/pc/voicechannel.h"
20 #include "webrtc/rtc_base/fileutils.h"
21 #include "webrtc/rtc_base/thread.h"
22 22
23 namespace cricket { 23 namespace cricket {
24 24
25 class VoiceChannel; 25 class VoiceChannel;
26 26
27 // ChannelManager allows the MediaEngine to run on a separate thread, and takes 27 // ChannelManager allows the MediaEngine to run on a separate thread, and takes
28 // care of marshalling calls between threads. It also creates and keeps track of 28 // care of marshalling calls between threads. It also creates and keeps track of
29 // voice and video channels; by doing so, it can temporarily pause all the 29 // voice and video channels; by doing so, it can temporarily pause all the
30 // channels when a new audio or video device is chosen. The voice and video 30 // channels when a new audio or video device is chosen. The voice and video
31 // channels are stored in separate vectors, to easily allow operations on just 31 // channels are stored in separate vectors, to easily allow operations on just
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 VideoChannels video_channels_; 216 VideoChannels video_channels_;
217 RtpDataChannels data_channels_; 217 RtpDataChannels data_channels_;
218 218
219 bool enable_rtx_; 219 bool enable_rtx_;
220 bool capturing_; 220 bool capturing_;
221 }; 221 };
222 222
223 } // namespace cricket 223 } // namespace cricket
224 224
225 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 225 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/pc/channel_unittest.cc ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698