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

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

similarity index 89%

rename from webrtc/video/vie_sync_module.h

rename to webrtc/video_engine/vie_sync_module.h

index a9ad20a1039b92858cd793d470c0f8b2e38dc03a..dcd8072095c4003a0012344f2b3ebd7f8011d753 100644

--- a/webrtc/video/vie_sync_module.h

+++ b/webrtc/video_engine/vie_sync_module.h

@@ -11,13 +11,13 @@

// ViESyncModule is responsible for synchronization audio and video for a given

// VoE and ViE channel couple.

-#ifndef WEBRTC_VIDEO_VIE_SYNC_MODULE_H_

-#define WEBRTC_VIDEO_VIE_SYNC_MODULE_H_

+#ifndef WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_

+#define WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_

#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/include/module.h"

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

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

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

#include "webrtc/voice_engine/include/voe_video_sync.h"

namespace webrtc {

@@ -59,4 +59,4 @@ class ViESyncModule : public Module {

} // namespace webrtc

-#endif // WEBRTC_VIDEO_VIE_SYNC_MODULE_H_

+#endif // WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_

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