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

Side by Side Diff: webrtc/pc/mediamonitor.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/mediaconstraintsinterface_unittest.cc ('k') | webrtc/pc/mediamonitor.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 2005 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2005 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 // Class to collect statistics from a media channel 11 // Class to collect statistics from a media channel
12 12
13 #ifndef WEBRTC_PC_MEDIAMONITOR_H_ 13 #ifndef WEBRTC_PC_MEDIAMONITOR_H_
14 #define WEBRTC_PC_MEDIAMONITOR_H_ 14 #define WEBRTC_PC_MEDIAMONITOR_H_
15 15
16 #include "webrtc/base/criticalsection.h"
17 #include "webrtc/base/sigslot.h"
18 #include "webrtc/base/thread.h"
19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/media/base/mediachannel.h" 16 #include "webrtc/media/base/mediachannel.h"
17 #include "webrtc/rtc_base/criticalsection.h"
18 #include "webrtc/rtc_base/sigslot.h"
19 #include "webrtc/rtc_base/thread.h"
20 #include "webrtc/rtc_base/thread_annotations.h"
21 21
22 namespace cricket { 22 namespace cricket {
23 23
24 // The base MediaMonitor class, independent of voice and video. 24 // The base MediaMonitor class, independent of voice and video.
25 class MediaMonitor : public rtc::MessageHandler, 25 class MediaMonitor : public rtc::MessageHandler,
26 public sigslot::has_slots<> { 26 public sigslot::has_slots<> {
27 public: 27 public:
28 MediaMonitor(rtc::Thread* worker_thread, 28 MediaMonitor(rtc::Thread* worker_thread,
29 rtc::Thread* monitor_thread); 29 rtc::Thread* monitor_thread);
30 ~MediaMonitor(); 30 ~MediaMonitor();
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 MI media_info_; 73 MI media_info_;
74 }; 74 };
75 75
76 typedef MediaMonitorT<VoiceMediaChannel, VoiceMediaInfo> VoiceMediaMonitor; 76 typedef MediaMonitorT<VoiceMediaChannel, VoiceMediaInfo> VoiceMediaMonitor;
77 typedef MediaMonitorT<VideoMediaChannel, VideoMediaInfo> VideoMediaMonitor; 77 typedef MediaMonitorT<VideoMediaChannel, VideoMediaInfo> VideoMediaMonitor;
78 typedef MediaMonitorT<DataMediaChannel, DataMediaInfo> DataMediaMonitor; 78 typedef MediaMonitorT<DataMediaChannel, DataMediaInfo> DataMediaMonitor;
79 79
80 } // namespace cricket 80 } // namespace cricket
81 81
82 #endif // WEBRTC_PC_MEDIAMONITOR_H_ 82 #endif // WEBRTC_PC_MEDIAMONITOR_H_
OLDNEW
« no previous file with comments | « webrtc/pc/mediaconstraintsinterface_unittest.cc ('k') | webrtc/pc/mediamonitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698