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

Side by Side Diff: webrtc/video/stream_synchronization.cc

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/stats_counter.cc ('k') | webrtc/video/transport_adapter.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 #include "webrtc/video/stream_synchronization.h" 11 #include "webrtc/video/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/base/logging.h" 19 #include "webrtc/rtc_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 StreamSynchronization::StreamSynchronization(int video_stream_id, 29 StreamSynchronization::StreamSynchronization(int video_stream_id,
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 target_delay_ms - base_target_delay_ms_; 189 target_delay_ms - base_target_delay_ms_;
190 190
191 channel_delay_.extra_video_delay_ms += 191 channel_delay_.extra_video_delay_ms +=
192 target_delay_ms - base_target_delay_ms_; 192 target_delay_ms - base_target_delay_ms_;
193 193
194 // Video is already delayed by the desired amount. 194 // Video is already delayed by the desired amount.
195 base_target_delay_ms_ = target_delay_ms; 195 base_target_delay_ms_ = target_delay_ms;
196 } 196 }
197 197
198 } // namespace webrtc 198 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/stats_counter.cc ('k') | webrtc/video/transport_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698