From 5dda80abea311731144b1d544aff61c408412f12 Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 12 Nov 2015 12:46:09 +0100 Subject: [PATCH] Remove webrtc/modules/video_{capture,render}/include BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=pbos@webrtc.org, perkj@webrtc.org Review URL: https://codereview.webrtc.org/1439823002 . Cr-Commit-Position: refs/heads/master@{#10619} --- talk/media/devices/mobiledevicemanager.cc | 2 +- talk/media/webrtc/webrtcvideocapturer.cc | 2 +- talk/media/webrtc/webrtcvideocapturer.h | 2 +- webrtc/modules/video_capture/BUILD.gn | 6 +++--- webrtc/modules/video_capture/device_info_impl.h | 2 +- webrtc/modules/video_capture/ios/device_info_ios_objc.h | 2 +- .../video_capture/mac/qtkit/video_capture_qtkit_info.mm | 2 +- .../modules/video_capture/test/video_capture_unittest.cc | 4 ++-- webrtc/modules/video_capture/video_capture.gypi | 6 +++--- .../modules/video_capture/{include => }/video_capture.h | 8 ++++---- .../video_capture/{include => }/video_capture_defines.h | 6 +++--- webrtc/modules/video_capture/video_capture_factory.cc | 2 +- .../video_capture/{include => }/video_capture_factory.h | 8 ++++---- webrtc/modules/video_capture/video_capture_impl.h | 2 +- webrtc/modules/video_capture/windows/sink_filter_ds.h | 2 +- webrtc/modules/video_render/BUILD.gn | 4 ++-- .../android/video_render_android_native_opengl2.h | 2 +- .../android/video_render_android_surface_view.h | 2 +- .../video_render/android/video_render_opengles20.h | 2 +- webrtc/modules/video_render/i_video_render.h | 2 +- webrtc/modules/video_render/ios/open_gles20.h | 2 +- .../modules/video_render/ios/video_render_ios_channel.h | 2 +- webrtc/modules/video_render/linux/video_x11_channel.h | 2 +- webrtc/modules/video_render/linux/video_x11_render.h | 2 +- webrtc/modules/video_render/mac/video_render_agl.h | 2 +- webrtc/modules/video_render/mac/video_render_nsopengl.h | 2 +- webrtc/modules/video_render/test/testAPI/testAPI.cc | 4 ++-- webrtc/modules/video_render/test/testAPI/testAPI.h | 2 +- webrtc/modules/video_render/test/testAPI/testAPI_mac.mm | 4 ++-- webrtc/modules/video_render/video_render.gypi | 4 ++-- webrtc/modules/video_render/{include => }/video_render.h | 8 ++++---- .../video_render/{include => }/video_render_defines.h | 6 +++--- webrtc/modules/video_render/video_render_impl.cc | 2 +- webrtc/modules/video_render/video_render_impl.h | 2 +- webrtc/modules/video_render/video_render_internal_impl.cc | 2 +- webrtc/modules/video_render/windows/i_video_render_win.h | 2 +- .../modules/video_render/windows/video_render_direct3d9.h | 2 +- webrtc/test/vcm_capturer.cc | 2 +- webrtc/test/vcm_capturer.h | 2 +- webrtc/video/video_capture_input.cc | 4 ++-- webrtc/video/video_capture_input.h | 2 +- webrtc/video/video_receive_stream.h | 2 +- webrtc/video_engine/vie_channel.cc | 2 +- 43 files changed, 66 insertions(+), 66 deletions(-) rename webrtc/modules/video_capture/{include => }/video_capture.h (95%) rename webrtc/modules/video_capture/{include => }/video_capture_defines.h (93%) rename webrtc/modules/video_capture/{include => }/video_capture_factory.h (83%) rename webrtc/modules/video_render/{include => }/video_render.h (97%) rename webrtc/modules/video_render/{include => }/video_render_defines.h (86%) diff --git a/talk/media/devices/mobiledevicemanager.cc b/talk/media/devices/mobiledevicemanager.cc index 2a886a36d4..5739c7e8d6 100644 --- a/talk/media/devices/mobiledevicemanager.cc +++ b/talk/media/devices/mobiledevicemanager.cc @@ -27,7 +27,7 @@ #include "talk/media/devices/devicemanager.h" #include "webrtc/base/arraysize.h" -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" namespace cricket { diff --git a/talk/media/webrtc/webrtcvideocapturer.cc b/talk/media/webrtc/webrtcvideocapturer.cc index 519b58a69d..1454999fbd 100644 --- a/talk/media/webrtc/webrtcvideocapturer.cc +++ b/talk/media/webrtc/webrtcvideocapturer.cc @@ -44,7 +44,7 @@ #include "webrtc/base/timeutils.h" #include "webrtc/base/win32.h" // Need this to #include the impl files. -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/system_wrappers/include/field_trial.h" namespace cricket { diff --git a/talk/media/webrtc/webrtcvideocapturer.h b/talk/media/webrtc/webrtcvideocapturer.h index 0a99884fe1..591e46f629 100644 --- a/talk/media/webrtc/webrtcvideocapturer.h +++ b/talk/media/webrtc/webrtcvideocapturer.h @@ -39,7 +39,7 @@ #include "webrtc/base/messagehandler.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" namespace cricket { diff --git a/webrtc/modules/video_capture/BUILD.gn b/webrtc/modules/video_capture/BUILD.gn index b0ed6f4e6c..78f5212950 100644 --- a/webrtc/modules/video_capture/BUILD.gn +++ b/webrtc/modules/video_capture/BUILD.gn @@ -16,11 +16,11 @@ source_set("video_capture_module") { sources = [ "device_info_impl.cc", "device_info_impl.h", - "include/video_capture.h", - "include/video_capture_defines.h", - "include/video_capture_factory.h", + "video_capture.h", "video_capture_config.h", + "video_capture_defines.h", "video_capture_delay.h", + "video_capture_factory.h", "video_capture_factory.cc", "video_capture_impl.cc", "video_capture_impl.h", diff --git a/webrtc/modules/video_capture/device_info_impl.h b/webrtc/modules/video_capture/device_info_impl.h index 420808bcee..44e7dd596b 100644 --- a/webrtc/modules/video_capture/device_info_impl.h +++ b/webrtc/modules/video_capture/device_info_impl.h @@ -13,7 +13,7 @@ #include -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_capture/video_capture_delay.h" #include "webrtc/system_wrappers/include/rw_lock_wrapper.h" diff --git a/webrtc/modules/video_capture/ios/device_info_ios_objc.h b/webrtc/modules/video_capture/ios/device_info_ios_objc.h index 65444bedcb..d67b559972 100644 --- a/webrtc/modules/video_capture/ios/device_info_ios_objc.h +++ b/webrtc/modules/video_capture/ios/device_info_ios_objc.h @@ -13,7 +13,7 @@ #import -#include "webrtc/modules/video_capture/include/video_capture_defines.h" +#include "webrtc/modules/video_capture/video_capture_defines.h" @interface DeviceInfoIosObjC : NSObject + (int)captureDeviceCount; diff --git a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm index 1251ecd830..0c0c6a1261 100644 --- a/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm +++ b/webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm @@ -9,7 +9,7 @@ */ #import "webrtc/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h" -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 3ec164b37e..b56a05f7aa 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -18,8 +18,8 @@ #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_capture/include/video_capture.h" -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/system_wrappers/include/tick_util.h" diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi index f552df7758..3ab9b4026f 100644 --- a/webrtc/modules/video_capture/video_capture.gypi +++ b/webrtc/modules/video_capture/video_capture.gypi @@ -23,11 +23,11 @@ 'sources': [ 'device_info_impl.cc', 'device_info_impl.h', - 'include/video_capture.h', - 'include/video_capture_defines.h', - 'include/video_capture_factory.h', + 'video_capture.h', 'video_capture_config.h', + 'video_capture_defines.h', 'video_capture_delay.h', + 'video_capture_factory.h', 'video_capture_factory.cc', 'video_capture_impl.cc', 'video_capture_impl.h', diff --git a/webrtc/modules/video_capture/include/video_capture.h b/webrtc/modules/video_capture/video_capture.h similarity index 95% rename from webrtc/modules/video_capture/include/video_capture.h rename to webrtc/modules/video_capture/video_capture.h index a032d3cc18..08d02211c7 100644 --- a/webrtc/modules/video_capture/include/video_capture.h +++ b/webrtc/modules/video_capture/video_capture.h @@ -8,12 +8,12 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_ +#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ +#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ #include "webrtc/common_video/rotation.h" #include "webrtc/modules/include/module.h" -#include "webrtc/modules/video_capture/include/video_capture_defines.h" +#include "webrtc/modules/video_capture/video_capture_defines.h" namespace webrtc { @@ -157,4 +157,4 @@ protected: }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_ +#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ diff --git a/webrtc/modules/video_capture/include/video_capture_defines.h b/webrtc/modules/video_capture/video_capture_defines.h similarity index 93% rename from webrtc/modules/video_capture/include/video_capture_defines.h rename to webrtc/modules/video_capture/video_capture_defines.h index f62ddadccf..ef97ecab9d 100644 --- a/webrtc/modules/video_capture/include/video_capture_defines.h +++ b/webrtc/modules/video_capture/video_capture_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ +#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ +#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" @@ -115,4 +115,4 @@ protected: } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_ +#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_DEFINES_H_ diff --git a/webrtc/modules/video_capture/video_capture_factory.cc b/webrtc/modules/video_capture/video_capture_factory.cc index f88f916ba4..618c08bac6 100644 --- a/webrtc/modules/video_capture/video_capture_factory.cc +++ b/webrtc/modules/video_capture/video_capture_factory.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/modules/video_capture/video_capture_impl.h" diff --git a/webrtc/modules/video_capture/include/video_capture_factory.h b/webrtc/modules/video_capture/video_capture_factory.h similarity index 83% rename from webrtc/modules/video_capture/include/video_capture_factory.h rename to webrtc/modules/video_capture/video_capture_factory.h index f78437d1a0..4765be1fde 100644 --- a/webrtc/modules/video_capture/include/video_capture_factory.h +++ b/webrtc/modules/video_capture/video_capture_factory.h @@ -11,10 +11,10 @@ // This file contains interfaces used for creating the VideoCaptureModule // and DeviceInfo. -#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_ -#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_ +#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ +#define WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" namespace webrtc { @@ -42,4 +42,4 @@ class VideoCaptureFactory { } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_ +#endif // WEBRTC_MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_FACTORY_H_ diff --git a/webrtc/modules/video_capture/video_capture_impl.h b/webrtc/modules/video_capture/video_capture_impl.h index deb989c251..164421776c 100644 --- a/webrtc/modules/video_capture/video_capture_impl.h +++ b/webrtc/modules/video_capture/video_capture_impl.h @@ -17,7 +17,7 @@ #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/rotation.h" -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_capture/video_capture_config.h" #include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/video_frame.h" diff --git a/webrtc/modules/video_capture/windows/sink_filter_ds.h b/webrtc/modules/video_capture/windows/sink_filter_ds.h index 064cd9d7d3..6be74f69f9 100644 --- a/webrtc/modules/video_capture/windows/sink_filter_ds.h +++ b/webrtc/modules/video_capture/windows/sink_filter_ds.h @@ -13,7 +13,7 @@ #include // Include base DS filter header files -#include "webrtc/modules/video_capture/include/video_capture_defines.h" +#include "webrtc/modules/video_capture/video_capture_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_render/BUILD.gn b/webrtc/modules/video_render/BUILD.gn index 80f23870aa..0771bd7080 100644 --- a/webrtc/modules/video_render/BUILD.gn +++ b/webrtc/modules/video_render/BUILD.gn @@ -13,8 +13,8 @@ source_set("video_render_module") { "external/video_render_external_impl.cc", "external/video_render_external_impl.h", "i_video_render.h", - "include/video_render.h", - "include/video_render_defines.h", + "video_render.h", + "video_render_defines.h", "video_render_impl.h", ] diff --git a/webrtc/modules/video_render/android/video_render_android_native_opengl2.h b/webrtc/modules/video_render/android/video_render_android_native_opengl2.h index b748b2dd47..8be247b834 100644 --- a/webrtc/modules/video_render/android/video_render_android_native_opengl2.h +++ b/webrtc/modules/video_render/android/video_render_android_native_opengl2.h @@ -15,7 +15,7 @@ #include "webrtc/modules/video_render/android/video_render_android_impl.h" #include "webrtc/modules/video_render/android/video_render_opengles20.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_android_surface_view.h b/webrtc/modules/video_render/android/video_render_android_surface_view.h index 480e8b5106..0f029b54f3 100644 --- a/webrtc/modules/video_render/android/video_render_android_surface_view.h +++ b/webrtc/modules/video_render/android/video_render_android_surface_view.h @@ -14,7 +14,7 @@ #include #include "webrtc/modules/video_render/android/video_render_android_impl.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_render/android/video_render_opengles20.h b/webrtc/modules/video_render/android/video_render_opengles20.h index 44ab4c04bc..57e2a10d42 100644 --- a/webrtc/modules/video_render/android/video_render_opengles20.h +++ b/webrtc/modules/video_render/android/video_render_opengles20.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_OPENGLES20_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_OPENGLES20_H_ -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include #include diff --git a/webrtc/modules/video_render/i_video_render.h b/webrtc/modules/video_render/i_video_render.h index ff1cce782e..e6ec7a4680 100644 --- a/webrtc/modules/video_render/i_video_render.h +++ b/webrtc/modules/video_render/i_video_render.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_I_VIDEO_RENDER_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_I_VIDEO_RENDER_H_ -#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/video_render.h" namespace webrtc { diff --git a/webrtc/modules/video_render/ios/open_gles20.h b/webrtc/modules/video_render/ios/open_gles20.h index f74955fee4..880ddb5231 100644 --- a/webrtc/modules/video_render/ios/open_gles20.h +++ b/webrtc/modules/video_render/ios/open_gles20.h @@ -13,7 +13,7 @@ #include -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" /* * This OpenGles20 is the class of renderer for VideoFrame into a GLES 2.0 diff --git a/webrtc/modules/video_render/ios/video_render_ios_channel.h b/webrtc/modules/video_render/ios/video_render_ios_channel.h index 375a5ee719..a15ba393dc 100644 --- a/webrtc/modules/video_render/ios/video_render_ios_channel.h +++ b/webrtc/modules/video_render/ios/video_render_ios_channel.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_CHANNEL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_IOS_VIDEO_RENDER_IOS_CHANNEL_H_ -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/modules/video_render/ios/video_render_ios_view.h" namespace webrtc { diff --git a/webrtc/modules/video_render/linux/video_x11_channel.h b/webrtc/modules/video_render/linux/video_x11_channel.h index 8cbd2a27d1..6eb402e12e 100644 --- a/webrtc/modules/video_render/linux/video_x11_channel.h +++ b/webrtc/modules/video_render/linux/video_x11_channel.h @@ -13,7 +13,7 @@ #include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include #include diff --git a/webrtc/modules/video_render/linux/video_x11_render.h b/webrtc/modules/video_render/linux/video_x11_render.h index 265ef7cfab..23b83bd67b 100644 --- a/webrtc/modules/video_render/linux/video_x11_render.h +++ b/webrtc/modules/video_render/linux/video_x11_render.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_RENDER_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_RENDER_H_ -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include #include diff --git a/webrtc/modules/video_render/mac/video_render_agl.h b/webrtc/modules/video_render/mac/video_render_agl.h index 8710228754..11e9c3ba86 100644 --- a/webrtc/modules/video_render/mac/video_render_agl.h +++ b/webrtc/modules/video_render/mac/video_render_agl.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_ -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/thread_wrapper.h" #define NEW_HIVIEW_PARENT_EVENT_HANDLER 1 diff --git a/webrtc/modules/video_render/mac/video_render_nsopengl.h b/webrtc/modules/video_render/mac/video_render_nsopengl.h index 5dab4d266f..8bc769a060 100644 --- a/webrtc/modules/video_render/mac/video_render_nsopengl.h +++ b/webrtc/modules/video_render/mac/video_render_nsopengl.h @@ -23,7 +23,7 @@ #include #include "webrtc/base/thread_annotations.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #import "webrtc/modules/video_render/mac/cocoa_full_screen_window.h" #import "webrtc/modules/video_render/mac/cocoa_render_view.h" diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc index 4de554c475..06ea00b5ad 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI.cc +++ b/webrtc/modules/video_render/test/testAPI/testAPI.cc @@ -34,8 +34,8 @@ #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_render/include/video_render.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/sleep.h" #include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/video_render/test/testAPI/testAPI.h b/webrtc/modules/video_render/test/testAPI/testAPI.h index 8b14e84931..0655a5b434 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI.h +++ b/webrtc/modules/video_render/test/testAPI/testAPI.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_TEST_TESTAPI_TESTAPI_H #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_TEST_TESTAPI_TESTAPI_H -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" void RunVideoRenderTests(void* window, webrtc::VideoRenderType windowType); diff --git a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm index a8808dd85f..dfee4c7298 100644 --- a/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm +++ b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm @@ -22,8 +22,8 @@ #include "webrtc/common_types.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_render/include/video_render.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/tick_util.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/video_render/video_render.gypi b/webrtc/modules/video_render/video_render.gypi index 63f69b0a63..9f2d86c54a 100644 --- a/webrtc/modules/video_render/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -25,8 +25,8 @@ 'external/video_render_external_impl.cc', 'external/video_render_external_impl.h', 'i_video_render.h', - 'include/video_render.h', - 'include/video_render_defines.h', + 'video_render.h', + 'video_render_defines.h', 'video_render_impl.h', ], }, diff --git a/webrtc/modules/video_render/include/video_render.h b/webrtc/modules/video_render/video_render.h similarity index 97% rename from webrtc/modules/video_render/include/video_render.h rename to webrtc/modules/video_render/video_render.h index edd2302696..a193a187e7 100644 --- a/webrtc/modules/video_render/include/video_render.h +++ b/webrtc/modules/video_render/video_render.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_ -#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_ +#ifndef WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_ +#define WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_ /* * video_render.h @@ -21,7 +21,7 @@ */ #include "webrtc/modules/include/module.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" namespace webrtc { @@ -265,4 +265,4 @@ public: const uint32_t timeout) = 0; }; } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_H_ +#endif // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_H_ diff --git a/webrtc/modules/video_render/include/video_render_defines.h b/webrtc/modules/video_render/video_render_defines.h similarity index 86% rename from webrtc/modules/video_render/include/video_render_defines.h rename to webrtc/modules/video_render/video_render_defines.h index 1602d66065..108842d91e 100644 --- a/webrtc/modules/video_render/include/video_render_defines.h +++ b/webrtc/modules/video_render/video_render_defines.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ -#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ +#ifndef WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_DEFINES_H_ +#define WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_DEFINES_H_ #include "webrtc/common_types.h" #include "webrtc/common_video/interface/incoming_video_stream.h" @@ -67,4 +67,4 @@ enum StretchMode } // namespace webrtc -#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_ +#endif // WEBRTC_MODULES_VIDEO_RENDER_VIDEO_RENDER_DEFINES_H_ diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc index 32ec2b0e75..1a3ff0e75f 100644 --- a/webrtc/modules/video_render/video_render_impl.cc +++ b/webrtc/modules/video_render/video_render_impl.cc @@ -14,7 +14,7 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_render/external/video_render_external_impl.h" #include "webrtc/modules/video_render/i_video_render.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/modules/video_render/video_render_impl.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/video_render/video_render_impl.h b/webrtc/modules/video_render/video_render_impl.h index cc00897cc3..ce93cea6b5 100644 --- a/webrtc/modules/video_render/video_render_impl.h +++ b/webrtc/modules/video_render/video_render_impl.h @@ -14,7 +14,7 @@ #include #include "webrtc/engine_configurations.h" -#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/video_render.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/video_render/video_render_internal_impl.cc b/webrtc/modules/video_render/video_render_internal_impl.cc index 09ebc7e548..59be0c28bc 100644 --- a/webrtc/modules/video_render/video_render_internal_impl.cc +++ b/webrtc/modules/video_render/video_render_internal_impl.cc @@ -13,7 +13,7 @@ #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/video_render/i_video_render.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/modules/video_render/video_render_impl.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/trace.h" diff --git a/webrtc/modules/video_render/windows/i_video_render_win.h b/webrtc/modules/video_render/windows/i_video_render_win.h index 56731e3770..6dbb4fd3cb 100644 --- a/webrtc/modules/video_render/windows/i_video_render_win.h +++ b/webrtc/modules/video_render/windows/i_video_render_win.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_ -#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/video_render.h" namespace webrtc { diff --git a/webrtc/modules/video_render/windows/video_render_direct3d9.h b/webrtc/modules/video_render/windows/video_render_direct3d9.h index c8f6639d9a..8b8509ed4e 100644 --- a/webrtc/modules/video_render/windows/video_render_direct3d9.h +++ b/webrtc/modules/video_render/windows/video_render_direct3d9.h @@ -19,7 +19,7 @@ #include // Added -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/thread_wrapper.h" #pragma comment(lib, "d3d9.lib") // located in DirectX SDK diff --git a/webrtc/test/vcm_capturer.cc b/webrtc/test/vcm_capturer.cc index 1c6b91915e..0a82236c98 100644 --- a/webrtc/test/vcm_capturer.cc +++ b/webrtc/test/vcm_capturer.cc @@ -10,7 +10,7 @@ #include "webrtc/test/vcm_capturer.h" -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/video_send_stream.h" namespace webrtc { diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h index 53d61fc53a..80b0942434 100644 --- a/webrtc/test/vcm_capturer.h +++ b/webrtc/test/vcm_capturer.h @@ -13,7 +13,7 @@ #include "webrtc/base/criticalsection.h" #include "webrtc/common_types.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/test/video_capturer.h" namespace webrtc { diff --git a/webrtc/video/video_capture_input.cc b/webrtc/video/video_capture_input.cc index 834849c4c6..1f416490ae 100644 --- a/webrtc/video/video_capture_input.cc +++ b/webrtc/video/video_capture_input.cc @@ -15,9 +15,9 @@ #include "webrtc/base/trace_event.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/utility/include/process_thread.h" -#include "webrtc/modules/video_capture/include/video_capture_factory.h" +#include "webrtc/modules/video_capture/video_capture_factory.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/event_wrapper.h" diff --git a/webrtc/video/video_capture_input.h b/webrtc/video/video_capture_input.h index 1affd8d93b..b93d803702 100644 --- a/webrtc/video/video_capture_input.h +++ b/webrtc/video/video_capture_input.h @@ -18,7 +18,7 @@ #include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" #include "webrtc/engine_configurations.h" -#include "webrtc/modules/video_capture/include/video_capture.h" +#include "webrtc/modules/video_capture/video_capture.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h index 7b1f5394f1..c178a1d443 100644 --- a/webrtc/video/video_receive_stream.h +++ b/webrtc/video/video_receive_stream.h @@ -18,7 +18,7 @@ #include "webrtc/call/transport_adapter.h" #include "webrtc/common_video/interface/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video/encoded_frame_callback_adapter.h" #include "webrtc/video/receive_statistics_proxy.h" diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index 2ffcf8a104..fa8a35069f 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -26,7 +26,7 @@ #include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h" -#include "webrtc/modules/video_render/include/video_render_defines.h" +#include "webrtc/modules/video_render/video_render_defines.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/system_wrappers/include/metrics.h" #include "webrtc/system_wrappers/include/thread_wrapper.h"