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

Side by Side Diff: webrtc/video_engine/call_stats.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years 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_engine/call_stats.h ('k') | webrtc/video_engine/call_stats_unittest.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/call_stats.h" 11 #include "webrtc/video_engine/call_stats.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include <algorithm>
16
17 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 15 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
18 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
19 #include "webrtc/system_wrappers/include/tick_util.h" 17 #include "webrtc/system_wrappers/include/tick_util.h"
20 18
21 namespace webrtc { 19 namespace webrtc {
22 namespace { 20 namespace {
23 // Time interval for updating the observers. 21 // Time interval for updating the observers.
24 const int64_t kUpdateIntervalMs = 1000; 22 const int64_t kUpdateIntervalMs = 1000;
25 // Weight factor to apply to the average rtt. 23 // Weight factor to apply to the average rtt.
26 const float kWeightFactor = 0.3f; 24 const float kWeightFactor = 0.3f;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 } 158 }
161 } 159 }
162 } 160 }
163 161
164 void CallStats::OnRttUpdate(int64_t rtt) { 162 void CallStats::OnRttUpdate(int64_t rtt) {
165 CriticalSectionScoped cs(crit_.get()); 163 CriticalSectionScoped cs(crit_.get());
166 reports_.push_back(RttTime(rtt, TickTime::MillisecondTimestamp())); 164 reports_.push_back(RttTime(rtt, TickTime::MillisecondTimestamp()));
167 } 165 }
168 166
169 } // namespace webrtc 167 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/call_stats.h ('k') | webrtc/video_engine/call_stats_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698