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

Unified Diff: webrtc/video/call_stats.cc

Issue 1506773002: Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/call_stats.h ('k') | webrtc/video/call_stats_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/call_stats.cc
diff --git a/webrtc/video_engine/call_stats.cc b/webrtc/video/call_stats.cc
similarity index 98%
rename from webrtc/video_engine/call_stats.cc
rename to webrtc/video/call_stats.cc
index 4d5338c5fc162301796aba889ce8442c63cd4c9d..8a2802ff546ef200f5ee573da839bd8ff2d852b8 100644
--- a/webrtc/video_engine/call_stats.cc
+++ b/webrtc/video/call_stats.cc
@@ -8,10 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video_engine/call_stats.h"
+#include "webrtc/video/call_stats.h"
#include <assert.h>
+#include <algorithm>
+
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
#include "webrtc/system_wrappers/include/tick_util.h"
« no previous file with comments | « webrtc/video/call_stats.h ('k') | webrtc/video/call_stats_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698