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

Include files from webrtc/.. paths in video_engine/

Browse Source 
BUG=1662
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1492004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4056 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-05-17 13:44:48 +00:00
parent 9f557c140e
commit f5d4cb1958
145 changed files with 697 additions and 732 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/video_engine/call_stats_unittest.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <gmock/gmock.h> #include "testing/gmock/include/gmock/gmock.h"
#include <gtest/gtest.h> #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"

8
webrtc/video_engine/encoder_state_feedback.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/encoder_state_feedback.h" #include "webrtc/video_engine/encoder_state_feedback.h"
#include <assert.h> #include <assert.h>
#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "video_engine/vie_encoder.h" #include "webrtc/video_engine/vie_encoder.h"
namespace webrtc { namespace webrtc {

6
webrtc/video_engine/encoder_state_feedback.h
View File

@ -16,9 +16,9 @@
#include <map> #include <map>
#include "system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "typedefs.h" // NOLINT #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

4
webrtc/video_engine/encoder_state_feedback_unittest.cc
View File

@ -12,8 +12,8 @@
// This file includes unit tests for EncoderStateFeedback. // This file includes unit tests for EncoderStateFeedback.
#include "webrtc/video_engine/encoder_state_feedback.h" #include "webrtc/video_engine/encoder_state_feedback.h"
#include <gmock/gmock.h> #include "testing/gmock/include/gmock/gmock.h"
#include <gtest/gtest.h> #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/common.h" #include "webrtc/common.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"

2
webrtc/video_engine/include/vie_base.h
View File

@ -19,7 +19,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_BASE_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_BASE_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_BASE_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_BASE_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/include/vie_capture.h
View File

@ -18,7 +18,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CAPTURE_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CAPTURE_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CAPTURE_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CAPTURE_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/include/vie_codec.h
View File

@ -17,7 +17,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CODEC_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CODEC_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CODEC_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_CODEC_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/include/vie_encryption.h
View File

@ -14,7 +14,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_ENCRYPTION_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_ENCRYPTION_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_ENCRYPTION_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_ENCRYPTION_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {
class VideoEngine; class VideoEngine;

2
webrtc/video_engine/include/vie_external_codec.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_EXTERNAL_CODEC_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_EXTERNAL_CODEC_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_EXTERNAL_CODEC_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_EXTERNAL_CODEC_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/include/vie_file.h
View File

@ -16,7 +16,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_FILE_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_FILE_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_FILE_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_FILE_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

4
webrtc/video_engine/include/vie_image_process.h
View File

@ -17,8 +17,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_
#include "common_types.h" #include "webrtc/common_types.h"
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/include/vie_render.h
View File

@ -16,7 +16,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_RENDER_H_ #ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_RENDER_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_RENDER_H_ #define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_RENDER_H_
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {

4
webrtc/video_engine/internal/video_call.cc
View File

@ -20,10 +20,10 @@
#include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "webrtc/video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "webrtc/video_engine/new_include/common.h"
#include "webrtc/video_engine/new_include/video_engine.h"
#include "webrtc/video_engine/internal/video_receive_stream.h" #include "webrtc/video_engine/internal/video_receive_stream.h"
#include "webrtc/video_engine/internal/video_send_stream.h" #include "webrtc/video_engine/internal/video_send_stream.h"
#include "webrtc/video_engine/new_include/common.h"
#include "webrtc/video_engine/new_include/video_engine.h"
namespace webrtc { namespace webrtc {
namespace internal { namespace internal {

4
webrtc/video_engine/internal/video_call.h
View File

@ -15,10 +15,10 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
#include "webrtc/video_engine/new_include/common.h"
#include "webrtc/video_engine/new_include/video_engine.h"
#include "webrtc/video_engine/internal/video_receive_stream.h" #include "webrtc/video_engine/internal/video_receive_stream.h"
#include "webrtc/video_engine/internal/video_send_stream.h" #include "webrtc/video_engine/internal/video_send_stream.h"
#include "webrtc/video_engine/new_include/common.h"
#include "webrtc/video_engine/new_include/video_engine.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/internal/video_send_stream.h
View File

@ -14,8 +14,8 @@
#include <vector> #include <vector>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/video_engine/new_include/video_send_stream.h"
#include "webrtc/video_engine/new_include/video_receive_stream.h" #include "webrtc/video_engine/new_include/video_receive_stream.h"
#include "webrtc/video_engine/new_include/video_send_stream.h"
namespace webrtc { namespace webrtc {

6
webrtc/video_engine/stream_synchronization.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/stream_synchronization.h" #include "webrtc/video_engine/stream_synchronization.h"
#include <assert.h>
#include <algorithm> #include <algorithm>
#include <assert.h>
#include <cmath> #include <cmath>
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc { namespace webrtc {

4
webrtc/video_engine/stream_synchronization.h
View File

@ -13,8 +13,8 @@
#include <list> #include <list>
#include "modules/remote_bitrate_estimator/include/rtp_to_ntp.h" #include "webrtc/modules/remote_bitrate_estimator/include/rtp_to_ntp.h"
#include "typedefs.h" // NOLINT #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

6
webrtc/video_engine/stream_synchronization_unittest.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <math.h>
#include <algorithm> #include <algorithm>
#include <math.h>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "video_engine/stream_synchronization.h" #include "webrtc/video_engine/stream_synchronization.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
View File

@ -13,7 +13,7 @@
#include <jni.h> #include <jni.h>
#include "android_media_codec_decoder.h" #include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_TEST_ANDROID_JNI_ANDROID_MEDIA_CODEC_DECODER_H_ #ifndef WEBRTC_VIDEO_ENGINE_TEST_ANDROID_JNI_ANDROID_MEDIA_CODEC_DECODER_H_
#define WEBRTC_VIDEO_ENGINE_TEST_ANDROID_JNI_ANDROID_MEDIA_CODEC_DECODER_H_ #define WEBRTC_VIDEO_ENGINE_TEST_ANDROID_JNI_ANDROID_MEDIA_CODEC_DECODER_H_
#include "modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
namespace webrtc { namespace webrtc {

38
webrtc/video_engine/test/android/jni/vie_android_java_api.cc
View File

@ -8,31 +8,31 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <android/log.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <android/log.h>
#include "org_webrtc_videoengineapp_vie_android_java_api.h" #include "webrtc/video_engine/test/android/jni/org_webrtc_videoengineapp_vie_android_java_api.h"
#include "voe_base.h" #include "webrtc/voice_engine/include/voe_audio_processing.h"
#include "voe_codec.h" #include "webrtc/voice_engine/include/voe_base.h"
#include "voe_file.h" #include "webrtc/voice_engine/include/voe_codec.h"
#include "voe_network.h" #include "webrtc/voice_engine/include/voe_file.h"
#include "voe_audio_processing.h" #include "webrtc/voice_engine/include/voe_hardware.h"
#include "voe_volume_control.h" #include "webrtc/voice_engine/include/voe_network.h"
#include "voe_hardware.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
#include "voe_rtp_rtcp.h" #include "webrtc/voice_engine/include/voe_volume_control.h"
#include "vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "vie_codec.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "vie_capture.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "vie_external_codec.h" #include "webrtc/video_engine/include/vie_external_codec.h"
#include "vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "common_types.h" #include "webrtc/common_types.h"
#include "android_media_codec_decoder.h" #include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"

8
webrtc/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <stdio.h>
#include <string.h>
#include <android/log.h> #include <android/log.h>
#include <pthread.h> #include <pthread.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "org_webrtc_vieautotest_vie_autotest.h" #include "webrtc/video_engine/test/auto_test/android/jni/org_webrtc_vieautotest_vie_autotest.h"
#include "vie_autotest_android.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_android.h"
#define WEBRTC_LOG_TAG "*WEBRTCN*" #define WEBRTC_LOG_TAG "*WEBRTCN*"

2
webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h
View File

@ -11,7 +11,7 @@
#ifndef SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_AUTOMATED_TWO_WINDOWS_FIXTURE_H_ #ifndef SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_AUTOMATED_TWO_WINDOWS_FIXTURE_H_
#define SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_AUTOMATED_TWO_WINDOWS_FIXTURE_H_ #define SRC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_AUTOMATED_TWO_WINDOWS_FIXTURE_H_
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
class ViEWindowCreator; class ViEWindowCreator;
class ViEAutoTest; class ViEAutoTest;

2
webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/gtest_disable.h"
#include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h" #include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"

2
webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/gtest_disable.h"
#include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h" #include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"

4
webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
View File

@ -10,8 +10,8 @@
#include <ctime> #include <ctime>
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/libtest/include/bit_flip_encryption.h" #include "webrtc/test/libtest/include/bit_flip_encryption.h"
#include "webrtc/test/libtest/include/random_encryption.h" #include "webrtc/test/libtest/include/random_encryption.h"
#include "webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h" #include "webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h"

4
webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
View File

@ -15,8 +15,8 @@
#include <cstdio> #include <cstdio>
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/test/testsupport/metrics/video_metrics.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/test/testsupport/metrics/video_metrics.h"
#include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h" #include "webrtc/video_engine/test/auto_test/automated/legacy_fixture.h"

4
webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc
View File

@ -12,10 +12,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/perf_test.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/test/testsupport/metrics/video_metrics.h"
#include "webrtc/test/testsupport/perf_test.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_file_based_comparison_tests.h" #include "webrtc/video_engine/test/auto_test/interface/vie_file_based_comparison_tests.h"
#include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"

32
webrtc/video_engine/test/auto_test/interface/vie_autotest.h
View File

@ -15,23 +15,23 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_H_
#include "common_types.h" #include "testing/gflags/include/gflags/gflags.h"
#include "gflags/gflags.h" #include "webrtc/common_types.h"
#include "webrtc/modules/video_render/include/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 "webrtc/video_engine/include/vie_base.h"
#include "video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_errors.h"
#include "video_engine/include/vie_file.h" #include "webrtc/video_engine/include/vie_file.h"
#include "video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/include/vie_errors.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "voice_engine/include/voe_audio_processing.h" #include "webrtc/voice_engine/include/voe_audio_processing.h"
#include "voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_base.h"
#include "voice_engine/include/voe_codec.h" #include "webrtc/voice_engine/include/voe_codec.h"
#include "voice_engine/include/voe_hardware.h" #include "webrtc/voice_engine/include/voe_hardware.h"
#ifndef WEBRTC_ANDROID #ifndef WEBRTC_ANDROID
#include <string> #include <string>

10
webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
View File

@ -21,8 +21,8 @@
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include "engine_configurations.h" #include "testing/gtest/include/gtest/gtest.h"
#include "gtest/gtest.h" #include "webrtc/engine_configurations.h"
#include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/sleep.h"
#if defined(_WIN32) #if defined(_WIN32)
@ -30,10 +30,10 @@
#elif defined (WEBRTC_ANDROID) #elif defined (WEBRTC_ANDROID)
#include <android/log.h> #include <android/log.h>
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC) #elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
#include <string.h>
#include <time.h>
#include <sys/time.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#endif #endif
// Choose how to log // Choose how to log

2
webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_LINUX_H_
#include "vie_autotest_window_manager_interface.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
// Forward declaration // Forward declaration

4
webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h
View File

@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_MAC_COCOA_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_MAC_COCOA_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_MAC_COCOA_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_MAC_COCOA_H_
#include "vie_autotest_window_manager_interface.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
@class CocoaRenderView; @class CocoaRenderView;

2
webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h
View File

@ -12,7 +12,7 @@
* vie_autotest_window_manager_interface.h * vie_autotest_window_manager_interface.h
*/ */
#include "vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOW_MANAGER_INTERFACE_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOW_MANAGER_INTERFACE_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOW_MANAGER_INTERFACE_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOW_MANAGER_INTERFACE_H_

4
webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOWS_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOWS_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOWS_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOWS_H_
#include "vie_autotest_window_manager_interface.h" #include "webrtc/engine_configurations.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
#include <windows.h> #include <windows.h>
#define TITLE_LENGTH 1024 #define TITLE_LENGTH 1024

4
webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/auto_test/primitives/choice_helpers.h" #include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h"
#include <algorithm>
#include <cassert> #include <cassert>
#include <cstdio> #include <cstdio>
#include <cstdlib> #include <cstdlib>
#include <algorithm>
#include <sstream> #include <sstream>
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/auto_test/primitives/choice_helpers.h
View File

@ -14,7 +14,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "video_engine/test/auto_test/primitives/input_helpers.h" #include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h"
namespace webrtc { namespace webrtc {

6
webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
View File

@ -10,9 +10,9 @@
#include <cstdio> #include <cstdio>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "video_engine/test/auto_test/primitives/choice_helpers.h" #include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h"
#include "video_engine/test/auto_test/primitives/fake_stdin.h" #include "webrtc/video_engine/test/auto_test/primitives/fake_stdin.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/auto_test/primitives/fake_stdin.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/auto_test/primitives/fake_stdin.h" #include "webrtc/video_engine/test/auto_test/primitives/fake_stdin.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
View File

@ -13,7 +13,7 @@
#include <cstdio> #include <cstdio>
#include <string> #include <string>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
namespace webrtc { namespace webrtc {

26
webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
View File

@ -14,19 +14,19 @@
#include <string> #include <string>
#include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_reader.h"
#include "testsupport/frame_writer.h" #include "webrtc/test/testsupport/frame_writer.h"
#include "testsupport/perf_test.h" #include "webrtc/test/testsupport/perf_test.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/primitives/framedrop_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
#include "video_engine/test/auto_test/primitives/general_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "video_engine/test/libvietest/include/vie_external_render_filter.h" #include "webrtc/video_engine/test/libvietest/include/vie_external_render_filter.h"
#include "video_engine/test/libvietest/include/vie_to_file_renderer.h" #include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
enum { kWaitTimeForFinalDecodeMs = 100 }; enum { kWaitTimeForFinalDecodeMs = 100 };

8
webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h
View File

@ -14,10 +14,10 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_image_process.h" #include "webrtc/video_engine/include/vie_image_process.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/libvietest/include/vie_to_file_renderer.h" #include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
class FrameDropDetector; class FrameDropDetector;
struct NetworkParameters; struct NetworkParameters;

10
webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "framedrop_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
#include <cstdio> #include <cstdio>
#include <vector> #include <vector>
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_reader.h"
#include "testsupport/frame_writer.h" #include "webrtc/test/testsupport/frame_writer.h"
namespace webrtc { namespace webrtc {

8
webrtc/video_engine/test/auto_test/primitives/general_primitives.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "general_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "vie_to_file_renderer.h" #include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
void FindCaptureDeviceOnSystem(webrtc::ViECapture* capture, void FindCaptureDeviceOnSystem(webrtc::ViECapture* capture,
char* device_name, char* device_name,

2
webrtc/video_engine/test/auto_test/primitives/general_primitives.h
View File

@ -13,7 +13,7 @@
class ViEToFileRenderer; class ViEToFileRenderer;
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {
class VideoCaptureModule; class VideoCaptureModule;

4
webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/auto_test/primitives/input_helpers.h" #include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h"
#include <cassert> #include <cassert>
#include <cstdio> #include <cstdio>
@ -16,7 +16,7 @@
#include <algorithm> #include <algorithm>
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/test/auto_test/primitives/input_helpers.h
View File

@ -17,7 +17,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
namespace webrtc { namespace webrtc {

6
webrtc/video_engine/test/auto_test/primitives/input_helpers_unittest.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "video_engine/test/auto_test/primitives/fake_stdin.h" #include "webrtc/video_engine/test/auto_test/primitives/fake_stdin.h"
#include "video_engine/test/auto_test/primitives/input_helpers.h" #include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h"
namespace webrtc { namespace webrtc {

16
webrtc/video_engine/test/auto_test/source/vie_autotest.cc
View File

@ -12,18 +12,18 @@
// vie_autotest.cc // vie_autotest.cc
// //
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include <stdio.h> #include <stdio.h>
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/include/video_render.h" #include "webrtc/modules/video_render/include/video_render.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/primitives/general_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
#include "video_engine/test/libvietest/include/tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "video_engine/test/libvietest/include/tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
DEFINE_bool(include_timing_dependent_tests, true, DEFINE_bool(include_timing_dependent_tests, true,
"If true, we will include tests / parts of tests that are known " "If true, we will include tests / parts of tests that are known "

6
webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "../interface/vie_autotest_android.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_android.h"
#include <android/log.h> #include <android/log.h>
#include <stdio.h> #include <stdio.h>
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection, int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection,
void* window1, void* window2, void* window1, void* window2,

30
webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
View File

@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "common_types.h" // NOLINT #include "testing/gflags/include/gflags/gflags.h"
#include "engine_configurations.h" // NOLINT #include "webrtc/common_types.h"
#include "gflags/gflags.h" #include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "video_engine/test/libvietest/include/tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#include "voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_base.h"
DEFINE_bool(capture_test_ensure_resolution_alignment_in_capture_device, true, DEFINE_bool(capture_test_ensure_resolution_alignment_in_capture_device, true,
"If true, we will give resolutions slightly below a reasonable " "If true, we will give resolutions slightly below a reasonable "

17
webrtc/video_engine/test/auto_test/source/vie_autotest_cocoa_mac.mm
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#import "cocoa_render_view.h" #import "webrtc/modules/video_render/mac/cocoa_render_view.h"
#import "testsupport/mac/run_threaded_main_mac.h" #import "webrtc/test/testsupport/mac/run_threaded_main_mac.h"
#include "video_engine/test/auto_test/interface/vie_autotest_main.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "vie_autotest_mac_cocoa.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
#include "vie_autotest_main.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
@implementation TestCocoaUi @implementation TestCocoaUi
@ -138,4 +138,3 @@ int ImplementThisToRunYourTest(int argc, char** argv) {
ViEAutoTestMain auto_test; ViEAutoTestMain auto_test;
return auto_test.RunTests(argc, argv); return auto_test.RunTests(argc, argv);
} }

12
webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc
View File

@ -13,12 +13,6 @@
#include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h" #include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "webrtc/video_engine/test/libvietest/include/tb_I420_codec.h"
#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
@ -26,6 +20,12 @@
#include "webrtc/video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "webrtc/video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "webrtc/video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "webrtc/video_engine/test/libvietest/include/tb_I420_codec.h"
#include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_base.h"
class TestCodecObserver class TestCodecObserver

2
webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
View File

@ -14,7 +14,7 @@
#include <algorithm> #include <algorithm>
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"

14
webrtc/video_engine/test/auto_test/source/vie_autotest_encryption.cc
View File

@ -12,14 +12,14 @@
// vie_autotest_encryption.cc // vie_autotest_encryption.cc
// //
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
class ViEAutotestEncryption: public webrtc::Encryption class ViEAutotestEncryption: public webrtc::Encryption
{ {

14
webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
#include "tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "voe_codec.h" #include "webrtc/voice_engine/include/voe_codec.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"

12
webrtc/video_engine/test/auto_test/source/vie_autotest_image_process.cc
View File

@ -13,13 +13,13 @@
// //
// Settings // Settings
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
class MyEffectFilter: public webrtc::ViEEffectFilter class MyEffectFilter: public webrtc::ViEEffectFilter
{ {

12
webrtc/video_engine/test/auto_test/source/vie_autotest_linux.cc
View File

@ -11,15 +11,15 @@
// //
// vie_autotest_linux.cc // vie_autotest_linux.cc
// //
#include "vie_autotest_linux.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h"
#include <string> #include <string>
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest_main.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "engine_configurations.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "critical_section_wrapper.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "thread_wrapper.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
ViEAutoTestWindowManager::ViEAutoTestWindowManager() ViEAutoTestWindowManager::ViEAutoTestWindowManager()
: _hdsp1(NULL), : _hdsp1(NULL),

4
webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
View File

@ -23,6 +23,8 @@
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
@ -34,8 +36,6 @@
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "webrtc/voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
#define VCM_RED_PAYLOAD_TYPE 96 #define VCM_RED_PAYLOAD_TYPE 96
#define VCM_ULPFEC_PAYLOAD_TYPE 97 #define VCM_ULPFEC_PAYLOAD_TYPE 97

15
webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vie_autotest_main.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
#include "gflags/gflags.h" #include "testing/gflags/include/gflags/gflags.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/test/testsupport/fileutils.h"
#include "video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/auto_test/interface/vie_window_creator.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
#include "test/testsupport/fileutils.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_creator.h"
DEFINE_bool(automated, false, "Run Video engine tests in noninteractive mode."); DEFINE_bool(automated, false, "Run Video engine tests in noninteractive mode.");
DEFINE_bool(auto_custom_call, false, "Run custom call directly."); DEFINE_bool(auto_custom_call, false, "Run custom call directly.");
@ -196,4 +196,3 @@ int ViEAutoTestMain::RunInteractiveMode() {
return 0; return 0;
} }
} }

14
webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc
View File

@ -12,14 +12,14 @@
// vie_autotest_network.cc // vie_autotest_network.cc
// //
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#if defined(_WIN32) #if defined(_WIN32)
#include <qos.h> #include <qos.h>

10
webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
View File

@ -14,16 +14,12 @@
// This code is also used as sample code for ViE 3.0 // This code is also used as sample code for ViE 3.0
// //
#include <stdio.h>
#include <fstream> #include <fstream>
#include <stdio.h>
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "webrtc/video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "webrtc/video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
@ -31,6 +27,10 @@
#include "webrtc/video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "webrtc/video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "webrtc/video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/include/voe_network.h" #include "webrtc/voice_engine/include/voe_network.h"
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h"

18
webrtc/video_engine/test/auto_test/source/vie_autotest_render.cc
View File

@ -12,21 +12,21 @@
// vie_autotest_render.cc // vie_autotest_render.cc
// //
#include "vie_autotest_defines.h" #include "webrtc/engine_configurations.h"
#include "vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "engine_configurations.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_render.h" #include "webrtc/modules/video_render/include/video_render.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#if defined(WIN32) #if defined(WIN32)
#include <windows.h>
#include <ddraw.h> #include <ddraw.h>
#include <tchar.h> #include <tchar.h>
#include <windows.h>
#elif defined(WEBRTC_LINUX) #elif defined(WEBRTC_LINUX)
//From windgi.h //From windgi.h
#undef RGB #undef RGB

16
webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
View File

@ -10,14 +10,14 @@
#include <iostream> #include <iostream>
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "video_engine/test/libvietest/include/tb_capture_device.h" #include "webrtc/test/testsupport/fileutils.h"
#include "video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/libvietest/include/tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "test/testsupport/fileutils.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
class ViERtpObserver: public webrtc::ViERTPObserver class ViERtpObserver: public webrtc::ViERTPObserver
{ {

22
webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
View File

@ -10,17 +10,17 @@
#include <iostream> // NOLINT #include <iostream> // NOLINT
#include "common_types.h" // NOLINT #include "webrtc/common_types.h"
#include "video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#include "video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_render.h"
#include "video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/test/auto_test/interface/vie_autotest.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "voice_engine/include/voe_base.h" #include "webrtc/voice_engine/include/voe_base.h"
enum RelayMode { enum RelayMode {
kRelayOneStream = 1, kRelayOneStream = 1,

12
webrtc/video_engine/test/auto_test/source/vie_autotest_win.cc
View File

@ -12,14 +12,14 @@
// vie_autotest_windows.cc // vie_autotest_windows.cc
// //
#include "vie_autotest_windows.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h"
#include "vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "vie_autotest_main.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include <windows.h> #include <windows.h>

20
webrtc/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
View File

@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/auto_test/interface/vie_file_based_comparison_tests.h" #include "webrtc/video_engine/test/auto_test/interface/vie_file_based_comparison_tests.h"
#include "video_engine/test/auto_test/interface/vie_autotest_defines.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
#include "video_engine/test/auto_test/primitives/base_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/base_primitives.h"
#include "video_engine/test/auto_test/primitives/framedrop_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
#include "video_engine/test/auto_test/primitives/general_primitives.h" #include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
#include "video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "video_engine/test/libvietest/include/vie_external_render_filter.h" #include "webrtc/video_engine/test/libvietest/include/vie_external_render_filter.h"
#include "video_engine/test/libvietest/include/vie_fake_camera.h" #include "webrtc/video_engine/test/libvietest/include/vie_fake_camera.h"
#include "video_engine/test/libvietest/include/vie_to_file_renderer.h" #include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
bool ViEFileBasedComparisonTests::TestCallSetup( bool ViEFileBasedComparisonTests::TestCallSetup(
const std::string& i420_video_file, const std::string& i420_video_file,

12
webrtc/video_engine/test/auto_test/source/vie_window_creator.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/auto_test/interface/vie_window_creator.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_creator.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/test/auto_test/interface/vie_autotest_main.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
#include "video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
#include "video_engine/test/auto_test/interface/vie_window_manager_factory.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_manager_factory.h"
#include "voice_engine/include/voe_codec.h" #include "webrtc/voice_engine/include/voe_codec.h"
#if defined(WIN32) #if defined(WIN32)
#include <tchar.h> #include <tchar.h>

4
webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vie_window_manager_factory.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_manager_factory.h"
#include "vie_autotest_linux.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h"
ViEAutoTestWindowManagerInterface* ViEAutoTestWindowManagerInterface*
ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() { ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() {

8
webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm
View File

@ -8,13 +8,11 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vie_window_manager_factory.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_manager_factory.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
#include "vie_autotest_mac_cocoa.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h"
#elif defined(CARBON_RENDERING)
#include "vie_autotest_mac_carbon.h"
#endif #endif
ViEAutoTestWindowManagerInterface* ViEAutoTestWindowManagerInterface*

4
webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc
View File

@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vie_window_manager_factory.h" #include "webrtc/video_engine/test/auto_test/interface/vie_window_manager_factory.h"
#include "vie_autotest_windows.h" #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h"
ViEAutoTestWindowManagerInterface* ViEAutoTestWindowManagerInterface*
ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() { ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() {

9
webrtc/video_engine/test/auto_test/vie_auto_test.gypi
View File

@ -25,15 +25,6 @@
'video_engine_core', 'video_engine_core',
'libvietest', 'libvietest',
], ],
'include_dirs': [
'interface/',
'helpers/',
'primitives',
'../../include',
'../..',
'../../../modules/video_coding/codecs/interface',
'../../../common_video/interface',
],
'sources': [ 'sources': [
'interface/vie_autotest.h', 'interface/vie_autotest.h',
'interface/vie_autotest_defines.h', 'interface/vie_autotest_defines.h',

2
webrtc/video_engine/test/common/generate_ssrcs.h
View File

@ -14,8 +14,8 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include "webrtc/video_engine/new_include/video_send_stream.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
#include "webrtc/video_engine/new_include/video_send_stream.h"
namespace webrtc { namespace webrtc {
namespace test { namespace test {

2
webrtc/video_engine/test/common/linux/glx_renderer.cc
View File

@ -10,8 +10,8 @@
#include "webrtc/video_engine/test/common/linux/glx_renderer.h" #include "webrtc/video_engine/test/common/linux/glx_renderer.h"
#include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <cassert> #include <cassert>

2
webrtc/video_engine/test/common/linux/glx_renderer.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_LINUX_GLX_RENDERER_H_ #ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_LINUX_GLX_RENDERER_H_
#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_LINUX_GLX_RENDERER_H_ #define WEBRTC_VIDEO_ENGINE_TEST_COMMON_LINUX_GLX_RENDERER_H_
#include <X11/Xlib.h>
#include <GL/glx.h> #include <GL/glx.h>
#include <X11/Xlib.h>
#include "webrtc/video_engine/test/common/gl/gl_renderer.h" #include "webrtc/video_engine/test/common/gl/gl_renderer.h"

2
webrtc/video_engine/test/common/linux/xv_renderer.cc
View File

@ -10,9 +10,9 @@
#include "webrtc/video_engine/test/common/linux/xv_renderer.h" #include "webrtc/video_engine/test/common/linux/xv_renderer.h"
#include <sys/shm.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/extensions/Xvlib.h> #include <X11/extensions/Xvlib.h>
#include <sys/shm.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"

2
webrtc/video_engine/test/common/video_capturer.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "webrtc/video_engine/test/common/video_capturer.h"
#include "webrtc/video_engine/test/common/vcm_capturer.h" #include "webrtc/video_engine/test/common/vcm_capturer.h"
#include "webrtc/video_engine/test/common/video_capturer.h"
namespace webrtc { namespace webrtc {
namespace test { namespace test {

8
webrtc/video_engine/test/libvietest/helpers/vie_fake_camera.cc
View File

@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/vie_fake_camera.h" #include "webrtc/video_engine/test/libvietest/include/vie_fake_camera.h"
#include <assert.h> #include <assert.h>
#include "system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/test/libvietest/include/vie_file_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h"
// This callback runs the camera thread: // This callback runs the camera thread:
bool StreamVideoFileRepeatedlyIntoCaptureDevice(void* data) { bool StreamVideoFileRepeatedlyIntoCaptureDevice(void* data) {

14
webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
View File

@ -7,16 +7,16 @@
* in the file PATENTS. All contributing project authors may * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/vie_file_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h"
#include <assert.h> #include <assert.h>
#include "common_types.h" #include "webrtc/common_types.h"
#include "modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
// This class ensures we are not exceeding the max FPS. // This class ensures we are not exceeding the max FPS.
class FramePacemaker { class FramePacemaker {

2
webrtc/video_engine/test/libvietest/include/tb_I420_codec.h
View File

@ -16,7 +16,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_I420_CODEC_H_ #ifndef WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_I420_CODEC_H_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_I420_CODEC_H_ #define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_TB_I420_CODEC_H_
#include "modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
class TbI420Encoder: public webrtc::VideoEncoder class TbI420Encoder: public webrtc::VideoEncoder
{ {

2
webrtc/video_engine/test/libvietest/include/tb_external_transport.h
View File

@ -18,7 +18,7 @@
#include <list> #include <list>
#include <map> #include <map>
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc namespace webrtc
{ {

22
webrtc/video_engine/test/libvietest/include/tb_interfaces.h
View File

@ -13,17 +13,17 @@
#include <string> #include <string>
#include "constructor_magic.h" #include "webrtc/common_types.h"
#include "common_types.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_image_process.h" #include "webrtc/video_engine/include/vie_encryption.h"
#include "video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_image_process.h"
#include "video_engine/include/vie_render.h" #include "webrtc/video_engine/include/vie_network.h"
#include "video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_render.h"
#include "video_engine/include/vie_encryption.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
// This class deals with all the tedium of setting up video engine interfaces. // This class deals with all the tedium of setting up video engine interfaces.
// It does its work in constructor and destructor, so keeping it in scope is // It does its work in constructor and destructor, so keeping it in scope is

2
webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
View File

@ -15,7 +15,7 @@
#include <string> #include <string>
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class CriticalSectionWrapper; class CriticalSectionWrapper;

2
webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
View File

@ -16,9 +16,9 @@
#include <list> #include <list>
#include <string> #include <string>
#include "webrtc/video_engine/include/vie_render.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h" #include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/video_engine/include/vie_render.h"
namespace webrtc { namespace webrtc {
class CriticalSectionWrapper; class CriticalSectionWrapper;

12
webrtc/video_engine/test/libvietest/libvietest.gypi
View File

@ -16,15 +16,6 @@
'<(webrtc_root)/test/test.gyp:test_support', '<(webrtc_root)/test/test.gyp:test_support',
'video_engine_core', 'video_engine_core',
], ],
'direct_dependent_settings': {
'include_dirs': [
'include/',
]
},
'include_dirs': [
'include/',
'helpers/',
],
'sources': [ 'sources': [
# Helper classes # Helper classes
'include/vie_external_render_filter.h', 'include/vie_external_render_filter.h',
@ -69,9 +60,6 @@
'<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main', '<(webrtc_root)/test/test.gyp:test_support_main',
], ],
'include_dirs': [
'include/',
],
'sources': [ 'sources': [
'testbed/fake_network_pipe_unittest.cc', 'testbed/fake_network_pipe_unittest.cc',
], ],

4
webrtc/video_engine/test/libvietest/testbed/fake_network_pipe_unittest.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <gmock/gmock.h> #include "testing/gmock/include/gmock/gmock.h"
#include <gtest/gtest.h> #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"

4
webrtc/video_engine/test/libvietest/testbed/tb_I420_codec.cc
View File

@ -10,9 +10,9 @@
#include "webrtc/video_engine/test/libvietest/include/tb_I420_codec.h" #include "webrtc/video_engine/test/libvietest/include/tb_I420_codec.h"
#include <string.h>
#include <stdio.h>
#include <assert.h> #include <assert.h>
#include <stdio.h>
#include <string.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"

6
webrtc/video_engine/test/libvietest/testbed/tb_capture_device.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/tb_capture_device.h" #include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
TbCaptureDevice::TbCaptureDevice(TbInterfaces& Engine) : TbCaptureDevice::TbCaptureDevice(TbInterfaces& Engine) :
captureId(-1), captureId(-1),

14
webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/tb_external_transport.h" #include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
#include <cassert>
#include <math.h> #include <math.h>
#include <stdio.h> // printf #include <stdio.h> // printf
#include <stdlib.h> // rand #include <stdlib.h> // rand
#include <cassert>
#if defined(WEBRTC_LINUX) || defined(__linux__) #if defined(WEBRTC_LINUX) || defined(__linux__)
#include <string.h> #include <string.h>
@ -22,11 +22,11 @@
#include <cstring> #include <cstring>
#endif #endif
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "video_engine/include/vie_network.h" #include "webrtc/video_engine/include/vie_network.h"
#if defined(_WIN32) #if defined(_WIN32)
#pragma warning(disable: 4355) // 'this' : used in base member initializer list #pragma warning(disable: 4355) // 'this' : used in base member initializer list

6
webrtc/video_engine/test/libvietest/testbed/tb_interfaces.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/tb_interfaces.h" #include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "testsupport/fileutils.h" #include "webrtc/test/testsupport/fileutils.h"
TbInterfaces::TbInterfaces(const std::string& test_name) : TbInterfaces::TbInterfaces(const std::string& test_name) :
video_engine(NULL), video_engine(NULL),

4
webrtc/video_engine/test/libvietest/testbed/tb_video_channel.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/test/libvietest/include/tb_video_channel.h" #include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"
TbVideoChannel::TbVideoChannel(TbInterfaces& Engine, TbVideoChannel::TbVideoChannel(TbInterfaces& Engine,

4
webrtc/video_engine/test/loopback.cc
View File

@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include <gtest/gtest.h> #include "testing/gtest/include/gtest/gtest.h"
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "webrtc/typedefs.h"
#include "webrtc/video_engine/new_include/video_engine.h" #include "webrtc/video_engine/new_include/video_engine.h"
#include "webrtc/video_engine/test/common/direct_transport.h" #include "webrtc/video_engine/test/common/direct_transport.h"
#include "webrtc/video_engine/test/common/generate_ssrcs.h" #include "webrtc/video_engine/test/common/generate_ssrcs.h"
#include "webrtc/video_engine/test/common/video_capturer.h" #include "webrtc/video_engine/test/common/video_capturer.h"
#include "webrtc/video_engine/test/common/video_renderer.h" #include "webrtc/video_engine/test/common/video_renderer.h"
#include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

10
webrtc/video_engine/video_engine_core.gypi
View File

@ -34,16 +34,6 @@
# system_wrappers # system_wrappers
'<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
], ],
'include_dirs': [
'include',
'../common_video/interface',
'../modules/video_render/',
],
'direct_dependent_settings': {
'include_dirs': [
'include',
],
},
'sources': [ 'sources': [
# interface # interface
'include/vie_base.h', 'include/vie_base.h',

30
webrtc/video_engine/vie_base_impl.cc
View File

@ -8,26 +8,26 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/vie_base_impl.h" #include "webrtc/video_engine/vie_base_impl.h"
#include <sstream> #include <sstream>
#include <string> #include <string>
#include "engine_configurations.h" // NOLINT #include "webrtc/engine_configurations.h"
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render.h" #include "webrtc/modules/video_render/include/video_render.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "video_engine/vie_channel.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "video_engine/vie_channel_manager.h" #include "webrtc/video_engine/include/vie_errors.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_channel.h"
#include "video_engine/vie_encoder.h" #include "webrtc/video_engine/vie_channel_manager.h"
#include "video_engine/include/vie_errors.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_impl.h" #include "webrtc/video_engine/vie_encoder.h"
#include "video_engine/vie_input_manager.h" #include "webrtc/video_engine/vie_impl.h"
#include "video_engine/vie_shared_data.h" #include "webrtc/video_engine/vie_input_manager.h"
#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc { namespace webrtc {

8
webrtc/video_engine/vie_base_impl.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_ #ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_ #define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
#include "video_engine/include/vie_base.h" #include "webrtc/video_engine/include/vie_base.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_ref_count.h" #include "webrtc/video_engine/vie_ref_count.h"
#include "video_engine/vie_shared_data.h" #include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc { namespace webrtc {

22
webrtc/video_engine/vie_capture_impl.cc
View File

@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/vie_capture_impl.h" #include "webrtc/video_engine/vie_capture_impl.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "video_engine/include/vie_errors.h" #include "webrtc/video_engine/include/vie_errors.h"
#include "video_engine/vie_capturer.h" #include "webrtc/video_engine/vie_capturer.h"
#include "video_engine/vie_channel.h" #include "webrtc/video_engine/vie_channel.h"
#include "video_engine/vie_channel_manager.h" #include "webrtc/video_engine/vie_channel_manager.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_encoder.h" #include "webrtc/video_engine/vie_encoder.h"
#include "video_engine/vie_impl.h" #include "webrtc/video_engine/vie_impl.h"
#include "video_engine/vie_input_manager.h" #include "webrtc/video_engine/vie_input_manager.h"
#include "video_engine/vie_shared_data.h" #include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc { namespace webrtc {

8
webrtc/video_engine/vie_capture_impl.h
View File

@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_ #ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_ #define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
#include "typedefs.h" // NOLINT #include "webrtc/typedefs.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_ref_count.h" #include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc { namespace webrtc {

26
webrtc/video_engine/vie_capturer.cc
View File

@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/vie_capturer.h" #include "webrtc/video_engine/vie_capturer.h"
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "modules/utility/interface/process_thread.h" #include "webrtc/modules/utility/interface/process_thread.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h" #include "webrtc/modules/video_capture/include/video_capture_factory.h"
#include "modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/modules/video_render/include/video_render_defines.h"
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/event_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "system_wrappers/interface/trace_event.h" #include "webrtc/system_wrappers/interface/trace_event.h"
#include "video_engine/include/vie_image_process.h" #include "webrtc/video_engine/include/vie_image_process.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_encoder.h" #include "webrtc/video_engine/vie_encoder.h"
namespace webrtc { namespace webrtc {

20
webrtc/video_engine/vie_capturer.h
View File

@ -13,17 +13,17 @@
#include <vector> #include <vector>
#include "common_types.h" // NOLINT #include "webrtc/common_types.h"
#include "engine_configurations.h" // NOLINT #include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_capture/include/video_capture.h" #include "webrtc/modules/video_capture/include/video_capture.h"
#include "modules/video_coding/codecs/interface/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
#include "modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "typedefs.h" // NOLINT #include "webrtc/typedefs.h"
#include "video_engine/include/vie_capture.h" #include "webrtc/video_engine/include/vie_capture.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
#include "video_engine/vie_frame_provider_base.h" #include "webrtc/video_engine/vie_frame_provider_base.h"
namespace webrtc { namespace webrtc {

32
webrtc/video_engine/vie_channel.cc
View File

@ -8,27 +8,27 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_engine/vie_channel.h" #include "webrtc/video_engine/vie_channel.h"
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "modules/pacing/include/paced_sender.h" #include "webrtc/modules/pacing/include/paced_sender.h"
#include "modules/rtp_rtcp/interface/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
#include "modules/utility/interface/process_thread.h" #include "webrtc/modules/utility/interface/process_thread.h"
#include "modules/video_coding/main/interface/video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "modules/video_processing/main/interface/video_processing.h" #include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render_defines.h" #include "webrtc/modules/video_render/include/video_render_defines.h"
#include "system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "video_engine/call_stats.h" #include "webrtc/video_engine/call_stats.h"
#include "video_engine/include/vie_codec.h" #include "webrtc/video_engine/include/vie_codec.h"
#include "video_engine/include/vie_errors.h" #include "webrtc/video_engine/include/vie_errors.h"
#include "video_engine/include/vie_image_process.h" #include "webrtc/video_engine/include/vie_image_process.h"
#include "video_engine/include/vie_rtp_rtcp.h" #include "webrtc/video_engine/include/vie_rtp_rtcp.h"
#include "video_engine/vie_defines.h" #include "webrtc/video_engine/vie_defines.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_engine/vie_channel_group.h
View File

@ -13,7 +13,7 @@
#include <set> #include <set>
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc { namespace webrtc {

Some files were not shown because too many files have changed in this diff Show More