webrtc/video_engine/vie_channel.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/vie_channel.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/vie_channel.h

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

similarity index 98%

rename from webrtc/video/vie_channel.h

rename to webrtc/video_engine/vie_channel.h

index ed0712ba42a3c26c46f13c34a1f085c2525e7298..00c953201b529c67f8727b6a21a1fb3cb6d59c22 100644

--- a/webrtc/video/vie_channel.h

+++ b/webrtc/video_engine/vie_channel.h

@@ -8,8 +8,8 @@

* be found in the AUTHORS file in the root of the source tree.

-#ifndef WEBRTC_VIDEO_VIE_CHANNEL_H_

-#define WEBRTC_VIDEO_VIE_CHANNEL_H_

+#ifndef WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_

+#define WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_

#include <list>

#include <map>

@@ -25,8 +25,8 @@

#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

#include "webrtc/system_wrappers/include/tick_util.h"

#include "webrtc/typedefs.h"

-#include "webrtc/video/vie_receiver.h"

-#include "webrtc/video/vie_sync_module.h"

+#include "webrtc/video_engine/vie_receiver.h"

+#include "webrtc/video_engine/vie_sync_module.h"

namespace webrtc {

@@ -454,4 +454,4 @@ class ViEChannel : public VCMFrameTypeCallback,

} // namespace webrtc

-#endif // WEBRTC_VIDEO_VIE_CHANNEL_H_

+#endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_

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