OLD | NEW |
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 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 // conversion. | 45 // conversion. |
46 bool GetStreamSyncOffsetInMs(uint32_t timestamp, | 46 bool GetStreamSyncOffsetInMs(uint32_t timestamp, |
47 int64_t render_time_ms, | 47 int64_t render_time_ms, |
48 int64_t* stream_offset_ms, | 48 int64_t* stream_offset_ms, |
49 double* estimated_freq_khz) const; | 49 double* estimated_freq_khz) const; |
50 | 50 |
51 private: | 51 private: |
52 Syncable* syncable_video_; | 52 Syncable* syncable_video_; |
53 | 53 |
54 rtc::CriticalSection crit_; | 54 rtc::CriticalSection crit_; |
55 Syncable* syncable_audio_ GUARDED_BY(crit_); | 55 Syncable* syncable_audio_ RTC_GUARDED_BY(crit_); |
56 std::unique_ptr<StreamSynchronization> sync_ GUARDED_BY(crit_); | 56 std::unique_ptr<StreamSynchronization> sync_ RTC_GUARDED_BY(crit_); |
57 StreamSynchronization::Measurements audio_measurement_ GUARDED_BY(crit_); | 57 StreamSynchronization::Measurements audio_measurement_ RTC_GUARDED_BY(crit_); |
58 StreamSynchronization::Measurements video_measurement_ GUARDED_BY(crit_); | 58 StreamSynchronization::Measurements video_measurement_ RTC_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_ RTC_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_ |
OLD | NEW |