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

@@ -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', {

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 <jni.h>
-#include "i_video_render.h"
+#include "webrtc/modules/video_render/i_video_render.h"
 #include "map_wrapper.h"
 
 

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"
 

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 {
 

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 <cassert>
 
@@ -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"

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 {

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;

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 {
 

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;

webrtc/modules/video_render/test/testAPI/testAPI_mac.mm

@@ -19,7 +19,7 @@
 #include <sys/time.h>
 
 #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"

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
+        'android/video_render_android_impl.cc',
-        '../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.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_nsopengl.h',
-        'mac/video_render_mac_carbon_impl.cc',
+        'mac/video_render_nsopengl.mm',
-        'mac/cocoa_render_view.mm',
+        'video_render_frames.cc',
-        'mac/cocoa_full_screen_window.mm',
+        'video_render_frames.h',
-        # Windows
+        '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
+        'windows/video_render_windows_impl.h',
-        'external/video_render_external_impl.cc',
       ],
       # TODO(andrew): with the proper suffix, these files will be excluded
       # automatically.
       'conditions': [
         ['include_internal_video_render==1', {
-          'defines': [
+          'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
-            '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': [
+            'include_dirs': ['mac',],
-              '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': [
+      'defines': ['WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER',],
-        '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.cc',
-            '../test/testAPI/testAPI.h',
+            'test/testAPI/testAPI.h',
-            '../test/testAPI/testAPI_android.cc',
+            'test/testAPI/testAPI_android.cc',
-            '../test/testAPI/testAPI_mac.mm',
+            '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:

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 <cassert>
 

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 {

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 <cassert>
 

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;

webrtc/modules/video_render/windows/video_render_windows_impl.h

@@ -14,7 +14,7 @@
 #include <Winerror.h>
 #include <dxdiag.h>
 
-#include "i_video_render.h"
+#include "webrtc/modules/video_render/i_video_render.h"
 #include "i_video_render_win.h"
 
 namespace webrtc {

webrtc/video_engine/test/android/build.xml

@@ -895,7 +895,7 @@ Notice for all the files in this folder.
                 <src path="${source.absolute.dir}" />
                 <src path="${gen.absolute.dir}" />
                 <src path="${webrtc.modules.dir}/video_capture/android/java" />
-                <src path="${webrtc.modules.dir}/video_render/main/source/android/java" />
+                <src path="${webrtc.modules.dir}/video_render/android/java" />
                 <src path="${webrtc.modules.dir}/audio_device/android" />
                 <compilerarg line="${java.compilerargs}" />
             </javac>

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"

webrtc/video_engine/test/auto_test/source/vie_autotest.cc

@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #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"

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/',
-        '../modules/video_render/main/interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [

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"

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"

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"

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.

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 "webrtc/modules/video_render/include/video_render.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/trace.h"
 #include "video_engine/include/vie_errors.h"
 #include "video_engine/vie_capturer.h"

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"

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 "webrtc/modules/video_render/include/video_render.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/rw_lock_wrapper.h"
 #include "system_wrappers/interface/trace.h"

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 "webrtc/modules/video_render/include/video_render.h"
-#include "modules/video_render/main/interface/video_render_defines.h"
+#include "webrtc/modules/video_render/include/video_render_defines.h"
 #include "video_engine/vie_render_manager.h"
 
 namespace webrtc {

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"