From 9841d92b8d41356a72d5ca2b815906f581616c7d Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 31 Oct 2012 05:22:11 +0000 Subject: [PATCH] Reorganize modules/video_render. The usual elimination of main/source etc. Review URL: https://webrtc-codereview.appspot.com/929011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3027 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/modules.gyp | 2 +- .../video_render/{main/source => }/Android.mk | 0 .../webrtc/videoengine/ViEAndroidGLES20.java | 0 .../org/webrtc/videoengine/ViERenderer.java | 0 .../videoengine/ViESurfaceRenderer.java | 0 .../android/video_render_android_impl.cc | 0 .../android/video_render_android_impl.h | 2 +- .../video_render_android_native_opengl2.cc | 0 .../video_render_android_native_opengl2.h | 0 .../video_render_android_surface_view.cc | 0 .../video_render_android_surface_view.h | 0 .../android/video_render_opengles20.cc | 0 .../android/video_render_opengles20.h | 0 .../external/video_render_external_impl.cc | 0 .../external/video_render_external_impl.h | 2 +- .../{main/source => }/i_video_render.h | 0 .../interface => include}/video_render.h | 2 +- .../video_render_defines.h | 0 .../source => }/incoming_video_stream.cc | 4 +- .../{main/source => }/incoming_video_stream.h | 2 +- .../linux/video_render_linux_impl.cc | 0 .../linux/video_render_linux_impl.h | 2 +- .../source => }/linux/video_x11_channel.cc | 0 .../source => }/linux/video_x11_channel.h | 0 .../source => }/linux/video_x11_render.cc | 0 .../source => }/linux/video_x11_render.h | 0 .../mac/cocoa_full_screen_window.h | 0 .../mac/cocoa_full_screen_window.mm | 0 .../{main/source => }/mac/cocoa_render_view.h | 0 .../source => }/mac/cocoa_render_view.mm | 0 .../{main/source => }/mac/video_render_agl.cc | 0 .../{main/source => }/mac/video_render_agl.h | 0 .../mac/video_render_mac_carbon_impl.cc | 0 .../mac/video_render_mac_carbon_impl.h | 2 +- .../mac/video_render_mac_cocoa_impl.h | 2 +- .../mac/video_render_mac_cocoa_impl.mm | 0 .../source => }/mac/video_render_nsopengl.h | 0 .../source => }/mac/video_render_nsopengl.mm | 0 .../test/testAPI/renderStartImage.bmp | Bin .../{main => }/test/testAPI/testAPI.cc | 0 .../{main => }/test/testAPI/testAPI.h | 0 .../test/testAPI/testAPI_android.cc | 0 .../{main => }/test/testAPI/testAPI_mac.mm | 2 +- .../{main/source => }/video_render.gypi | 104 +++++++----------- .../{main/source => }/video_render_frames.cc | 2 +- .../{main/source => }/video_render_frames.h | 2 +- .../{main/source => }/video_render_impl.cc | 2 +- .../{main/source => }/video_render_impl.h | 2 - .../source => }/windows/i_video_render_win.h | 0 .../windows/video_render_direct3d9.cc | 0 .../windows/video_render_direct3d9.h | 0 .../windows/video_render_windows_impl.cc | 0 .../windows/video_render_windows_impl.h | 2 +- webrtc/video_engine/test/android/build.xml | 2 +- .../test/auto_test/interface/vie_autotest.h | 2 +- .../test/auto_test/source/vie_autotest.cc | 2 +- webrtc/video_engine/video_engine_core.gypi | 3 +- webrtc/video_engine/vie_base_impl.cc | 2 +- webrtc/video_engine/vie_capturer.cc | 2 +- webrtc/video_engine/vie_channel.cc | 2 +- webrtc/video_engine/vie_impl.cc | 2 +- webrtc/video_engine/vie_render_impl.cc | 4 +- webrtc/video_engine/vie_render_impl.h | 2 +- webrtc/video_engine/vie_render_manager.cc | 4 +- webrtc/video_engine/vie_renderer.cc | 4 +- webrtc/video_engine/vie_renderer.h | 2 +- 66 files changed, 68 insertions(+), 101 deletions(-) rename webrtc/modules/video_render/{main/source => }/Android.mk (100%) rename webrtc/modules/video_render/{main/source => }/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java (100%) rename webrtc/modules/video_render/{main/source => }/android/java/org/webrtc/videoengine/ViERenderer.java (100%) rename webrtc/modules/video_render/{main/source => }/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_impl.cc (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_impl.h (98%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_native_opengl2.cc (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_native_opengl2.h (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_surface_view.cc (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_android_surface_view.h (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_opengles20.cc (100%) rename webrtc/modules/video_render/{main/source => }/android/video_render_opengles20.h (100%) rename webrtc/modules/video_render/{main/source => }/external/video_render_external_impl.cc (100%) rename webrtc/modules/video_render/{main/source => }/external/video_render_external_impl.h (98%) rename webrtc/modules/video_render/{main/source => }/i_video_render.h (100%) rename webrtc/modules/video_render/{main/interface => include}/video_render.h (99%) rename webrtc/modules/video_render/{main/interface => include}/video_render_defines.h (100%) rename webrtc/modules/video_render/{main/source => }/incoming_video_stream.cc (98%) rename webrtc/modules/video_render/{main/source => }/incoming_video_stream.h (98%) rename webrtc/modules/video_render/{main/source => }/linux/video_render_linux_impl.cc (100%) rename webrtc/modules/video_render/{main/source => }/linux/video_render_linux_impl.h (98%) rename webrtc/modules/video_render/{main/source => }/linux/video_x11_channel.cc (100%) rename webrtc/modules/video_render/{main/source => }/linux/video_x11_channel.h (100%) rename webrtc/modules/video_render/{main/source => }/linux/video_x11_render.cc (100%) rename webrtc/modules/video_render/{main/source => }/linux/video_x11_render.h (100%) rename webrtc/modules/video_render/{main/source => }/mac/cocoa_full_screen_window.h (100%) rename webrtc/modules/video_render/{main/source => }/mac/cocoa_full_screen_window.mm (100%) rename webrtc/modules/video_render/{main/source => }/mac/cocoa_render_view.h (100%) rename webrtc/modules/video_render/{main/source => }/mac/cocoa_render_view.mm (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_agl.cc (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_agl.h (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_mac_carbon_impl.cc (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_mac_carbon_impl.h (98%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_mac_cocoa_impl.h (98%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_mac_cocoa_impl.mm (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_nsopengl.h (100%) rename webrtc/modules/video_render/{main/source => }/mac/video_render_nsopengl.mm (100%) rename webrtc/modules/video_render/{main => }/test/testAPI/renderStartImage.bmp (100%) rename webrtc/modules/video_render/{main => }/test/testAPI/testAPI.cc (100%) rename webrtc/modules/video_render/{main => }/test/testAPI/testAPI.h (100%) rename webrtc/modules/video_render/{main => }/test/testAPI/testAPI_android.cc (100%) rename webrtc/modules/video_render/{main => }/test/testAPI/testAPI_mac.mm (97%) rename webrtc/modules/video_render/{main/source => }/video_render.gypi (84%) rename webrtc/modules/video_render/{main/source => }/video_render_frames.cc (98%) rename webrtc/modules/video_render/{main/source => }/video_render_frames.h (96%) rename webrtc/modules/video_render/{main/source => }/video_render_impl.cc (99%) rename webrtc/modules/video_render/{main/source => }/video_render_impl.h (99%) rename webrtc/modules/video_render/{main/source => }/windows/i_video_render_win.h (100%) rename webrtc/modules/video_render/{main/source => }/windows/video_render_direct3d9.cc (100%) rename webrtc/modules/video_render/{main/source => }/windows/video_render_direct3d9.h (100%) rename webrtc/modules/video_render/{main/source => }/windows/video_render_windows_impl.cc (100%) rename webrtc/modules/video_render/{main/source => }/windows/video_render_windows_impl.h (98%) diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp index d8355e7ce..f9d8765c1 100644 --- a/webrtc/modules/modules.gyp +++ b/webrtc/modules/modules.gyp @@ -31,7 +31,7 @@ 'video_coding/main/source/video_coding.gypi', 'video_capture/video_capture.gypi', 'video_processing/main/source/video_processing.gypi', - 'video_render/main/source/video_render.gypi', + 'video_render/video_render.gypi', ], 'conditions': [ ['include_opus==1', { diff --git a/webrtc/modules/video_render/main/source/Android.mk b/webrtc/modules/video_render/Android.mk similarity index 100% rename from webrtc/modules/video_render/main/source/Android.mk rename to webrtc/modules/video_render/Android.mk diff --git a/webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java similarity index 100% rename from webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViEAndroidGLES20.java diff --git a/webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViERenderer.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java similarity index 100% rename from webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViERenderer.java rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViERenderer.java diff --git a/webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java b/webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java similarity index 100% rename from webrtc/modules/video_render/main/source/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java rename to webrtc/modules/video_render/android/java/org/webrtc/videoengine/ViESurfaceRenderer.java diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_impl.cc b/webrtc/modules/video_render/android/video_render_android_impl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_android_impl.cc rename to webrtc/modules/video_render/android/video_render_android_impl.cc diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_impl.h b/webrtc/modules/video_render/android/video_render_android_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/android/video_render_android_impl.h rename to webrtc/modules/video_render/android/video_render_android_impl.h index d3f140afb..3613f1aa4 100644 --- a/webrtc/modules/video_render/main/source/android/video_render_android_impl.h +++ b/webrtc/modules/video_render/android/video_render_android_impl.h @@ -12,7 +12,7 @@ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_IMPL_H_ #include -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" #include "map_wrapper.h" diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_native_opengl2.cc b/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_android_native_opengl2.cc rename to webrtc/modules/video_render/android/video_render_android_native_opengl2.cc diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_native_opengl2.h b/webrtc/modules/video_render/android/video_render_android_native_opengl2.h similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_android_native_opengl2.h rename to webrtc/modules/video_render/android/video_render_android_native_opengl2.h diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_surface_view.cc b/webrtc/modules/video_render/android/video_render_android_surface_view.cc similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_android_surface_view.cc rename to webrtc/modules/video_render/android/video_render_android_surface_view.cc diff --git a/webrtc/modules/video_render/main/source/android/video_render_android_surface_view.h b/webrtc/modules/video_render/android/video_render_android_surface_view.h similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_android_surface_view.h rename to webrtc/modules/video_render/android/video_render_android_surface_view.h diff --git a/webrtc/modules/video_render/main/source/android/video_render_opengles20.cc b/webrtc/modules/video_render/android/video_render_opengles20.cc similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_opengles20.cc rename to webrtc/modules/video_render/android/video_render_opengles20.cc diff --git a/webrtc/modules/video_render/main/source/android/video_render_opengles20.h b/webrtc/modules/video_render/android/video_render_opengles20.h similarity index 100% rename from webrtc/modules/video_render/main/source/android/video_render_opengles20.h rename to webrtc/modules/video_render/android/video_render_opengles20.h diff --git a/webrtc/modules/video_render/main/source/external/video_render_external_impl.cc b/webrtc/modules/video_render/external/video_render_external_impl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/external/video_render_external_impl.cc rename to webrtc/modules/video_render/external/video_render_external_impl.cc diff --git a/webrtc/modules/video_render/main/source/external/video_render_external_impl.h b/webrtc/modules/video_render/external/video_render_external_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/external/video_render_external_impl.h rename to webrtc/modules/video_render/external/video_render_external_impl.h index 8d0785995..747f9de4a 100644 --- a/webrtc/modules/video_render/main/source/external/video_render_external_impl.h +++ b/webrtc/modules/video_render/external/video_render_external_impl.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_ -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" #include "critical_section_wrapper.h" #include "module_common_types.h" diff --git a/webrtc/modules/video_render/main/source/i_video_render.h b/webrtc/modules/video_render/i_video_render.h similarity index 100% rename from webrtc/modules/video_render/main/source/i_video_render.h rename to webrtc/modules/video_render/i_video_render.h diff --git a/webrtc/modules/video_render/main/interface/video_render.h b/webrtc/modules/video_render/include/video_render.h similarity index 99% rename from webrtc/modules/video_render/main/interface/video_render.h rename to webrtc/modules/video_render/include/video_render.h index 8d079fd7c..e4b609638 100644 --- a/webrtc/modules/video_render/main/interface/video_render.h +++ b/webrtc/modules/video_render/include/video_render.h @@ -21,7 +21,7 @@ */ #include "modules/interface/module.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" namespace webrtc { diff --git a/webrtc/modules/video_render/main/interface/video_render_defines.h b/webrtc/modules/video_render/include/video_render_defines.h similarity index 100% rename from webrtc/modules/video_render/main/interface/video_render_defines.h rename to webrtc/modules/video_render/include/video_render_defines.h diff --git a/webrtc/modules/video_render/main/source/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc similarity index 98% rename from webrtc/modules/video_render/main/source/incoming_video_stream.cc rename to webrtc/modules/video_render/incoming_video_stream.cc index 8088a1d24..8815142f5 100644 --- a/webrtc/modules/video_render/main/source/incoming_video_stream.cc +++ b/webrtc/modules/video_render/incoming_video_stream.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_render/main/source/incoming_video_stream.h" +#include "webrtc/modules/video_render//incoming_video_stream.h" #include @@ -22,7 +22,7 @@ #endif #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/video_render/main/source/video_render_frames.h" +#include "webrtc/modules/video_render//video_render_frames.h" #include "system_wrappers/interface/critical_section_wrapper.h" #include "system_wrappers/interface/event_wrapper.h" #include "system_wrappers/interface/map_wrapper.h" diff --git a/webrtc/modules/video_render/main/source/incoming_video_stream.h b/webrtc/modules/video_render/incoming_video_stream.h similarity index 98% rename from webrtc/modules/video_render/main/source/incoming_video_stream.h rename to webrtc/modules/video_render/incoming_video_stream.h index 130341188..097a1672a 100644 --- a/webrtc/modules/video_render/main/source/incoming_video_stream.h +++ b/webrtc/modules/video_render/incoming_video_stream.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_ -#include "modules/video_render/main/interface/video_render.h" +#include "webrtc/modules/video_render/include/video_render.h" #include "system_wrappers/interface/map_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_render/main/source/linux/video_render_linux_impl.cc b/webrtc/modules/video_render/linux/video_render_linux_impl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/linux/video_render_linux_impl.cc rename to webrtc/modules/video_render/linux/video_render_linux_impl.cc diff --git a/webrtc/modules/video_render/main/source/linux/video_render_linux_impl.h b/webrtc/modules/video_render/linux/video_render_linux_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/linux/video_render_linux_impl.h rename to webrtc/modules/video_render/linux/video_render_linux_impl.h index 063ce2a3f..35880563a 100644 --- a/webrtc/modules/video_render/main/source/linux/video_render_linux_impl.h +++ b/webrtc/modules/video_render/linux/video_render_linux_impl.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_RENDER_LINUX_IMPL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_RENDER_LINUX_IMPL_H_ -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/video_render/main/source/linux/video_x11_channel.cc b/webrtc/modules/video_render/linux/video_x11_channel.cc similarity index 100% rename from webrtc/modules/video_render/main/source/linux/video_x11_channel.cc rename to webrtc/modules/video_render/linux/video_x11_channel.cc diff --git a/webrtc/modules/video_render/main/source/linux/video_x11_channel.h b/webrtc/modules/video_render/linux/video_x11_channel.h similarity index 100% rename from webrtc/modules/video_render/main/source/linux/video_x11_channel.h rename to webrtc/modules/video_render/linux/video_x11_channel.h diff --git a/webrtc/modules/video_render/main/source/linux/video_x11_render.cc b/webrtc/modules/video_render/linux/video_x11_render.cc similarity index 100% rename from webrtc/modules/video_render/main/source/linux/video_x11_render.cc rename to webrtc/modules/video_render/linux/video_x11_render.cc diff --git a/webrtc/modules/video_render/main/source/linux/video_x11_render.h b/webrtc/modules/video_render/linux/video_x11_render.h similarity index 100% rename from webrtc/modules/video_render/main/source/linux/video_x11_render.h rename to webrtc/modules/video_render/linux/video_x11_render.h diff --git a/webrtc/modules/video_render/main/source/mac/cocoa_full_screen_window.h b/webrtc/modules/video_render/mac/cocoa_full_screen_window.h similarity index 100% rename from webrtc/modules/video_render/main/source/mac/cocoa_full_screen_window.h rename to webrtc/modules/video_render/mac/cocoa_full_screen_window.h diff --git a/webrtc/modules/video_render/main/source/mac/cocoa_full_screen_window.mm b/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm similarity index 100% rename from webrtc/modules/video_render/main/source/mac/cocoa_full_screen_window.mm rename to webrtc/modules/video_render/mac/cocoa_full_screen_window.mm diff --git a/webrtc/modules/video_render/main/source/mac/cocoa_render_view.h b/webrtc/modules/video_render/mac/cocoa_render_view.h similarity index 100% rename from webrtc/modules/video_render/main/source/mac/cocoa_render_view.h rename to webrtc/modules/video_render/mac/cocoa_render_view.h diff --git a/webrtc/modules/video_render/main/source/mac/cocoa_render_view.mm b/webrtc/modules/video_render/mac/cocoa_render_view.mm similarity index 100% rename from webrtc/modules/video_render/main/source/mac/cocoa_render_view.mm rename to webrtc/modules/video_render/mac/cocoa_render_view.mm diff --git a/webrtc/modules/video_render/main/source/mac/video_render_agl.cc b/webrtc/modules/video_render/mac/video_render_agl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_agl.cc rename to webrtc/modules/video_render/mac/video_render_agl.cc diff --git a/webrtc/modules/video_render/main/source/mac/video_render_agl.h b/webrtc/modules/video_render/mac/video_render_agl.h similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_agl.h rename to webrtc/modules/video_render/mac/video_render_agl.h diff --git a/webrtc/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc b/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_mac_carbon_impl.cc rename to webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc diff --git a/webrtc/modules/video_render/main/source/mac/video_render_mac_carbon_impl.h b/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/mac/video_render_mac_carbon_impl.h rename to webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h index 3ff3d26d8..578a1c09a 100644 --- a/webrtc/modules/video_render/main/source/mac/video_render_mac_carbon_impl.h +++ b/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h @@ -14,7 +14,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_IMPL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_IMPL_H_ -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" namespace webrtc { diff --git a/webrtc/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.h b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.h rename to webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h index f9216bbb8..da8a41022 100644 --- a/webrtc/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.h +++ b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h @@ -15,7 +15,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_COCOA_IMPL_H_ #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_COCOA_IMPL_H_ -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" namespace webrtc { class CriticalSectionWrapper; diff --git a/webrtc/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm b/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_mac_cocoa_impl.mm rename to webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm diff --git a/webrtc/modules/video_render/main/source/mac/video_render_nsopengl.h b/webrtc/modules/video_render/mac/video_render_nsopengl.h similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_nsopengl.h rename to webrtc/modules/video_render/mac/video_render_nsopengl.h diff --git a/webrtc/modules/video_render/main/source/mac/video_render_nsopengl.mm b/webrtc/modules/video_render/mac/video_render_nsopengl.mm similarity index 100% rename from webrtc/modules/video_render/main/source/mac/video_render_nsopengl.mm rename to webrtc/modules/video_render/mac/video_render_nsopengl.mm diff --git a/webrtc/modules/video_render/main/test/testAPI/renderStartImage.bmp b/webrtc/modules/video_render/test/testAPI/renderStartImage.bmp similarity index 100% rename from webrtc/modules/video_render/main/test/testAPI/renderStartImage.bmp rename to webrtc/modules/video_render/test/testAPI/renderStartImage.bmp diff --git a/webrtc/modules/video_render/main/test/testAPI/testAPI.cc b/webrtc/modules/video_render/test/testAPI/testAPI.cc similarity index 100% rename from webrtc/modules/video_render/main/test/testAPI/testAPI.cc rename to webrtc/modules/video_render/test/testAPI/testAPI.cc diff --git a/webrtc/modules/video_render/main/test/testAPI/testAPI.h b/webrtc/modules/video_render/test/testAPI/testAPI.h similarity index 100% rename from webrtc/modules/video_render/main/test/testAPI/testAPI.h rename to webrtc/modules/video_render/test/testAPI/testAPI.h diff --git a/webrtc/modules/video_render/main/test/testAPI/testAPI_android.cc b/webrtc/modules/video_render/test/testAPI/testAPI_android.cc similarity index 100% rename from webrtc/modules/video_render/main/test/testAPI/testAPI_android.cc rename to webrtc/modules/video_render/test/testAPI/testAPI_android.cc diff --git a/webrtc/modules/video_render/main/test/testAPI/testAPI_mac.mm b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm similarity index 97% rename from webrtc/modules/video_render/main/test/testAPI/testAPI_mac.mm rename to webrtc/modules/video_render/test/testAPI/testAPI_mac.mm index 2f836aba9..0127a593b 100644 --- a/webrtc/modules/video_render/main/test/testAPI/testAPI_mac.mm +++ b/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm @@ -19,7 +19,7 @@ #include #include "common_types.h" -#import "modules/video_render/main/source/mac/cocoa_render_view.h" +#import "webrtc/modules/video_render//mac/cocoa_render_view.h" #include "module_common_types.h" #include "process_thread.h" #include "tick_util.h" diff --git a/webrtc/modules/video_render/main/source/video_render.gypi b/webrtc/modules/video_render/video_render.gypi similarity index 84% rename from webrtc/modules/video_render/main/source/video_render.gypi rename to webrtc/modules/video_render/video_render.gypi index fd1aae41b..cde2ab339 100644 --- a/webrtc/modules/video_render/main/source/video_render.gypi +++ b/webrtc/modules/video_render/video_render.gypi @@ -10,94 +10,74 @@ 'targets': [ { 'target_name': 'video_render_module', - 'type': '<(library)', + 'type': 'static_library', 'dependencies': [ 'webrtc_utility', '<(webrtc_root)/common_video/common_video.gyp:common_video', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', ], 'include_dirs': [ - '.', + 'include', '../interface', - '../../../interface', ], 'direct_dependent_settings': { 'include_dirs': [ + 'include', '../interface', - '../../../interface', ], }, 'sources': [ - # interfaces - '../interface/video_render.h', - '../interface/video_render_defines.h', - - # headers - 'incoming_video_stream.h', - 'video_render_frames.h', - 'video_render_impl.h', - 'i_video_render.h', - # Android + 'android/video_render_android_impl.cc', 'android/video_render_android_impl.h', + 'android/video_render_android_native_opengl2.cc', 'android/video_render_android_native_opengl2.h', + 'android/video_render_android_surface_view.cc', 'android/video_render_android_surface_view.h', + 'android/video_render_opengles20.cc', 'android/video_render_opengles20.h', - # Linux + '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', + 'incoming_video_stream.cc', + 'incoming_video_stream.h', + 'linux/video_render_linux_impl.cc', 'linux/video_render_linux_impl.h', + 'linux/video_x11_channel.cc', 'linux/video_x11_channel.h', + 'linux/video_x11_render.cc', 'linux/video_x11_render.h', - # Mac + 'mac/cocoa_full_screen_window.mm', 'mac/cocoa_full_screen_window.h', + 'mac/cocoa_render_view.mm', 'mac/cocoa_render_view.h', + 'mac/video_render_agl.cc', 'mac/video_render_agl.h', + 'mac/video_render_mac_carbon_impl.cc', 'mac/video_render_mac_carbon_impl.h', 'mac/video_render_mac_cocoa_impl.h', - 'mac/video_render_nsopengl.h', - # Windows - 'windows/i_video_render_win.h', - 'windows/video_render_direct3d9.h', - 'windows/video_render_windows_impl.h', - # External - 'external/video_render_external_impl.h', - - # PLATFORM INDEPENDENT SOURCE FILES - 'incoming_video_stream.cc', - 'video_render_frames.cc', - 'video_render_impl.cc', - # PLATFORM SPECIFIC SOURCE FILES - Will be filtered below - # Android - 'android/video_render_android_impl.cc', - 'android/video_render_android_native_opengl2.cc', - 'android/video_render_android_surface_view.cc', - 'android/video_render_opengles20.cc', - # Linux - 'linux/video_render_linux_impl.cc', - 'linux/video_x11_channel.cc', - 'linux/video_x11_render.cc', - # Mac - 'mac/video_render_nsopengl.mm', 'mac/video_render_mac_cocoa_impl.mm', - 'mac/video_render_agl.cc', - 'mac/video_render_mac_carbon_impl.cc', - 'mac/cocoa_render_view.mm', - 'mac/cocoa_full_screen_window.mm', - # Windows + 'mac/video_render_nsopengl.h', + 'mac/video_render_nsopengl.mm', + 'video_render_frames.cc', + 'video_render_frames.h', + 'video_render_impl.cc', + 'video_render_impl.h', + 'windows/i_video_render_win.h', 'windows/video_render_direct3d9.cc', + 'windows/video_render_direct3d9.h', 'windows/video_render_windows_impl.cc', - # External - 'external/video_render_external_impl.cc', + 'windows/video_render_windows_impl.h', ], # TODO(andrew): with the proper suffix, these files will be excluded # automatically. 'conditions': [ ['include_internal_video_render==1', { - 'defines': [ - 'WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER', - ], + 'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',], }], ['OS!="android" or include_internal_video_render==0', { 'sources!': [ - # Android 'android/video_render_android_impl.h', 'android/video_render_android_native_opengl2.h', 'android/video_render_android_surface_view.h', @@ -136,9 +116,7 @@ }], ['OS=="mac"', { 'direct_dependent_settings': { - 'include_dirs': [ - 'mac', - ], + 'include_dirs': ['mac',], }, }], ['OS!="win" or include_internal_video_render==0', { @@ -154,12 +132,9 @@ }, # video_render_module ], # targets - # Exclude the test target when building with chromium. 'conditions': [ ['include_internal_video_render==1', { - 'defines': [ - 'WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER', - ], + 'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',], }], ['include_tests==1', { 'targets': [ @@ -173,10 +148,10 @@ '<(webrtc_root)/common_video/common_video.gyp:common_video', ], 'sources': [ - '../test/testAPI/testAPI.cc', - '../test/testAPI/testAPI.h', - '../test/testAPI/testAPI_android.cc', - '../test/testAPI/testAPI_mac.mm', + 'test/testAPI/testAPI.cc', + 'test/testAPI/testAPI.h', + 'test/testAPI/testAPI_android.cc', + 'test/testAPI/testAPI_mac.mm', ], 'conditions': [ ['OS=="mac" or OS=="linux"', { @@ -208,8 +183,3 @@ ], # conditions } -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/webrtc/modules/video_render/main/source/video_render_frames.cc b/webrtc/modules/video_render/video_render_frames.cc similarity index 98% rename from webrtc/modules/video_render/main/source/video_render_frames.cc rename to webrtc/modules/video_render/video_render_frames.cc index adef341fd..134b93add 100644 --- a/webrtc/modules/video_render/main/source/video_render_frames.cc +++ b/webrtc/modules/video_render/video_render_frames.cc @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "modules/video_render/main/source/video_render_frames.h" +#include "webrtc/modules/video_render//video_render_frames.h" #include diff --git a/webrtc/modules/video_render/main/source/video_render_frames.h b/webrtc/modules/video_render/video_render_frames.h similarity index 96% rename from webrtc/modules/video_render/main/source/video_render_frames.h rename to webrtc/modules/video_render/video_render_frames.h index 44c1d1e87..8f3d699b8 100644 --- a/webrtc/modules/video_render/main/source/video_render_frames.h +++ b/webrtc/modules/video_render/video_render_frames.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT -#include "modules/video_render/main/interface/video_render.h" +#include "webrtc/modules/video_render/include/video_render.h" #include "system_wrappers/interface/list_wrapper.h" namespace webrtc { diff --git a/webrtc/modules/video_render/main/source/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc similarity index 99% rename from webrtc/modules/video_render/main/source/video_render_impl.cc rename to webrtc/modules/video_render/video_render_impl.cc index 6daf3086e..cce26ba92 100644 --- a/webrtc/modules/video_render/main/source/video_render_impl.cc +++ b/webrtc/modules/video_render/video_render_impl.cc @@ -14,7 +14,7 @@ #include "video_render_defines.h" #include "trace.h" #include "incoming_video_stream.h" -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" #include diff --git a/webrtc/modules/video_render/main/source/video_render_impl.h b/webrtc/modules/video_render/video_render_impl.h similarity index 99% rename from webrtc/modules/video_render/main/source/video_render_impl.h rename to webrtc/modules/video_render/video_render_impl.h index 25a55e928..f5ea951d4 100644 --- a/webrtc/modules/video_render/main/source/video_render_impl.h +++ b/webrtc/modules/video_render/video_render_impl.h @@ -15,8 +15,6 @@ #include "video_render.h" #include "map_wrapper.h" -//#include "video_render_defines.h" - namespace webrtc { class CriticalSectionWrapper; class IncomingVideoStream; diff --git a/webrtc/modules/video_render/main/source/windows/i_video_render_win.h b/webrtc/modules/video_render/windows/i_video_render_win.h similarity index 100% rename from webrtc/modules/video_render/main/source/windows/i_video_render_win.h rename to webrtc/modules/video_render/windows/i_video_render_win.h diff --git a/webrtc/modules/video_render/main/source/windows/video_render_direct3d9.cc b/webrtc/modules/video_render/windows/video_render_direct3d9.cc similarity index 100% rename from webrtc/modules/video_render/main/source/windows/video_render_direct3d9.cc rename to webrtc/modules/video_render/windows/video_render_direct3d9.cc diff --git a/webrtc/modules/video_render/main/source/windows/video_render_direct3d9.h b/webrtc/modules/video_render/windows/video_render_direct3d9.h similarity index 100% rename from webrtc/modules/video_render/main/source/windows/video_render_direct3d9.h rename to webrtc/modules/video_render/windows/video_render_direct3d9.h diff --git a/webrtc/modules/video_render/main/source/windows/video_render_windows_impl.cc b/webrtc/modules/video_render/windows/video_render_windows_impl.cc similarity index 100% rename from webrtc/modules/video_render/main/source/windows/video_render_windows_impl.cc rename to webrtc/modules/video_render/windows/video_render_windows_impl.cc diff --git a/webrtc/modules/video_render/main/source/windows/video_render_windows_impl.h b/webrtc/modules/video_render/windows/video_render_windows_impl.h similarity index 98% rename from webrtc/modules/video_render/main/source/windows/video_render_windows_impl.h rename to webrtc/modules/video_render/windows/video_render_windows_impl.h index ba438e35a..c04cdcd9f 100644 --- a/webrtc/modules/video_render/main/source/windows/video_render_windows_impl.h +++ b/webrtc/modules/video_render/windows/video_render_windows_impl.h @@ -14,7 +14,7 @@ #include #include -#include "i_video_render.h" +#include "webrtc/modules/video_render/i_video_render.h" #include "i_video_render_win.h" namespace webrtc { diff --git a/webrtc/video_engine/test/android/build.xml b/webrtc/video_engine/test/android/build.xml index 5afebbf69..49fe07cdd 100644 --- a/webrtc/video_engine/test/android/build.xml +++ b/webrtc/video_engine/test/android/build.xml @@ -895,7 +895,7 @@ Notice for all the files in this folder. - + diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h index f137fdfca..1a21c9e38 100644 --- a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h +++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h @@ -17,7 +17,7 @@ #include "common_types.h" #include "gflags/gflags.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "video_engine/include/vie_base.h" #include "video_engine/include/vie_capture.h" diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest.cc index e81e6edeb..363eccb87 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest.cc @@ -17,7 +17,7 @@ #include #include "engine_configurations.h" -#include "modules/video_render/main/interface/video_render.h" +#include "webrtc/modules/video_render/include/video_render.h" #include "testsupport/fileutils.h" #include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "video_engine/test/auto_test/primitives/general_primitives.h" diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi index 00acea0f8..bd0d2c71f 100644 --- a/webrtc/video_engine/video_engine_core.gypi +++ b/webrtc/video_engine/video_engine_core.gypi @@ -45,8 +45,7 @@ 'include_dirs': [ 'include', '../common_video/interface', - '../modules/video_capture/main/interface', - '../modules/video_render/main/interface', + '../modules/video_render/', ], 'direct_dependent_settings': { 'include_dirs': [ diff --git a/webrtc/video_engine/vie_base_impl.cc b/webrtc/video_engine/vie_base_impl.cc index 7583b79f5..da24e92a0 100644 --- a/webrtc/video_engine/vie_base_impl.cc +++ b/webrtc/video_engine/vie_base_impl.cc @@ -18,7 +18,7 @@ #include "modules/rtp_rtcp/interface/rtp_rtcp.h" #include "modules/video_coding/main/interface/video_coding.h" #include "modules/video_processing/main/interface/video_processing.h" -#include "modules/video_render/main/interface/video_render.h" +#include "webrtc/modules/video_render/include/video_render.h" #include "system_wrappers/interface/trace.h" #include "video_engine/vie_channel.h" #include "video_engine/vie_channel_manager.h" diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc index 233179bab..a4461b599 100644 --- a/webrtc/video_engine/vie_capturer.cc +++ b/webrtc/video_engine/vie_capturer.cc @@ -15,7 +15,7 @@ #include "modules/utility/interface/process_thread.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "modules/video_processing/main/interface/video_processing.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "system_wrappers/interface/critical_section_wrapper.h" #include "system_wrappers/interface/event_wrapper.h" #include "system_wrappers/interface/thread_wrapper.h" diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc index bd8c5ae63..dfd959904 100644 --- a/webrtc/video_engine/vie_channel.cc +++ b/webrtc/video_engine/vie_channel.cc @@ -19,7 +19,7 @@ #include "modules/utility/interface/process_thread.h" #include "modules/video_coding/main/interface/video_coding.h" #include "modules/video_processing/main/interface/video_processing.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "system_wrappers/interface/critical_section_wrapper.h" #include "system_wrappers/interface/thread_wrapper.h" #include "system_wrappers/interface/trace.h" diff --git a/webrtc/video_engine/vie_impl.cc b/webrtc/video_engine/vie_impl.cc index 870961e5f..b8066d74a 100644 --- a/webrtc/video_engine/vie_impl.cc +++ b/webrtc/video_engine/vie_impl.cc @@ -19,7 +19,7 @@ #ifdef WEBRTC_ANDROID #include "webrtc/modules/video_capture/include/video_capture_factory.h" -#include "modules/video_render/main/interface/video_render.h" +#include "webrtc/modules/video_render/include/video_render.h" #endif // Global counter to get an id for each new ViE instance. diff --git a/webrtc/video_engine/vie_render_impl.cc b/webrtc/video_engine/vie_render_impl.cc index a732ea701..caa95fd65 100644 --- a/webrtc/video_engine/vie_render_impl.cc +++ b/webrtc/video_engine/vie_render_impl.cc @@ -11,8 +11,8 @@ #include "video_engine/vie_render_impl.h" #include "engine_configurations.h" // NOLINT -#include "modules/video_render/main/interface/video_render.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "system_wrappers/interface/trace.h" #include "video_engine/include/vie_errors.h" #include "video_engine/vie_capturer.h" diff --git a/webrtc/video_engine/vie_render_impl.h b/webrtc/video_engine/vie_render_impl.h index e59ad503f..ac7b0e92b 100644 --- a/webrtc/video_engine/vie_render_impl.h +++ b/webrtc/video_engine/vie_render_impl.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_ #define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_ -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "typedefs.h" // NOLINT #include "video_engine/include/vie_render.h" #include "video_engine/vie_ref_count.h" diff --git a/webrtc/video_engine/vie_render_manager.cc b/webrtc/video_engine/vie_render_manager.cc index 2ec17c3d2..8eb149496 100644 --- a/webrtc/video_engine/vie_render_manager.cc +++ b/webrtc/video_engine/vie_render_manager.cc @@ -11,8 +11,8 @@ #include "video_engine/vie_render_manager.h" #include "engine_configurations.h" // NOLINT -#include "modules/video_render/main/interface/video_render.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "system_wrappers/interface/critical_section_wrapper.h" #include "system_wrappers/interface/rw_lock_wrapper.h" #include "system_wrappers/interface/trace.h" diff --git a/webrtc/video_engine/vie_renderer.cc b/webrtc/video_engine/vie_renderer.cc index 4efb39d9f..df59f610a 100644 --- a/webrtc/video_engine/vie_renderer.cc +++ b/webrtc/video_engine/vie_renderer.cc @@ -11,8 +11,8 @@ #include "video_engine/vie_renderer.h" #include "common_video/libyuv/include/webrtc_libyuv.h" -#include "modules/video_render/main/interface/video_render.h" -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "video_engine/vie_render_manager.h" namespace webrtc { diff --git a/webrtc/video_engine/vie_renderer.h b/webrtc/video_engine/vie_renderer.h index 2afd78971..565ef300b 100644 --- a/webrtc/video_engine/vie_renderer.h +++ b/webrtc/video_engine/vie_renderer.h @@ -11,7 +11,7 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_ #define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_ -#include "modules/video_render/main/interface/video_render_defines.h" +#include "webrtc/modules/video_render/include/video_render_defines.h" #include "system_wrappers/interface/map_wrapper.h" #include "system_wrappers/interface/scoped_ptr.h" #include "video_engine/include/vie_render.h"