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 |
11 #ifndef WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ | 11 #ifndef WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ |
12 #define WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ | 12 #define WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ |
13 | 13 |
14 #include <list> | 14 #include <list> |
15 | 15 |
16 #include "webrtc/system_wrappers/include/rtp_to_ntp.h" | 16 #include "webrtc/system_wrappers/include/rtp_to_ntp.h" |
17 #include "webrtc/typedefs.h" | 17 #include "webrtc/typedefs.h" |
18 | 18 |
19 namespace webrtc { | 19 namespace webrtc { |
20 | 20 |
21 class StreamSynchronization { | 21 class StreamSynchronization { |
22 public: | 22 public: |
23 struct Measurements { | 23 struct Measurements { |
24 Measurements() : rtcp(), latest_receive_time_ms(0), latest_timestamp(0) {} | 24 Measurements() : rtcp(), latest_receive_time_ms(0), latest_timestamp(0) {} |
25 RtcpList rtcp; | 25 RtcpMeasurements rtcp; |
26 int64_t latest_receive_time_ms; | 26 int64_t latest_receive_time_ms; |
27 uint32_t latest_timestamp; | 27 uint32_t latest_timestamp; |
28 }; | 28 }; |
29 | 29 |
30 StreamSynchronization(uint32_t video_primary_ssrc, int audio_channel_id); | 30 StreamSynchronization(uint32_t video_primary_ssrc, int audio_channel_id); |
31 | 31 |
32 bool ComputeDelays(int relative_delay_ms, | 32 bool ComputeDelays(int relative_delay_ms, |
33 int current_audio_delay_ms, | 33 int current_audio_delay_ms, |
34 int* extra_audio_delay_ms, | 34 int* extra_audio_delay_ms, |
35 int* total_video_delay_target_ms); | 35 int* total_video_delay_target_ms); |
(...skipping 18 matching lines...) Expand all Loading... |
54 | 54 |
55 SynchronizationDelays channel_delay_; | 55 SynchronizationDelays channel_delay_; |
56 const uint32_t video_primary_ssrc_; | 56 const uint32_t video_primary_ssrc_; |
57 const int audio_channel_id_; | 57 const int audio_channel_id_; |
58 int base_target_delay_ms_; | 58 int base_target_delay_ms_; |
59 int avg_diff_ms_; | 59 int avg_diff_ms_; |
60 }; | 60 }; |
61 } // namespace webrtc | 61 } // namespace webrtc |
62 | 62 |
63 #endif // WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ | 63 #endif // WEBRTC_VIDEO_STREAM_SYNCHRONIZATION_H_ |
OLD | NEW |