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 #include "webrtc/video_engine/stream_synchronization.h" | 11 #include "webrtc/video_engine/stream_synchronization.h" |
12 | 12 |
13 #include <assert.h> | 13 #include <assert.h> |
14 #include <math.h> | 14 #include <math.h> |
15 #include <stdlib.h> | 15 #include <stdlib.h> |
16 | 16 |
17 #include <algorithm> | 17 #include <algorithm> |
18 | 18 |
19 #include "webrtc/system_wrappers/interface/logging.h" | 19 #include "webrtc/base/logging.h" |
20 | 20 |
21 namespace webrtc { | 21 namespace webrtc { |
22 | 22 |
23 static const int kMaxChangeMs = 80; | 23 static const int kMaxChangeMs = 80; |
24 static const int kMaxDeltaDelayMs = 10000; | 24 static const int kMaxDeltaDelayMs = 10000; |
25 static const int kFilterLength = 4; | 25 static const int kFilterLength = 4; |
26 // Minimum difference between audio and video to warrant a change. | 26 // Minimum difference between audio and video to warrant a change. |
27 static const int kMinDeltaMs = 30; | 27 static const int kMinDeltaMs = 30; |
28 | 28 |
29 struct ViESyncDelay { | 29 struct ViESyncDelay { |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 target_delay_ms - base_target_delay_ms_; | 217 target_delay_ms - base_target_delay_ms_; |
218 | 218 |
219 channel_delay_->extra_video_delay_ms += | 219 channel_delay_->extra_video_delay_ms += |
220 target_delay_ms - base_target_delay_ms_; | 220 target_delay_ms - base_target_delay_ms_; |
221 | 221 |
222 // Video is already delayed by the desired amount. | 222 // Video is already delayed by the desired amount. |
223 base_target_delay_ms_ = target_delay_ms; | 223 base_target_delay_ms_ = target_delay_ms; |
224 } | 224 } |
225 | 225 |
226 } // namespace webrtc | 226 } // namespace webrtc |
OLD | NEW |