generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved video_engine/main/interface to video_engine/include.

Browse Source 
Only changed include paths in files, gyp-files and Android.mk.

TEST=vie_auto_test and peerconnection_client builds.

Review URL: http://webrtc-codereview.appspot.com/330017

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1281 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2011-12-22 08:51:52 +00:00
parent 1e28d3c2e1
commit a4863dbdf0
48 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
"chromium_revision": "114939",
"libjingle_revision": "100",
"libjingle_revision": "101",
# External resources like video and audio files used for testing purposes.
# Downloaded on demand when needed.

2
src/video_engine/Android.mk
View File

@ -52,7 +52,7 @@ LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS)
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/main/interface \
$(LOCAL_PATH)/include\
$(LOCAL_PATH)/.. \
$(LOCAL_PATH)/../common_video/interface \
$(LOCAL_PATH)/../common_video/jpeg/main/interface \

0
src/video_engine/main/interface/vie_base.h → src/video_engine/include/vie_base.h
View File

0
src/video_engine/main/interface/vie_capture.h → src/video_engine/include/vie_capture.h
View File

0
src/video_engine/main/interface/vie_codec.h → src/video_engine/include/vie_codec.h
View File

0
src/video_engine/main/interface/vie_encryption.h → src/video_engine/include/vie_encryption.h
View File

0
src/video_engine/main/interface/vie_errors.h → src/video_engine/include/vie_errors.h
View File

0
src/video_engine/main/interface/vie_external_codec.h → src/video_engine/include/vie_external_codec.h
View File

0
src/video_engine/main/interface/vie_file.h → src/video_engine/include/vie_file.h
View File

0
src/video_engine/main/interface/vie_image_process.h → src/video_engine/include/vie_image_process.h
View File

0
src/video_engine/main/interface/vie_network.h → src/video_engine/include/vie_network.h
View File

0
src/video_engine/main/interface/vie_render.h → src/video_engine/include/vie_render.h
View File

0
src/video_engine/main/interface/vie_rtp_rtcp.h → src/video_engine/include/vie_rtp_rtcp.h
View File

3
src/video_engine/main/test/android_test/jni/Android.mk
View File

@ -24,7 +24,7 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
external/gtest/include \
$(LOCAL_PATH)/../../../../.. \
$(LOCAL_PATH)/../../../interface \
$(LOCAL_PATH)/../../../../include \
$(LOCAL_PATH)/../../../../../voice_engine/main/interface
LOCAL_PRELINK_MODULE := false
@ -38,4 +38,3 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_LDLIBS := $(LIBS_PATH)/VideoEngine_android_gcc.a -llog -lgcc
include $(BUILD_SHARED_LIBRARY)

2
src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h
View File

