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

Unified Diff: webrtc/video/encoder_state_feedback.h

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_unittest.cc ('k') | webrtc/video/encoder_state_feedback.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/encoder_state_feedback.h
diff --git a/webrtc/video_engine/encoder_state_feedback.h b/webrtc/video/encoder_state_feedback.h
similarity index 92%
rename from webrtc/video_engine/encoder_state_feedback.h
rename to webrtc/video/encoder_state_feedback.h
index 51e9111dfe1e403e6dcae07b8ded1fab8b65df29..620e382d89060769c277075cc2b9665121074b6c 100644
--- a/webrtc/video_engine/encoder_state_feedback.h
+++ b/webrtc/video/encoder_state_feedback.h
@@ -11,8 +11,8 @@
// TODO(mflodman) ViEEncoder has a time check to not send key frames too often,
// move the logic to this class.
-#ifndef WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
-#define WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
+#ifndef WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
+#define WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
#include <map>
#include <vector>
@@ -68,4 +68,4 @@ class EncoderStateFeedback {
} // namespace webrtc
-#endif // WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
+#endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
« no previous file with comments | « webrtc/video/call_stats_unittest.cc ('k') | webrtc/video/encoder_state_feedback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698