webrtc/video_engine/encoder_state_feedback.h - Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/video_engine/encoder_state_feedback.h

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 side-by-side diff with in-line comments

Download patch

Index: webrtc/video_engine/encoder_state_feedback.h

diff --git a/webrtc/video/encoder_state_feedback.h b/webrtc/video_engine/encoder_state_feedback.h

similarity index 92%

rename from webrtc/video/encoder_state_feedback.h

rename to webrtc/video_engine/encoder_state_feedback.h

index 620e382d89060769c277075cc2b9665121074b6c..51e9111dfe1e403e6dcae07b8ded1fab8b65df29 100644

--- a/webrtc/video/encoder_state_feedback.h

+++ b/webrtc/video_engine/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_ENCODER_STATE_FEEDBACK_H_

-#define WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_

+#ifndef WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_

+#define WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_

#include <map>

#include <vector>

@@ -68,4 +68,4 @@ class EncoderStateFeedback {

} // namespace webrtc

-#endif // WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_

+#endif // WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_

« no previous file with comments | « webrtc/video_engine/call_stats_unittest.cc ('k') | webrtc/video_engine/encoder_state_feedback.cc » ('j') | no next file with comments »