Reorganize modules/video_capture.
- The usual elimination of main/source etc.
- Fully qualify "public" includes.
- Use lowercase for all directory names.
Review URL: https://webrtc-codereview.appspot.com/933010
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3025 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/modules.gyp b/modules/modules.gyp
index 9cce27c..d8355e7 100644
--- a/modules/modules.gyp
+++ b/modules/modules.gyp
@@ -24,14 +24,14 @@
'bitrate_controller/bitrate_controller.gypi',
'media_file/source/media_file.gypi',
'remote_bitrate_estimator/remote_bitrate_estimator.gypi',
+ 'rtp_rtcp/source/rtp_rtcp.gypi',
'udp_transport/source/udp_transport.gypi',
'utility/source/utility.gypi',
'video_coding/codecs/i420/main/source/i420.gypi',
'video_coding/main/source/video_coding.gypi',
- 'video_capture/main/source/video_capture.gypi',
+ 'video_capture/video_capture.gypi',
'video_processing/main/source/video_processing.gypi',
'video_render/main/source/video_render.gypi',
- 'rtp_rtcp/source/rtp_rtcp.gypi',
],
'conditions': [
['include_opus==1', {
diff --git a/modules/video_capture/main/source/Android.mk b/modules/video_capture/Android.mk
similarity index 100%
rename from modules/video_capture/main/source/Android.mk
rename to modules/video_capture/Android.mk
diff --git a/modules/video_capture/main/source/android/device_info_android.cc b/modules/video_capture/android/device_info_android.cc
similarity index 100%
rename from modules/video_capture/main/source/android/device_info_android.cc
rename to modules/video_capture/android/device_info_android.cc
diff --git a/modules/video_capture/main/source/android/device_info_android.h b/modules/video_capture/android/device_info_android.h
similarity index 100%
rename from modules/video_capture/main/source/android/device_info_android.h
rename to modules/video_capture/android/device_info_android.h
diff --git a/modules/video_capture/main/source/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java b/modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
similarity index 100%
rename from modules/video_capture/main/source/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
rename to modules/video_capture/android/java/org/webrtc/videoengine/CaptureCapabilityAndroid.java
diff --git a/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java b/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
similarity index 100%
rename from modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
rename to modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureAndroid.java
diff --git a/modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java b/modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
similarity index 100%
rename from modules/video_capture/main/source/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
rename to modules/video_capture/android/java/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
diff --git a/modules/video_capture/main/source/android/video_capture_android.cc b/modules/video_capture/android/video_capture_android.cc
similarity index 100%
rename from modules/video_capture/main/source/android/video_capture_android.cc
rename to modules/video_capture/android/video_capture_android.cc
diff --git a/modules/video_capture/main/source/android/video_capture_android.h b/modules/video_capture/android/video_capture_android.h
similarity index 100%
rename from modules/video_capture/main/source/android/video_capture_android.h
rename to modules/video_capture/android/video_capture_android.h
diff --git a/modules/video_capture/main/source/device_info_impl.cc b/modules/video_capture/device_info_impl.cc
similarity index 100%
rename from modules/video_capture/main/source/device_info_impl.cc
rename to modules/video_capture/device_info_impl.cc
diff --git a/modules/video_capture/main/source/device_info_impl.h b/modules/video_capture/device_info_impl.h
similarity index 100%
rename from modules/video_capture/main/source/device_info_impl.h
rename to modules/video_capture/device_info_impl.h
diff --git a/modules/video_capture/main/source/External/device_info_external.cc b/modules/video_capture/external/device_info_external.cc
similarity index 100%
rename from modules/video_capture/main/source/External/device_info_external.cc
rename to modules/video_capture/external/device_info_external.cc
diff --git a/modules/video_capture/main/source/External/video_capture_external.cc b/modules/video_capture/external/video_capture_external.cc
similarity index 100%
rename from modules/video_capture/main/source/External/video_capture_external.cc
rename to modules/video_capture/external/video_capture_external.cc
diff --git a/modules/video_capture/main/interface/video_capture.h b/modules/video_capture/include/video_capture.h
similarity index 94%
rename from modules/video_capture/main/interface/video_capture.h
rename to modules/video_capture/include/video_capture.h
index 38e0e07..736a539 100644
--- a/modules/video_capture/main/interface/video_capture.h
+++ b/modules/video_capture/include/video_capture.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_
-#include "modules/interface/module.h"
-#include "modules/video_capture/main/interface/video_capture_defines.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/video_capture/include/video_capture_defines.h"
namespace webrtc {
@@ -155,4 +155,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_H_
+#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_H_
diff --git a/modules/video_capture/main/interface/video_capture_defines.h b/modules/video_capture/include/video_capture_defines.h
similarity index 90%
rename from modules/video_capture/main/interface/video_capture_defines.h
rename to modules/video_capture/include/video_capture_defines.h
index 40b96e5..193be77 100644
--- a/modules/video_capture/main/interface/video_capture_defines.h
+++ b/modules/video_capture/include/video_capture_defines.h
@@ -8,13 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_DEFINES_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_DEFINES_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
-// Includes
-#include "typedefs.h"
-#include "modules/interface/module_common_types.h"
-#include "common_video/interface/i420_video_frame.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
namespace webrtc
{
@@ -153,5 +152,6 @@
virtual ~VideoCaptureFeedBack(){}
};
-} //namespace webrtc
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_DEFINES_H_
+} // namespace webrtc
+
+#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_DEFINES_H_
diff --git a/modules/video_capture/main/interface/video_capture_factory.h b/modules/video_capture/include/video_capture_factory.h
similarity index 83%
rename from modules/video_capture/main/interface/video_capture_factory.h
rename to modules/video_capture/include/video_capture_factory.h
index 5a8f741..27c6eba 100644
--- a/modules/video_capture/main/interface/video_capture_factory.h
+++ b/modules/video_capture/include/video_capture_factory.h
@@ -11,10 +11,10 @@
// This file contains interfaces used for creating the VideoCaptureModule
// and DeviceInfo.
-#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_FACTORY_H_
-#define WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_FACTORY_H_
+#ifndef WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_
+#define WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_
-#include "modules/video_capture/main/interface/video_capture.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
namespace webrtc {
@@ -46,4 +46,4 @@
} // namespace webrtc
-#endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_INTERFACE_VIDEO_CAPTURE_FACTORY_H_
+#endif // WEBRTC_MODULES_VIDEO_CAPTURE_INCLUDE_VIDEO_CAPTURE_FACTORY_H_
diff --git a/modules/video_capture/main/source/Linux/device_info_linux.cc b/modules/video_capture/linux/device_info_linux.cc
similarity index 100%
rename from modules/video_capture/main/source/Linux/device_info_linux.cc
rename to modules/video_capture/linux/device_info_linux.cc
diff --git a/modules/video_capture/main/source/Linux/device_info_linux.h b/modules/video_capture/linux/device_info_linux.h
similarity index 100%
rename from modules/video_capture/main/source/Linux/device_info_linux.h
rename to modules/video_capture/linux/device_info_linux.h
diff --git a/modules/video_capture/main/source/Linux/video_capture_linux.cc b/modules/video_capture/linux/video_capture_linux.cc
similarity index 100%
rename from modules/video_capture/main/source/Linux/video_capture_linux.cc
rename to modules/video_capture/linux/video_capture_linux.cc
diff --git a/modules/video_capture/main/source/Linux/video_capture_linux.h b/modules/video_capture/linux/video_capture_linux.h
similarity index 100%
rename from modules/video_capture/main/source/Linux/video_capture_linux.h
rename to modules/video_capture/linux/video_capture_linux.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h b/modules/video_capture/mac/qtkit/video_capture_qtkit.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h
rename to modules/video_capture/mac/qtkit/video_capture_qtkit.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm b/modules/video_capture/mac/qtkit/video_capture_qtkit.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.mm
rename to modules/video_capture/mac/qtkit/video_capture_qtkit.mm
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h b/modules/video_capture/mac/qtkit/video_capture_qtkit_info.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.h
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_info.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm b/modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info.mm
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_info.mm
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h b/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.h
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm b/modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_info_objc.mm
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.h b/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.h
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_objc.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm b/modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_objc.mm
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_objc.mm
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_utility.h b/modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_utility.h
rename to modules/video_capture/mac/qtkit/video_capture_qtkit_utility.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_recursive_lock.h b/modules/video_capture/mac/qtkit/video_capture_recursive_lock.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_recursive_lock.h
rename to modules/video_capture/mac/qtkit/video_capture_recursive_lock.h
diff --git a/modules/video_capture/main/source/Mac/QTKit/video_capture_recursive_lock.mm b/modules/video_capture/mac/qtkit/video_capture_recursive_lock.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/QTKit/video_capture_recursive_lock.mm
rename to modules/video_capture/mac/qtkit/video_capture_recursive_lock.mm
diff --git a/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc b/modules/video_capture/mac/quicktime/video_capture_quick_time.cc
similarity index 100%
rename from modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc
rename to modules/video_capture/mac/quicktime/video_capture_quick_time.cc
diff --git a/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.h b/modules/video_capture/mac/quicktime/video_capture_quick_time.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.h
rename to modules/video_capture/mac/quicktime/video_capture_quick_time.h
diff --git a/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc b/modules/video_capture/mac/quicktime/video_capture_quick_time_info.cc
similarity index 100%
rename from modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.cc
rename to modules/video_capture/mac/quicktime/video_capture_quick_time_info.cc
diff --git a/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h b/modules/video_capture/mac/quicktime/video_capture_quick_time_info.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time_info.h
rename to modules/video_capture/mac/quicktime/video_capture_quick_time_info.h
diff --git a/modules/video_capture/main/source/Mac/video_capture_mac.h b/modules/video_capture/mac/video_capture_mac.h
similarity index 100%
rename from modules/video_capture/main/source/Mac/video_capture_mac.h
rename to modules/video_capture/mac/video_capture_mac.h
diff --git a/modules/video_capture/main/source/Mac/video_capture_mac.mm b/modules/video_capture/mac/video_capture_mac.mm
similarity index 100%
rename from modules/video_capture/main/source/Mac/video_capture_mac.mm
rename to modules/video_capture/mac/video_capture_mac.mm
diff --git a/modules/video_capture/main/test/android/.classpath b/modules/video_capture/test/android/.classpath
similarity index 100%
rename from modules/video_capture/main/test/android/.classpath
rename to modules/video_capture/test/android/.classpath
diff --git a/modules/video_capture/main/test/android/.project b/modules/video_capture/test/android/.project
similarity index 100%
rename from modules/video_capture/main/test/android/.project
rename to modules/video_capture/test/android/.project
diff --git a/modules/video_capture/main/test/android/AndroidManifest.xml b/modules/video_capture/test/android/AndroidManifest.xml
similarity index 100%
rename from modules/video_capture/main/test/android/AndroidManifest.xml
rename to modules/video_capture/test/android/AndroidManifest.xml
diff --git a/modules/video_capture/main/test/android/default.properties b/modules/video_capture/test/android/default.properties
similarity index 100%
rename from modules/video_capture/main/test/android/default.properties
rename to modules/video_capture/test/android/default.properties
diff --git a/modules/video_capture/main/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java b/modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java
similarity index 100%
rename from modules/video_capture/main/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java
rename to modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java
diff --git a/modules/video_capture/main/test/android/jni/Android.mk b/modules/video_capture/test/android/jni/Android.mk
similarity index 100%
rename from modules/video_capture/main/test/android/jni/Android.mk
rename to modules/video_capture/test/android/jni/Android.mk
diff --git a/modules/video_capture/main/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h b/modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h
similarity index 100%
rename from modules/video_capture/main/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h
rename to modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h
diff --git a/modules/video_capture/main/test/android/jni/video_capture_module_android_test_jni.cc b/modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc
similarity index 100%
rename from modules/video_capture/main/test/android/jni/video_capture_module_android_test_jni.cc
rename to modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc
diff --git a/modules/video_capture/main/test/android/res/drawable-hdpi/icon.png b/modules/video_capture/test/android/res/drawable-hdpi/icon.png
similarity index 100%
rename from modules/video_capture/main/test/android/res/drawable-hdpi/icon.png
rename to modules/video_capture/test/android/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/modules/video_capture/main/test/android/res/drawable-ldpi/icon.png b/modules/video_capture/test/android/res/drawable-ldpi/icon.png
similarity index 100%
rename from modules/video_capture/main/test/android/res/drawable-ldpi/icon.png
rename to modules/video_capture/test/android/res/drawable-ldpi/icon.png
Binary files differ
diff --git a/modules/video_capture/main/test/android/res/drawable-mdpi/icon.png b/modules/video_capture/test/android/res/drawable-mdpi/icon.png
similarity index 100%
rename from modules/video_capture/main/test/android/res/drawable-mdpi/icon.png
rename to modules/video_capture/test/android/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/modules/video_capture/main/test/android/res/layout/main.xml b/modules/video_capture/test/android/res/layout/main.xml
similarity index 100%
rename from modules/video_capture/main/test/android/res/layout/main.xml
rename to modules/video_capture/test/android/res/layout/main.xml
diff --git a/modules/video_capture/main/test/android/res/values/strings.xml b/modules/video_capture/test/android/res/values/strings.xml
similarity index 100%
rename from modules/video_capture/main/test/android/res/values/strings.xml
rename to modules/video_capture/test/android/res/values/strings.xml
diff --git a/modules/video_capture/main/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java b/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java
similarity index 100%
rename from modules/video_capture/main/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java
rename to modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java
diff --git a/modules/video_capture/main/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java b/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java
similarity index 100%
rename from modules/video_capture/main/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java
rename to modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java
diff --git a/modules/video_capture/main/test/video_capture_main_mac.mm b/modules/video_capture/test/video_capture_main_mac.mm
similarity index 100%
rename from modules/video_capture/main/test/video_capture_main_mac.mm
rename to modules/video_capture/test/video_capture_main_mac.mm
diff --git a/modules/video_capture/main/test/video_capture_unittest.cc b/modules/video_capture/test/video_capture_unittest.cc
similarity index 99%
rename from modules/video_capture/main/test/video_capture_unittest.cc
rename to modules/video_capture/test/video_capture_unittest.cc
index 892d8ba..74b15ab 100644
--- a/modules/video_capture/main/test/video_capture_unittest.cc
+++ b/modules/video_capture/test/video_capture_unittest.cc
@@ -12,8 +12,8 @@
#include "gtest/gtest.h"
#include "modules/utility/interface/process_thread.h"
-#include "modules/video_capture/main/interface/video_capture.h"
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "common_video/interface/i420_video_frame.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "system_wrappers/interface/critical_section_wrapper.h"
diff --git a/modules/video_capture/main/source/video_capture.gypi b/modules/video_capture/video_capture.gypi
similarity index 60%
rename from modules/video_capture/main/source/video_capture.gypi
rename to modules/video_capture/video_capture.gypi
index 5581df3..0f801cb 100644
--- a/modules/video_capture/main/source/video_capture.gypi
+++ b/modules/video_capture/video_capture.gypi
@@ -10,77 +10,65 @@
'targets': [
{
'target_name': 'video_capture_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',
'<(webrtc_root)/common_video/libyuv/include',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../interface',
- '../../../interface',
- '<(webrtc_root)/common_video/libyuv/include',
- ],
- },
'sources': [
- # interfaces
- '../interface/video_capture.h',
- '../interface/video_capture_defines.h',
- '../interface/video_capture_factory.h',
- # headers
+ 'device_info_impl.cc',
+ 'device_info_impl.h',
+ 'include/video_capture.h',
+ 'include/video_capture_defines.h',
+ 'include/video_capture_factory.h',
'video_capture_config.h',
'video_capture_delay.h',
'video_capture_impl.h',
- 'device_info_impl.h',
-
- # DEFINE PLATFORM INDEPENDENT SOURCE FILES
'video_capture_factory.cc',
'video_capture_impl.cc',
- 'device_info_impl.cc',
],
'conditions': [
['include_internal_video_capture==0', {
'sources': [
- 'External/device_info_external.cc',
- 'External/video_capture_external.cc',
+ 'external/device_info_external.cc',
+ 'external/video_capture_external.cc',
],
},{ # include_internal_video_capture == 1
'conditions': [
- # DEFINE PLATFORM SPECIFIC SOURCE FILES
['OS=="linux"', {
'include_dirs': [
- 'Linux',
+ 'linux',
],
'sources': [
- 'Linux/device_info_linux.h',
- 'Linux/video_capture_linux.h',
- 'Linux/device_info_linux.cc',
- 'Linux/video_capture_linux.cc',
+ 'linux/device_info_linux.h',
+ 'linux/video_capture_linux.h',
+ 'linux/device_info_linux.cc',
+ 'linux/video_capture_linux.cc',
],
}], # linux
['OS=="mac"', {
'sources': [
- 'Mac/QTKit/video_capture_recursive_lock.h',
- 'Mac/QTKit/video_capture_qtkit.h',
- 'Mac/QTKit/video_capture_qtkit_info.h',
- 'Mac/QTKit/video_capture_qtkit_info_objc.h',
- 'Mac/QTKit/video_capture_qtkit_objc.h',
- 'Mac/QTKit/video_capture_qtkit_utility.h',
- 'Mac/video_capture_mac.mm',
- 'Mac/QTKit/video_capture_qtkit.mm',
- 'Mac/QTKit/video_capture_qtkit_objc.mm',
- 'Mac/QTKit/video_capture_recursive_lock.mm',
- 'Mac/QTKit/video_capture_qtkit_info.mm',
- 'Mac/QTKit/video_capture_qtkit_info_objc.mm',
+ 'mac/qtkit/video_capture_recursive_lock.h',
+ 'mac/qtkit/video_capture_qtkit.h',
+ 'mac/qtkit/video_capture_qtkit_info.h',
+ 'mac/qtkit/video_capture_qtkit_info_objc.h',
+ 'mac/qtkit/video_capture_qtkit_objc.h',
+ 'mac/qtkit/video_capture_qtkit_utility.h',
+ 'mac/qtkit/video_capture_qtkit.mm',
+ 'mac/qtkit/video_capture_qtkit_objc.mm',
+ 'mac/qtkit/video_capture_recursive_lock.mm',
+ 'mac/qtkit/video_capture_qtkit_info.mm',
+ 'mac/qtkit/video_capture_qtkit_info_objc.mm',
+ 'mac/video_capture_mac.mm',
],
'include_dirs': [
- 'Mac',
+ 'mac',
],
'link_settings': {
'xcode_settings': {
@@ -92,22 +80,22 @@
}], # mac
['OS=="win"', {
'dependencies': [
- '<(webrtc_root)/modules/video_capture/main/source/Windows/direct_show_base_classes.gyp:direct_show_base_classes',
+ '<(webrtc_root)/modules/video_capture/windows/direct_show_base_classes.gyp:direct_show_base_classes',
],
'include_dirs': [
- 'Windows',
+ 'windows',
],
'sources': [
- 'Windows/help_functions_windows.h',
- 'Windows/sink_filter_windows.h',
- 'Windows/video_capture_windows.h',
- 'Windows/device_info_windows.h',
- 'Windows/capture_delay_values_windows.h',
- 'Windows/help_functions_windows.cc',
- 'Windows/sink_filter_windows.cc',
- 'Windows/video_capture_windows.cc',
- 'Windows/device_info_windows.cc',
- 'Windows/video_capture_factory_windows.cc',
+ 'windows/help_functions_windows.h',
+ 'windows/sink_filter_windows.h',
+ 'windows/video_capture_windows.h',
+ 'windows/device_info_windows.h',
+ 'windows/capture_delay_values_windows.h',
+ 'windows/help_functions_windows.cc',
+ 'windows/sink_filter_windows.cc',
+ 'windows/video_capture_windows.cc',
+ 'windows/device_info_windows.cc',
+ 'windows/video_capture_factory_windows.cc',
],
'msvs_settings': {
'VCLibrarianTool': {
@@ -138,20 +126,19 @@
'target_name': 'video_capture_module_test',
'type': 'executable',
'dependencies': [
- 'video_capture_module',
- 'webrtc_utility',
- '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
- '<(DEPTH)/testing/gtest.gyp:gtest',
+ 'video_capture_module',
+ 'webrtc_utility',
+ '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
],
'include_dirs': [
- '../interface',
+ 'include',
],
'sources': [
- '../test/video_capture_unittest.cc',
- '../test/video_capture_main_mac.mm',
+ 'test/video_capture_unittest.cc',
+ 'test/video_capture_main_mac.mm',
],
'conditions': [
- # DEFINE PLATFORM SPECIFIC INCLUDE AND CFLAGS
['OS=="mac" or OS=="linux"', {
'cflags': [
'-Wno-write-strings',
@@ -192,8 +179,3 @@
],
}
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/modules/video_capture/main/source/video_capture_config.h b/modules/video_capture/video_capture_config.h
similarity index 100%
rename from modules/video_capture/main/source/video_capture_config.h
rename to modules/video_capture/video_capture_config.h
diff --git a/modules/video_capture/main/source/video_capture_delay.h b/modules/video_capture/video_capture_delay.h
similarity index 100%
rename from modules/video_capture/main/source/video_capture_delay.h
rename to modules/video_capture/video_capture_delay.h
diff --git a/modules/video_capture/main/source/video_capture_factory.cc b/modules/video_capture/video_capture_factory.cc
similarity index 100%
rename from modules/video_capture/main/source/video_capture_factory.cc
rename to modules/video_capture/video_capture_factory.cc
diff --git a/modules/video_capture/main/source/video_capture_impl.cc b/modules/video_capture/video_capture_impl.cc
similarity index 100%
rename from modules/video_capture/main/source/video_capture_impl.cc
rename to modules/video_capture/video_capture_impl.cc
diff --git a/modules/video_capture/main/source/video_capture_impl.h b/modules/video_capture/video_capture_impl.h
similarity index 100%
rename from modules/video_capture/main/source/video_capture_impl.h
rename to modules/video_capture/video_capture_impl.h
diff --git a/modules/video_capture/main/source/Windows/capture_delay_values_windows.h b/modules/video_capture/windows/capture_delay_values_windows.h
similarity index 100%
rename from modules/video_capture/main/source/Windows/capture_delay_values_windows.h
rename to modules/video_capture/windows/capture_delay_values_windows.h
diff --git a/modules/video_capture/main/source/Windows/device_info_windows.cc b/modules/video_capture/windows/device_info_windows.cc
similarity index 100%
rename from modules/video_capture/main/source/Windows/device_info_windows.cc
rename to modules/video_capture/windows/device_info_windows.cc
diff --git a/modules/video_capture/main/source/Windows/device_info_windows.h b/modules/video_capture/windows/device_info_windows.h
similarity index 100%
rename from modules/video_capture/main/source/Windows/device_info_windows.h
rename to modules/video_capture/windows/device_info_windows.h
diff --git a/modules/video_capture/main/source/Windows/direct_show_base_classes.gyp b/modules/video_capture/windows/direct_show_base_classes.gyp
similarity index 100%
rename from modules/video_capture/main/source/Windows/direct_show_base_classes.gyp
rename to modules/video_capture/windows/direct_show_base_classes.gyp
diff --git a/modules/video_capture/main/source/Windows/help_functions_windows.cc b/modules/video_capture/windows/help_functions_windows.cc
similarity index 100%
rename from modules/video_capture/main/source/Windows/help_functions_windows.cc
rename to modules/video_capture/windows/help_functions_windows.cc
diff --git a/modules/video_capture/main/source/Windows/help_functions_windows.h b/modules/video_capture/windows/help_functions_windows.h
similarity index 100%
rename from modules/video_capture/main/source/Windows/help_functions_windows.h
rename to modules/video_capture/windows/help_functions_windows.h
diff --git a/modules/video_capture/main/source/Windows/sink_filter_windows.cc b/modules/video_capture/windows/sink_filter_windows.cc
similarity index 100%
rename from modules/video_capture/main/source/Windows/sink_filter_windows.cc
rename to modules/video_capture/windows/sink_filter_windows.cc
diff --git a/modules/video_capture/main/source/Windows/sink_filter_windows.h b/modules/video_capture/windows/sink_filter_windows.h
similarity index 100%
rename from modules/video_capture/main/source/Windows/sink_filter_windows.h
rename to modules/video_capture/windows/sink_filter_windows.h
diff --git a/modules/video_capture/main/source/Windows/video_capture_factory_windows.cc b/modules/video_capture/windows/video_capture_factory_windows.cc
similarity index 100%
rename from modules/video_capture/main/source/Windows/video_capture_factory_windows.cc
rename to modules/video_capture/windows/video_capture_factory_windows.cc
diff --git a/modules/video_capture/main/source/Windows/video_capture_windows.cc b/modules/video_capture/windows/video_capture_windows.cc
similarity index 100%
rename from modules/video_capture/main/source/Windows/video_capture_windows.cc
rename to modules/video_capture/windows/video_capture_windows.cc
diff --git a/modules/video_capture/main/source/Windows/video_capture_windows.h b/modules/video_capture/windows/video_capture_windows.h
similarity index 100%
rename from modules/video_capture/main/source/Windows/video_capture_windows.h
rename to modules/video_capture/windows/video_capture_windows.h
diff --git a/video_engine/test/auto_test/primitives/base_primitives.cc b/video_engine/test/auto_test/primitives/base_primitives.cc
index 2bc42fd..a8e2da3 100644
--- a/video_engine/test/auto_test/primitives/base_primitives.cc
+++ b/video_engine/test/auto_test/primitives/base_primitives.cc
@@ -12,7 +12,7 @@
#include "vie_autotest.h"
#include "vie_autotest_defines.h"
-#include "video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
void TestI420CallSetup(webrtc::ViECodec* codec_interface,
webrtc::VideoEngine* video_engine,
diff --git a/video_engine/test/auto_test/primitives/codec_primitives.cc b/video_engine/test/auto_test/primitives/codec_primitives.cc
index 2d43440..0ed3880 100644
--- a/video_engine/test/auto_test/primitives/codec_primitives.cc
+++ b/video_engine/test/auto_test/primitives/codec_primitives.cc
@@ -14,7 +14,7 @@
#include "vie_autotest.h"
#include "vie_autotest_defines.h"
#include "vie_to_file_renderer.h"
-#include "video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "tb_interfaces.h"
// Helper functions.
diff --git a/video_engine/test/auto_test/primitives/framedrop_primitives.cc b/video_engine/test/auto_test/primitives/framedrop_primitives.cc
index 84bf768..6d63532 100644
--- a/video_engine/test/auto_test/primitives/framedrop_primitives.cc
+++ b/video_engine/test/auto_test/primitives/framedrop_primitives.cc
@@ -11,7 +11,7 @@
#include <cassert>
#include <string>
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "system_wrappers/interface/tick_util.h"
#include "testsupport/fileutils.h"
#include "testsupport/frame_reader.h"
diff --git a/video_engine/test/auto_test/primitives/general_primitives.cc b/video_engine/test/auto_test/primitives/general_primitives.cc
index 906f710..86d4b64 100644
--- a/video_engine/test/auto_test/primitives/general_primitives.cc
+++ b/video_engine/test/auto_test/primitives/general_primitives.cc
@@ -10,7 +10,7 @@
#include "general_primitives.h"
-#include "video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "vie_autotest.h"
#include "vie_autotest_defines.h"
#include "vie_to_file_renderer.h"
diff --git a/video_engine/test/auto_test/source/vie_autotest_base.cc b/video_engine/test/auto_test/source/vie_autotest_base.cc
index e9f270b..a41b309 100644
--- a/video_engine/test/auto_test/source/vie_autotest_base.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_base.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/primitives/base_primitives.h"
diff --git a/video_engine/test/auto_test/source/vie_autotest_capture.cc b/video_engine/test/auto_test/source/vie_autotest_capture.cc
index 580a521..816f9b7 100644
--- a/video_engine/test/auto_test/source/vie_autotest_capture.cc
+++ b/video_engine/test/auto_test/source/vie_autotest_capture.cc
@@ -11,7 +11,7 @@
#include "common_types.h" // NOLINT
#include "engine_configurations.h" // NOLINT
#include "gflags/gflags.h"
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "system_wrappers/interface/tick_util.h"
#include "video_engine/include/vie_base.h"
#include "video_engine/include/vie_capture.h"
diff --git a/video_engine/test/libvietest/include/tb_capture_device.h b/video_engine/test/libvietest/include/tb_capture_device.h
index 10f8db8..84d3f77 100644
--- a/video_engine/test/libvietest/include/tb_capture_device.h
+++ b/video_engine/test/libvietest/include/tb_capture_device.h
@@ -13,7 +13,7 @@
#include <string>
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
class TbInterfaces;
diff --git a/video_engine/vie_capturer.cc b/video_engine/vie_capturer.cc
index 77c7e50..233179b 100644
--- a/video_engine/vie_capturer.cc
+++ b/video_engine/vie_capturer.cc
@@ -13,7 +13,7 @@
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/interface/module_common_types.h"
#include "modules/utility/interface/process_thread.h"
-#include "modules/video_capture/main/interface/video_capture_factory.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 "system_wrappers/interface/critical_section_wrapper.h"
diff --git a/video_engine/vie_capturer.h b/video_engine/vie_capturer.h
index 5902aa7..4a7ba4e 100644
--- a/video_engine/vie_capturer.h
+++ b/video_engine/vie_capturer.h
@@ -15,7 +15,7 @@
#include "common_types.h" // NOLINT
#include "engine_configurations.h" // NOLINT
-#include "modules/video_capture/main/interface/video_capture.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
#include "modules/video_coding/codecs/interface/video_codec_interface.h"
#include "modules/video_coding/main/interface/video_coding.h"
#include "modules/video_processing/main/interface/video_processing.h"
diff --git a/video_engine/vie_impl.cc b/video_engine/vie_impl.cc
index 8805cd6..870961e 100644
--- a/video_engine/vie_impl.cc
+++ b/video_engine/vie_impl.cc
@@ -18,7 +18,7 @@
#include "system_wrappers/interface/trace.h"
#ifdef WEBRTC_ANDROID
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "modules/video_render/main/interface/video_render.h"
#endif
diff --git a/video_engine/vie_input_manager.cc b/video_engine/vie_input_manager.cc
index 8ff183c..937d1c5 100644
--- a/video_engine/vie_input_manager.cc
+++ b/video_engine/vie_input_manager.cc
@@ -13,7 +13,7 @@
#include <cassert>
#include "common_types.h" // NOLINT
-#include "modules/video_capture/main/interface/video_capture_factory.h"
+#include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "modules/video_coding/main/interface/video_coding.h"
#include "modules/video_coding/main/interface/video_coding_defines.h"
#include "system_wrappers/interface/critical_section_wrapper.h"
diff --git a/video_engine/vie_input_manager.h b/video_engine/vie_input_manager.h
index 465472d..cd7f310 100644
--- a/video_engine/vie_input_manager.h
+++ b/video_engine/vie_input_manager.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
-#include "modules/video_capture/main/interface/video_capture.h"
+#include "webrtc/modules/video_capture/include/video_capture.h"
#include "system_wrappers/interface/map_wrapper.h"
#include "system_wrappers/interface/scoped_ptr.h"
#include "typedefs.h" // NOLINT
