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

Side by Side Diff: webrtc/video/rtp_streams_synchronizer.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/video/replay.cc ('k') | webrtc/video/rtp_streams_synchronizer.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 // RtpStreamsSynchronizer is responsible for synchronization audio and video for 11 // RtpStreamsSynchronizer is responsible for synchronization audio and video for
12 // a given voice engine channel and video receive stream. 12 // a given voice engine channel and video receive stream.
13 13
14 #ifndef WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ 14 #ifndef WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
15 #define WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ 15 #define WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
16 16
17 #include <memory> 17 #include <memory>
18 18
19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/thread_checker.h"
21 #include "webrtc/modules/include/module.h" 19 #include "webrtc/modules/include/module.h"
20 #include "webrtc/rtc_base/criticalsection.h"
21 #include "webrtc/rtc_base/thread_checker.h"
22 #include "webrtc/video/stream_synchronization.h" 22 #include "webrtc/video/stream_synchronization.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class Syncable; 26 class Syncable;
27 27
28 namespace vcm { 28 namespace vcm {
29 class VideoReceiver; 29 class VideoReceiver;
30 } // namespace vcm 30 } // namespace vcm
31 31
(...skipping 25 matching lines...) Expand all
57 StreamSynchronization::Measurements audio_measurement_ GUARDED_BY(crit_); 57 StreamSynchronization::Measurements audio_measurement_ GUARDED_BY(crit_);
58 StreamSynchronization::Measurements video_measurement_ GUARDED_BY(crit_); 58 StreamSynchronization::Measurements video_measurement_ GUARDED_BY(crit_);
59 59
60 rtc::ThreadChecker process_thread_checker_; 60 rtc::ThreadChecker process_thread_checker_;
61 int64_t last_sync_time_ ACCESS_ON(&process_thread_checker_); 61 int64_t last_sync_time_ ACCESS_ON(&process_thread_checker_);
62 }; 62 };
63 63
64 } // namespace webrtc 64 } // namespace webrtc
65 65
66 #endif // WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_ 66 #endif // WEBRTC_VIDEO_RTP_STREAMS_SYNCHRONIZER_H_
OLDNEW
« no previous file with comments | « webrtc/video/replay.cc ('k') | webrtc/video/rtp_streams_synchronizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698