@ -14,7 +14,7 @@
#include <cstdio>
#include <string>
#include "video_engine/main/interface/vie_render.h"
#include "video_engine/include/vie_render.h"
class ViEToFileRenderer: public webrtc::ExternalRenderer {
public:

4
src/video_engine/test/auto_test/primitives/codec_primitives.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_CODEC_PRIMITIVES_H_
#define WEBRTC_VIDEO_ENGINE_TEST_AUTO_TEST_PRIMITIVES_CODEC_PRIMITIVES_H_
#include "video_engine/main/interface/vie_codec.h"
#include "video_engine/main/interface/vie_image_process.h"
#include "video_engine/include/vie_codec.h"
#include "video_engine/include/vie_image_process.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/primitives/general_primitives.h"

4
src/video_engine/test/auto_test/primitives/framedrop_primitives.h
View File

@ -14,8 +14,8 @@
#include <list>
#include <map>
#include "video_engine/main/interface/vie_codec.h"
#include "video_engine/main/interface/vie_image_process.h"
#include "video_engine/include/vie_codec.h"
#include "video_engine/include/vie_image_process.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/helpers/vie_to_file_renderer.h"

2
src/video_engine/test/auto_test/source/Android.mk
View File

@ -42,7 +42,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../helpers \
$(LOCAL_PATH)/../primitives \
$(LOCAL_PATH)/../../../.. \
$(LOCAL_PATH)/../../../main/interface \
$(LOCAL_PATH)/../../../include \
$(LOCAL_PATH)/../../.. \
$(LOCAL_PATH)/../../../../modules/video_coding/codecs/interface \
$(LOCAL_PATH)/../../../../system_wrappers/interface \

2
src/video_engine/test/auto_test/vie_auto_test.gypi
View File

@ -25,7 +25,7 @@
'interface/',
'helpers/',
'primitives',
'../../main/interface',
'../../include',
'../..',
'../../../modules/video_coding/codecs/interface',
'../../../common_video/interface',

26
src/video_engine/video_engine_core.gypi
View File

@ -35,29 +35,29 @@
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
],
'include_dirs': [
'main/interface',
'include',
'../common_video/interface',
'../modules/video_capture/main/interface',
'../modules/video_render/main/interface',
],
'direct_dependent_settings': {
'include_dirs': [
'main/interface',
'include',
],
},
'sources': [
# interface
'main/interface/vie_base.h',
'main/interface/vie_capture.h',
'main/interface/vie_codec.h',
'main/interface/vie_encryption.h',
'main/interface/vie_errors.h',
'main/interface/vie_external_codec.h',
'main/interface/vie_file.h',
'main/interface/vie_image_process.h',
'main/interface/vie_network.h',
'main/interface/vie_render.h',
'main/interface/vie_rtp_rtcp.h',
'include/vie_base.h',
'include/vie_capture.h',
'include/vie_codec.h',
'include/vie_encryption.h',
'include/vie_errors.h',
'include/vie_external_codec.h',
'include/vie_file.h',
'include/vie_image_process.h',
'include/vie_network.h',
'include/vie_render.h',
'include/vie_rtp_rtcp.h',
# headers
'vie_base_impl.h',

2
src/video_engine/vie_capture_impl.cc
View File

@ -11,7 +11,7 @@
#include "video_engine/vie_capture_impl.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"

2
src/video_engine/vie_capture_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_capture.h"
#include "video_engine/include/vie_capture.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_capturer.cc
View File

@ -19,7 +19,7 @@
#include "system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_image_process.h"
#include "video_engine/include/vie_image_process.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_encoder.h"

2
src/video_engine/vie_capturer.h
View File

@ -18,7 +18,7 @@
#include "modules/video_coding/main/interface/video_coding.h"
#include "modules/video_processing/main/interface/video_processing.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_capture.h"
#include "video_engine/include/vie_capture.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_frame_provider_base.h"

8
src/video_engine/vie_channel.cc
View File

@ -21,10 +21,10 @@
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_codec.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/main/interface/vie_image_process.h"
#include "video_engine/main/interface/vie_rtp_rtcp.h"
#include "video_engine/include/vie_codec.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/include/vie_image_process.h"
#include "video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_receiver.h"
#include "video_engine/vie_sender.h"

4
src/video_engine/vie_channel.h
View File

@ -20,8 +20,8 @@
#include "modules/video_coding/main/interface/video_coding_defines.h"
#include "system_wrappers/interface/tick_util.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_network.h"
#include "video_engine/main/interface/vie_rtp_rtcp.h"
#include "video_engine/include/vie_network.h"
#include "video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_file_recorder.h"
#include "video_engine/vie_frame_provider_base.h"

2
src/video_engine/vie_codec_impl.cc
View File

@ -13,7 +13,7 @@
#include "engine_configurations.h"
#include "modules/video_coding/main/interface/video_coding.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"

2
src/video_engine/vie_codec_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_codec.h"
#include "video_engine/include/vie_codec.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_encryption_impl.cc
View File

@ -11,7 +11,7 @@
#include "video_engine/vie_encryption_impl.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"
#include "video_engine/vie_defines.h"

2
src/video_engine/vie_encryption_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_encryption.h"
#include "video_engine/include/vie_encryption.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_external_codec_impl.cc
View File

@ -12,7 +12,7 @@
#include "engine_configurations.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"
#include "video_engine/vie_encoder.h"

2
src/video_engine/vie_external_codec_impl.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
#include "video_engine/main/interface/vie_external_codec.h"
#include "video_engine/include/vie_external_codec.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_file_image.h
View File

@ -13,7 +13,7 @@
#include "modules/interface/module_common_types.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_file.h"
#include "video_engine/include/vie_file.h"
namespace webrtc {

2
src/video_engine/vie_file_impl.cc
View File

@ -17,7 +17,7 @@
#include "system_wrappers/interface/condition_variable_wrapper.h"
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"

2
src/video_engine/vie_file_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_file.h"
#include "video_engine/include/vie_file.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_frame_provider_base.h"
#include "video_engine/vie_ref_count.h"

2
src/video_engine/vie_file_player.cc
View File

@ -16,7 +16,7 @@
#include "system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/tick_util.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_file.h"
#include "video_engine/include/vie_file.h"
#include "video_engine/vie_input_manager.h"
#include "voice_engine/main/interface/voe_base.h"
#include "voice_engine/main/interface/voe_file.h"

2
src/video_engine/vie_file_recorder.h
View File

@ -13,7 +13,7 @@
#include "modules/utility/interface/file_recorder.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_file.h"
#include "video_engine/include/vie_file.h"
#include "voice_engine/main/interface/voe_file.h"
namespace webrtc {

2
src/video_engine/vie_image_process_impl.cc
View File

@ -11,7 +11,7 @@
#include "video_engine/vie_image_process_impl.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"

2
src/video_engine/vie_image_process_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_image_process.h"
#include "video_engine/include/vie_image_process.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_input_manager.cc
View File

@ -19,7 +19,7 @@
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/rw_lock_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_file_player.h"

2
src/video_engine/vie_input_manager.h
View File

@ -14,7 +14,7 @@
#include "modules/video_capture/main/interface/video_capture.h"
#include "system_wrappers/interface/map_wrapper.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_capture.h"
#include "video_engine/include/vie_capture.h"
#include "video_engine/vie_defines.h"
#include "video_engine/vie_frame_provider_base.h"
#include "video_engine/vie_manager_base.h"

2
src/video_engine/vie_network_impl.cc
View File

@ -17,7 +17,7 @@
#include "engine_configurations.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"
#include "video_engine/vie_defines.h"

2
src/video_engine/vie_network_impl.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_VIDEO_ENGINE_VIE_NETWORK_IMPL_H_
#include "typedefs.h"
#include "video_engine/main/interface/vie_network.h"
#include "video_engine/include/vie_network.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_render_impl.cc
View File

@ -14,7 +14,7 @@
#include "modules/video_render/main/interface/video_render.h"
#include "modules/video_render/main/interface/video_render_defines.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"

2
src/video_engine/vie_render_impl.h
View File

@ -13,7 +13,7 @@
#include "modules/video_render/main/interface/video_render_defines.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_render.h"
#include "video_engine/include/vie_render.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"

2
src/video_engine/vie_renderer.h
View File

@ -13,7 +13,7 @@
#include "modules/video_render/main/interface/video_render_defines.h"
#include "system_wrappers/interface/map_wrapper.h"
#include "video_engine/main/interface/vie_render.h"
#include "video_engine/include/vie_render.h"
#include "video_engine/vie_frame_provider_base.h"
namespace webrtc {

2
src/video_engine/vie_rtp_rtcp_impl.cc
View File

@ -13,7 +13,7 @@
#include "engine_configurations.h"
#include "system_wrappers/interface/file_wrapper.h"
#include "system_wrappers/interface/trace.h"
#include "video_engine/main/interface/vie_errors.h"
#include "video_engine/include/vie_errors.h"
#include "video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h"
#include "video_engine/vie_defines.h"

2
src/video_engine/vie_rtp_rtcp_impl.h
View File

@ -13,7 +13,7 @@
#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "typedefs.h"
#include "video_engine/main/interface/vie_rtp_rtcp.h"
#include "video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h"