Include files from webrtc/.. paths in video_engine/
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
diff --git a/webrtc/video_engine/call_stats_unittest.cc b/webrtc/video_engine/call_stats_unittest.cc
index 4c14699..e5b2361 100644
--- a/webrtc/video_engine/call_stats_unittest.cc
+++ b/webrtc/video_engine/call_stats_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
diff --git a/webrtc/video_engine/encoder_state_feedback.cc b/webrtc/video_engine/encoder_state_feedback.cc
index cfd0984..e5d6bd6 100644
--- a/webrtc/video_engine/encoder_state_feedback.cc
+++ b/webrtc/video_engine/encoder_state_feedback.cc
@@ -8,13 +8,13 @@
* 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 "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "video_engine/vie_encoder.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/video_engine/vie_encoder.h"
namespace webrtc {
diff --git a/webrtc/video_engine/encoder_state_feedback.h b/webrtc/video_engine/encoder_state_feedback.h
index 04d8205..4e0cdc3 100644
--- a/webrtc/video_engine/encoder_state_feedback.h
+++ b/webrtc/video_engine/encoder_state_feedback.h
@@ -16,9 +16,9 @@
#include <map>
-#include "system_wrappers/interface/constructor_magic.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video_engine/encoder_state_feedback_unittest.cc b/webrtc/video_engine/encoder_state_feedback_unittest.cc
index 4009d83..7f33165 100644
--- a/webrtc/video_engine/encoder_state_feedback_unittest.cc
+++ b/webrtc/video_engine/encoder_state_feedback_unittest.cc
@@ -12,8 +12,8 @@
// This file includes unit tests for EncoderStateFeedback.
#include "webrtc/video_engine/encoder_state_feedback.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/common.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
diff --git a/webrtc/video_engine/include/vie_base.h b/webrtc/video_engine/include/vie_base.h
index ea0ab74..c1f7e51 100644
--- a/webrtc/video_engine/include/vie_base.h
+++ b/webrtc/video_engine/include/vie_base.h
@@ -19,7 +19,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/include/vie_capture.h b/webrtc/video_engine/include/vie_capture.h
index 72a959f..2174d5d 100644
--- a/webrtc/video_engine/include/vie_capture.h
+++ b/webrtc/video_engine/include/vie_capture.h
@@ -18,7 +18,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/include/vie_codec.h b/webrtc/video_engine/include/vie_codec.h
index f24832d..a324270 100644
--- a/webrtc/video_engine/include/vie_codec.h
+++ b/webrtc/video_engine/include/vie_codec.h
@@ -17,7 +17,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/include/vie_encryption.h b/webrtc/video_engine/include/vie_encryption.h
index 8e7c955..6cf721f 100644
--- a/webrtc/video_engine/include/vie_encryption.h
+++ b/webrtc/video_engine/include/vie_encryption.h
@@ -14,7 +14,7 @@
#ifndef 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 {
class VideoEngine;
diff --git a/webrtc/video_engine/include/vie_external_codec.h b/webrtc/video_engine/include/vie_external_codec.h
index 75b0727..536995e 100644
--- a/webrtc/video_engine/include/vie_external_codec.h
+++ b/webrtc/video_engine/include/vie_external_codec.h
@@ -11,7 +11,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/include/vie_file.h b/webrtc/video_engine/include/vie_file.h
index 4f78f52..db8f1b1 100644
--- a/webrtc/video_engine/include/vie_file.h
+++ b/webrtc/video_engine/include/vie_file.h
@@ -16,7 +16,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/include/vie_image_process.h b/webrtc/video_engine/include/vie_image_process.h
index e993b97..cb66bb1 100644
--- a/webrtc/video_engine/include/vie_image_process.h
+++ b/webrtc/video_engine/include/vie_image_process.h
@@ -17,8 +17,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_
#define WEBRTC_VIDEO_ENGINE_INCLUDE_VIE_IMAGE_PROCESS_H_
-#include "common_types.h"
-#include "common_video/interface/i420_video_frame.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
namespace webrtc {
diff --git a/webrtc/video_engine/include/vie_render.h b/webrtc/video_engine/include/vie_render.h
index 5eecc72..24e5926 100644
--- a/webrtc/video_engine/include/vie_render.h
+++ b/webrtc/video_engine/include/vie_render.h
@@ -16,7 +16,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/internal/video_call.cc b/webrtc/video_engine/internal/video_call.cc
index f5e44f6..3e4d7d7 100644
--- a/webrtc/video_engine/internal/video_call.cc
+++ b/webrtc/video_engine/internal/video_call.cc
@@ -20,10 +20,10 @@
#include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/video_engine/include/vie_codec.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_send_stream.h"
+#include "webrtc/video_engine/new_include/common.h"
+#include "webrtc/video_engine/new_include/video_engine.h"
namespace webrtc {
namespace internal {
diff --git a/webrtc/video_engine/internal/video_call.h b/webrtc/video_engine/internal/video_call.h
index fb7d266..d8f3ec7 100644
--- a/webrtc/video_engine/internal/video_call.h
+++ b/webrtc/video_engine/internal/video_call.h
@@ -15,10 +15,10 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_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_send_stream.h"
+#include "webrtc/video_engine/new_include/common.h"
+#include "webrtc/video_engine/new_include/video_engine.h"
namespace webrtc {
diff --git a/webrtc/video_engine/internal/video_send_stream.h b/webrtc/video_engine/internal/video_send_stream.h
index b178033..ef398b6 100644
--- a/webrtc/video_engine/internal/video_send_stream.h
+++ b/webrtc/video_engine/internal/video_send_stream.h
@@ -14,8 +14,8 @@
#include <vector>
#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_send_stream.h"
namespace webrtc {
diff --git a/webrtc/video_engine/stream_synchronization.cc b/webrtc/video_engine/stream_synchronization.cc
index 00154f8..6ad579c 100644
--- a/webrtc/video_engine/stream_synchronization.cc
+++ b/webrtc/video_engine/stream_synchronization.cc
@@ -8,13 +8,13 @@
* 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 <assert.h>
#include <cmath>
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/webrtc/video_engine/stream_synchronization.h b/webrtc/video_engine/stream_synchronization.h
index f057b76..078b938 100644
--- a/webrtc/video_engine/stream_synchronization.h
+++ b/webrtc/video_engine/stream_synchronization.h
@@ -13,8 +13,8 @@
#include <list>
-#include "modules/remote_bitrate_estimator/include/rtp_to_ntp.h"
-#include "typedefs.h" // NOLINT
+#include "webrtc/modules/remote_bitrate_estimator/include/rtp_to_ntp.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video_engine/stream_synchronization_unittest.cc b/webrtc/video_engine/stream_synchronization_unittest.cc
index d1eb940..8876485 100644
--- a/webrtc/video_engine/stream_synchronization_unittest.cc
+++ b/webrtc/video_engine/stream_synchronization_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <math.h>
#include <algorithm>
+#include <math.h>
-#include "gtest/gtest.h"
-#include "video_engine/stream_synchronization.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/video_engine/stream_synchronization.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
index ac12015..47dfb82 100644
--- a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
+++ b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
@@ -13,7 +13,7 @@
#include <jni.h>
-#include "android_media_codec_decoder.h"
+#include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
index d8d560e..029425c 100644
--- a/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
+++ b/webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
@@ -11,7 +11,7 @@
#ifndef 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 {
diff --git a/webrtc/video_engine/test/android/jni/vie_android_java_api.cc b/webrtc/video_engine/test/android/jni/vie_android_java_api.cc
index e5dc33c..ca1d365 100644
--- a/webrtc/video_engine/test/android/jni/vie_android_java_api.cc
+++ b/webrtc/video_engine/test/android/jni/vie_android_java_api.cc
@@ -8,31 +8,31 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <android/log.h>
#include <stdio.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 "voe_codec.h"
-#include "voe_file.h"
-#include "voe_network.h"
-#include "voe_audio_processing.h"
-#include "voe_volume_control.h"
-#include "voe_hardware.h"
-#include "voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
-#include "vie_base.h"
-#include "vie_codec.h"
-#include "vie_capture.h"
-#include "vie_external_codec.h"
-#include "vie_network.h"
-#include "vie_render.h"
-#include "vie_rtp_rtcp.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_external_codec.h"
+#include "webrtc/video_engine/include/vie_network.h"
+#include "webrtc/video_engine/include/vie_render.h"
+#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
-#include "common_types.h"
-#include "android_media_codec_decoder.h"
+#include "webrtc/common_types.h"
+#include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
diff --git a/webrtc/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc b/webrtc/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc
index 2e55283..657db86 100644
--- a/webrtc/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc
+++ b/webrtc/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <stdio.h>
-#include <string.h>
#include <android/log.h>
#include <pthread.h>
+#include <stdio.h>
+#include <string.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*"
diff --git a/webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h b/webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h
index 175a42d..44ef257 100644
--- a/webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h
+++ b/webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h
@@ -11,7 +11,7 @@
#ifndef 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 ViEAutoTest;
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc
index 96b401b..a3dc0ef 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_api_integration_test.cc
@@ -8,7 +8,7 @@
* 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/video_engine/test/auto_test/automated/legacy_fixture.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
index d224bde..a1e9fa7 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_extended_integration_test.cc
@@ -8,7 +8,7 @@
* 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/video_engine/test/auto_test/automated/legacy_fixture.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
index bdf3e86..82b3e14 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_rtp_fuzz_test.cc
@@ -10,8 +10,8 @@
#include <ctime>
-#include "gflags/gflags.h"
-#include "gtest/gtest.h"
+#include "testing/gflags/include/gflags/gflags.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/test/libtest/include/bit_flip_encryption.h"
#include "webrtc/test/libtest/include/random_encryption.h"
#include "webrtc/video_engine/test/auto_test/automated/two_windows_fixture.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
index eec8fe3..9b4dfb7 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
@@ -15,8 +15,8 @@
#include <cstdio>
-#include "gflags/gflags.h"
-#include "gtest/gtest.h"
+#include "testing/gflags/include/gflags/gflags.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/video_engine/test/auto_test/automated/legacy_fixture.h"
diff --git a/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc
index 043c462..66628e9 100644
--- a/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc
+++ b/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc
@@ -12,10 +12,10 @@
#include <string>
#include <vector>
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.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/perf_test.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/primitives/framedrop_primitives.h"
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
index 1a21c9e..284a95d 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest.h
@@ -15,23 +15,23 @@
#ifndef 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 "gflags/gflags.h"
+#include "testing/gflags/include/gflags/gflags.h"
+#include "webrtc/common_types.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
-#include "video_engine/include/vie_base.h"
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/include/vie_file.h"
-#include "video_engine/include/vie_network.h"
-#include "video_engine/include/vie_render.h"
-#include "video_engine/include/vie_rtp_rtcp.h"
-#include "video_engine/include/vie_errors.h"
-#include "video_engine/vie_defines.h"
-#include "voice_engine/include/voe_audio_processing.h"
-#include "voice_engine/include/voe_base.h"
-#include "voice_engine/include/voe_codec.h"
-#include "voice_engine/include/voe_hardware.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/include/vie_file.h"
+#include "webrtc/video_engine/include/vie_network.h"
+#include "webrtc/video_engine/include/vie_render.h"
+#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
#ifndef WEBRTC_ANDROID
#include <string>
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
index 737864d..9b0cb16 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h
@@ -21,8 +21,8 @@
#include <stdio.h>
#include <string>
-#include "engine_configurations.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/engine_configurations.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#if defined(_WIN32)
@@ -30,10 +30,10 @@
#elif defined (WEBRTC_ANDROID)
#include <android/log.h>
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
#endif
// Choose how to log
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
index fb1d319..29c8ab4 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h
@@ -11,9 +11,9 @@
#ifndef 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/Xutil.h>
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
// Forward declaration
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h
index 62ce92a..ba1cb5c 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h
@@ -8,14 +8,14 @@
* 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)
#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_
-#include "vie_autotest_window_manager_interface.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
@class CocoaRenderView;
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h
index 6dd043e..3f53815 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h
@@ -12,7 +12,7 @@
* 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_
#define WEBRTC_VIDEO_ENGINE_MAIN_TEST_AUTOTEST_INTERFACE_VIE_AUTOTEST_WINDOW_MANAGER_INTERFACE_H_
diff --git a/webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h b/webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h
index 314a121..5a735e5 100644
--- a/webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h
+++ b/webrtc/video_engine/test/auto_test/interface/vie_autotest_windows.h
@@ -11,8 +11,8 @@
#ifndef 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 "engine_configurations.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
#include <windows.h>
#define TITLE_LENGTH 1024
diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
index d923e96..9836d0c 100644
--- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.cc
@@ -8,12 +8,12 @@
* 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 <cstdio>
#include <cstdlib>
-#include <algorithm>
#include <sstream>
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.h b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.h
index 1ef9ac0..777aae5 100644
--- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers.h
+++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers.h
@@ -14,7 +14,7 @@
#include <string>
#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 {
diff --git a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
index b130eac..b26e2f4 100644
--- a/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/choice_helpers_unittest.cc
@@ -10,9 +10,9 @@
#include <cstdio>
-#include "gtest/gtest.h"
-#include "video_engine/test/auto_test/primitives/choice_helpers.h"
-#include "video_engine/test/auto_test/primitives/fake_stdin.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/video_engine/test/auto_test/primitives/choice_helpers.h"
+#include "webrtc/video_engine/test/auto_test/primitives/fake_stdin.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.cc b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.cc
index 4952901..26705f2 100644
--- a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.cc
@@ -8,7 +8,7 @@
* 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 {
diff --git a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
index 5e0854f..1973736 100644
--- a/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
+++ b/webrtc/video_engine/test/auto_test/primitives/fake_stdin.h
@@ -13,7 +13,7 @@
#include <cstdio>
#include <string>
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
index 67e9041..b63daac 100644
--- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc
@@ -14,19 +14,19 @@
#include <string>
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "testsupport/fileutils.h"
-#include "testsupport/frame_reader.h"
-#include "testsupport/frame_writer.h"
-#include "testsupport/perf_test.h"
-#include "video_engine/test/auto_test/interface/vie_autotest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
-#include "video_engine/test/auto_test/primitives/framedrop_primitives.h"
-#include "video_engine/test/auto_test/primitives/general_primitives.h"
-#include "video_engine/test/libvietest/include/tb_interfaces.h"
-#include "video_engine/test/libvietest/include/tb_external_transport.h"
-#include "video_engine/test/libvietest/include/vie_external_render_filter.h"
-#include "video_engine/test/libvietest/include/vie_to_file_renderer.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/frame_reader.h"
+#include "webrtc/test/testsupport/frame_writer.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_defines.h"
+#include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
+#include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_external_render_filter.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
enum { kWaitTimeForFinalDecodeMs = 100 };
diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h
index faa8625..3a60520 100644
--- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h
+++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h
@@ -14,10 +14,10 @@
#include <map>
#include <vector>
-#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/libvietest/include/vie_to_file_renderer.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
class FrameDropDetector;
struct NetworkParameters;
diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
index 1cd6492..5edd4a3 100644
--- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives_unittest.cc
@@ -8,15 +8,15 @@
* 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 <vector>
-#include "gtest/gtest.h"
-#include "testsupport/fileutils.h"
-#include "testsupport/frame_reader.h"
-#include "testsupport/frame_writer.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/frame_reader.h"
+#include "webrtc/test/testsupport/frame_writer.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/general_primitives.cc b/webrtc/video_engine/test/auto_test/primitives/general_primitives.cc
index e7dc0b0..5b2c6b4 100644
--- a/webrtc/video_engine/test/auto_test/primitives/general_primitives.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/general_primitives.cc
@@ -8,12 +8,12 @@
* 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 "vie_autotest.h"
-#include "vie_autotest_defines.h"
-#include "vie_to_file_renderer.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/vie_to_file_renderer.h"
void FindCaptureDeviceOnSystem(webrtc::ViECapture* capture,
char* device_name,
diff --git a/webrtc/video_engine/test/auto_test/primitives/general_primitives.h b/webrtc/video_engine/test/auto_test/primitives/general_primitives.h
index 21773c4..0c3ebde 100644
--- a/webrtc/video_engine/test/auto_test/primitives/general_primitives.h
+++ b/webrtc/video_engine/test/auto_test/primitives/general_primitives.h
@@ -13,7 +13,7 @@
class ViEToFileRenderer;
-#include "common_types.h"
+#include "webrtc/common_types.h"
namespace webrtc {
class VideoCaptureModule;
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
index 4048e98..30bcdf0 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.cc
@@ -8,7 +8,7 @@
* 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 <cstdio>
@@ -16,7 +16,7 @@
#include <algorithm>
-#include "gflags/gflags.h"
+#include "testing/gflags/include/gflags/gflags.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
index 1e857d4..341efe9 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers.h
@@ -17,7 +17,7 @@
#include <string>
#include <vector>
-#include "gflags/gflags.h"
+#include "testing/gflags/include/gflags/gflags.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/primitives/input_helpers_unittest.cc b/webrtc/video_engine/test/auto_test/primitives/input_helpers_unittest.cc
index 4ed7a8c..111764a 100644
--- a/webrtc/video_engine/test/auto_test/primitives/input_helpers_unittest.cc
+++ b/webrtc/video_engine/test/auto_test/primitives/input_helpers_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "gtest/gtest.h"
-#include "video_engine/test/auto_test/primitives/fake_stdin.h"
-#include "video_engine/test/auto_test/primitives/input_helpers.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/video_engine/test/auto_test/primitives/fake_stdin.h"
+#include "webrtc/video_engine/test/auto_test/primitives/input_helpers.h"
namespace webrtc {
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest.cc
index 04fe7e7..d21b484 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest.cc
@@ -12,18 +12,18 @@
// 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 "engine_configurations.h"
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/include/video_render.h"
-#include "testsupport/fileutils.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
-#include "video_engine/test/auto_test/primitives/general_primitives.h"
-#include "video_engine/test/libvietest/include/tb_capture_device.h"
-#include "video_engine/test/libvietest/include/tb_interfaces.h"
-#include "video_engine/test/libvietest/include/tb_video_channel.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/primitives/general_primitives.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"
DEFINE_bool(include_timing_dependent_tests, true,
"If true, we will include tests / parts of tests that are known "
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
index 80d8d90..d070cd1 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
@@ -8,13 +8,13 @@
* 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 <stdio.h>
-#include "vie_autotest.h"
-#include "vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection,
void* window1, void* window2,
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
index 79b2b66..91947f2 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_capture.cc
@@ -8,22 +8,22 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "common_types.h" // NOLINT
-#include "engine_configurations.h" // NOLINT
-#include "gflags/gflags.h"
+#include "testing/gflags/include/gflags/gflags.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "video_engine/include/vie_base.h"
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/include/vie_network.h"
-#include "video_engine/include/vie_render.h"
-#include "video_engine/include/vie_rtp_rtcp.h"
-#include "video_engine/test/auto_test/interface/vie_autotest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
-#include "video_engine/test/libvietest/include/tb_interfaces.h"
-#include "video_engine/test/libvietest/include/tb_video_channel.h"
-#include "voice_engine/include/voe_base.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_network.h"
+#include "webrtc/video_engine/include/vie_render.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_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
+#include "webrtc/voice_engine/include/voe_base.h"
DEFINE_bool(capture_test_ensure_resolution_alignment_in_capture_device, true,
"If true, we will give resolutions slightly below a reasonable "
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_cocoa_mac.mm b/webrtc/video_engine/test/auto_test/source/vie_autotest_cocoa_mac.mm
index f30fe0e..15afe5c 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_cocoa_mac.mm
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_cocoa_mac.mm
@@ -8,15 +8,15 @@
* 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 "testsupport/mac/run_threaded_main_mac.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_main.h"
-#include "vie_autotest_mac_cocoa.h"
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "vie_autotest_main.h"
+#import "webrtc/modules/video_render/mac/cocoa_render_view.h"
+#import "webrtc/test/testsupport/mac/run_threaded_main_mac.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/auto_test/interface/vie_autotest_mac_cocoa.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
@implementation TestCocoaUi
@@ -138,4 +138,3 @@
ViEAutoTestMain auto_test;
return auto_test.RunTests(argc, argv);
}
-
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc
index 53c57f5..df950c6 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_codec.cc
@@ -13,12 +13,6 @@
#include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.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_capture.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_render.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"
class TestCodecObserver
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
index 368fa89..b72d390 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc
@@ -14,7 +14,7 @@
#include <algorithm>
-#include "gflags/gflags.h"
+#include "testing/gflags/include/gflags/gflags.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h"
#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_encryption.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_encryption.cc
index 56e56c6..6d8552b 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_encryption.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_encryption.cc
@@ -12,14 +12,14 @@
// vie_autotest_encryption.cc
//
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.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 "tb_capture_device.h"
-#include "tb_external_transport.h"
-#include "tb_interfaces.h"
-#include "tb_video_channel.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
class ViEAutotestEncryption: public webrtc::Encryption
{
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
index ab0f8f9..02744d7 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_file.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.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 "testsupport/fileutils.h"
-#include "tb_interfaces.h"
-#include "tb_capture_device.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/video_engine/test/libvietest/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/test/channel_transport/include/channel_transport.h"
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_image_process.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_image_process.cc
index bace520..8fa25fc 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_image_process.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_image_process.cc
@@ -13,13 +13,13 @@
//
// Settings
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.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 "tb_interfaces.h"
-#include "tb_video_channel.h"
-#include "tb_capture_device.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"
class MyEffectFilter: public webrtc::ViEEffectFilter
{
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_linux.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_linux.cc
index 8a99c03..fd9cf81 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_linux.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_linux.cc
@@ -11,15 +11,15 @@
//
// vie_autotest_linux.cc
//
-#include "vie_autotest_linux.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_linux.h"
#include <string>
-#include "vie_autotest_defines.h"
-#include "vie_autotest_main.h"
-#include "engine_configurations.h"
-#include "critical_section_wrapper.h"
-#include "thread_wrapper.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
ViEAutoTestWindowManager::ViEAutoTestWindowManager()
: _hdsp1(NULL),
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
index 6bfe3f9..1ebfc3b 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_loopback.cc
@@ -23,6 +23,8 @@
#include "webrtc/common_types.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_capture.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/libvietest/include/tb_external_transport.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_ULPFEC_PAYLOAD_TYPE 97
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
index 21b9726..a5bd959 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_main.cc
@@ -8,15 +8,15 @@
* 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 "gtest/gtest.h"
+#include "testing/gflags/include/gflags/gflags.h"
+#include "testing/gtest/include/gtest/gtest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
-#include "video_engine/test/auto_test/interface/vie_window_creator.h"
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.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(auto_custom_call, false, "Run custom call directly.");
@@ -196,4 +196,3 @@
return 0;
}
}
-
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc
index 550bd4f..d8edcf5 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_network.cc
@@ -12,14 +12,14 @@
// vie_autotest_network.cc
//
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.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 "tb_capture_device.h"
-#include "tb_external_transport.h"
-#include "tb_interfaces.h"
-#include "tb_video_channel.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_capture_device.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
#if defined(_WIN32)
#include <qos.h>
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
index 6e71e62..2fed138 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_record.cc
@@ -14,16 +14,12 @@
// This code is also used as sample code for ViE 3.0
//
-#include <stdio.h>
#include <fstream>
+#include <stdio.h>
#include "webrtc/common_types.h"
#include "webrtc/system_wrappers/interface/tick_util.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_capture.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_render.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_rtp_rtcp.h"
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_render.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_render.cc
index 619cf6e..c4b8155 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_render.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_render.cc
@@ -12,21 +12,21 @@
// vie_autotest_render.cc
//
-#include "vie_autotest_defines.h"
-#include "vie_autotest.h"
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.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 "video_render.h"
+#include "webrtc/modules/video_render/include/video_render.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "tb_interfaces.h"
-#include "tb_video_channel.h"
-#include "tb_capture_device.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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"
#if defined(WIN32)
-#include <windows.h>
#include <ddraw.h>
#include <tchar.h>
+#include <windows.h>
#elif defined(WEBRTC_LINUX)
//From windgi.h
#undef RGB
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
index c0832cd..d94681a 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
@@ -10,14 +10,14 @@
#include <iostream>
-#include "engine_configurations.h"
-#include "video_engine/test/libvietest/include/tb_capture_device.h"
-#include "video_engine/test/libvietest/include/tb_external_transport.h"
-#include "video_engine/test/libvietest/include/tb_interfaces.h"
-#include "video_engine/test/libvietest/include/tb_video_channel.h"
-#include "test/testsupport/fileutils.h"
-#include "video_engine/test/auto_test/interface/vie_autotest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/test/testsupport/fileutils.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_capture_device.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_video_channel.h"
class ViERtpObserver: public webrtc::ViERTPObserver
{
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
index 1363c35..84d31de 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_simulcast.cc
@@ -10,17 +10,17 @@
#include <iostream> // NOLINT
-#include "common_types.h" // NOLINT
-#include "video_engine/include/vie_base.h"
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/include/vie_network.h"
-#include "video_engine/include/vie_render.h"
-#include "video_engine/include/vie_rtp_rtcp.h"
-#include "video_engine/test/auto_test/interface/vie_autotest.h"
-#include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
-#include "video_engine/test/libvietest/include/tb_external_transport.h"
-#include "voice_engine/include/voe_base.h"
+#include "webrtc/common_types.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_network.h"
+#include "webrtc/video_engine/include/vie_render.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"
enum RelayMode {
kRelayOneStream = 1,
diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_win.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_win.cc
index b722d3b..8d5cb49 100755
--- a/webrtc/video_engine/test/auto_test/source/vie_autotest_win.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_win.cc
@@ -12,14 +12,14 @@
// 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 "vie_autotest_main.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
-#include "engine_configurations.h"
-#include "critical_section_wrapper.h"
-#include "thread_wrapper.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include <windows.h>
diff --git a/webrtc/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc b/webrtc/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
index a9fa57e..f6c1000 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_file_based_comparison_tests.cc
@@ -8,17 +8,17 @@
* 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 "video_engine/test/auto_test/primitives/base_primitives.h"
-#include "video_engine/test/auto_test/primitives/framedrop_primitives.h"
-#include "video_engine/test/auto_test/primitives/general_primitives.h"
-#include "video_engine/test/libvietest/include/tb_external_transport.h"
-#include "video_engine/test/libvietest/include/tb_interfaces.h"
-#include "video_engine/test/libvietest/include/vie_external_render_filter.h"
-#include "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/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/primitives/base_primitives.h"
+#include "webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.h"
+#include "webrtc/video_engine/test/auto_test/primitives/general_primitives.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_external_transport.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_external_render_filter.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_fake_camera.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h"
bool ViEFileBasedComparisonTests::TestCallSetup(
const std::string& i420_video_file,
diff --git a/webrtc/video_engine/test/auto_test/source/vie_window_creator.cc b/webrtc/video_engine/test/auto_test/source/vie_window_creator.cc
index 2205266..55bdb4a 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_window_creator.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_window_creator.cc
@@ -8,13 +8,13 @@
* 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 "video_engine/test/auto_test/interface/vie_autotest_main.h"
-#include "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 "voice_engine/include/voe_codec.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_main.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_window_manager_factory.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
#if defined(WIN32)
#include <tchar.h>
diff --git a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc
index 1b16878..88cc239 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc
@@ -8,9 +8,9 @@
* 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*
ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() {
diff --git a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm
index 806d10f..a60fc90 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm
+++ b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm
@@ -8,13 +8,11 @@
* 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)
-#include "vie_autotest_mac_cocoa.h"
-#elif defined(CARBON_RENDERING)
-#include "vie_autotest_mac_carbon.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h"
#endif
ViEAutoTestWindowManagerInterface*
diff --git a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc
index 11114fd..020ef90 100644
--- a/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc
+++ b/webrtc/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* 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*
ViEWindowManagerFactory::CreateWindowManagerForCurrentPlatform() {
diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi
index 8fe7d06..6a366b1 100644
--- a/webrtc/video_engine/test/auto_test/vie_auto_test.gypi
+++ b/webrtc/video_engine/test/auto_test/vie_auto_test.gypi
@@ -25,15 +25,6 @@
'video_engine_core',
'libvietest',
],
- 'include_dirs': [
- 'interface/',
- 'helpers/',
- 'primitives',
- '../../include',
- '../..',
- '../../../modules/video_coding/codecs/interface',
- '../../../common_video/interface',
- ],
'sources': [
'interface/vie_autotest.h',
'interface/vie_autotest_defines.h',
diff --git a/webrtc/video_engine/test/common/generate_ssrcs.h b/webrtc/video_engine/test/common/generate_ssrcs.h
index db6c660..c13d81f 100644
--- a/webrtc/video_engine/test/common/generate_ssrcs.h
+++ b/webrtc/video_engine/test/common/generate_ssrcs.h
@@ -14,8 +14,8 @@
#include <map>
#include <vector>
-#include "webrtc/video_engine/new_include/video_send_stream.h"
#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/new_include/video_send_stream.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/video_engine/test/common/linux/glx_renderer.cc b/webrtc/video_engine/test/common/linux/glx_renderer.cc
index 4f7c3d2..18f78d7 100644
--- a/webrtc/video_engine/test/common/linux/glx_renderer.cc
+++ b/webrtc/video_engine/test/common/linux/glx_renderer.cc
@@ -10,8 +10,8 @@
#include "webrtc/video_engine/test/common/linux/glx_renderer.h"
-#include <X11/Xlib.h>
#include <X11/Xatom.h>
+#include <X11/Xlib.h>
#include <cassert>
diff --git a/webrtc/video_engine/test/common/linux/glx_renderer.h b/webrtc/video_engine/test/common/linux/glx_renderer.h
index 30fc8df..27845ba 100644
--- a/webrtc/video_engine/test/common/linux/glx_renderer.h
+++ b/webrtc/video_engine/test/common/linux/glx_renderer.h
@@ -11,8 +11,8 @@
#ifndef 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 <X11/Xlib.h>
#include "webrtc/video_engine/test/common/gl/gl_renderer.h"
diff --git a/webrtc/video_engine/test/common/linux/xv_renderer.cc b/webrtc/video_engine/test/common/linux/xv_renderer.cc
index ba0b437..cb6b5ca 100644
--- a/webrtc/video_engine/test/common/linux/xv_renderer.cc
+++ b/webrtc/video_engine/test/common/linux/xv_renderer.cc
@@ -10,9 +10,9 @@
#include "webrtc/video_engine/test/common/linux/xv_renderer.h"
-#include <sys/shm.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xvlib.h>
+#include <sys/shm.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/webrtc/video_engine/test/common/video_capturer.cc b/webrtc/video_engine/test/common/video_capturer.cc
index c8e5477..bf6e40c 100644
--- a/webrtc/video_engine/test/common/video_capturer.cc
+++ b/webrtc/video_engine/test/common/video_capturer.cc
@@ -8,8 +8,8 @@
* 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/video_capturer.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_fake_camera.cc b/webrtc/video_engine/test/libvietest/helpers/vie_fake_camera.cc
index b9b7281..8699f04 100644
--- a/webrtc/video_engine/test/libvietest/helpers/vie_fake_camera.cc
+++ b/webrtc/video_engine/test/libvietest/helpers/vie_fake_camera.cc
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* 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 "system_wrappers/interface/thread_wrapper.h"
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/test/libvietest/include/vie_file_capture_device.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h"
// This callback runs the camera thread:
bool StreamVideoFileRepeatedlyIntoCaptureDevice(void* data) {
diff --git a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
index db39520..18d3026 100644
--- a/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
+++ b/webrtc/video_engine/test/libvietest/helpers/vie_file_capture_device.cc
@@ -7,16 +7,16 @@
* in the file PATENTS. All contributing project authors may
* 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 "common_types.h"
-#include "modules/interface/module_common_types.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "video_engine/include/vie_capture.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/video_engine/include/vie_capture.h"
// This class ensures we are not exceeding the max FPS.
class FramePacemaker {
diff --git a/webrtc/video_engine/test/libvietest/include/tb_I420_codec.h b/webrtc/video_engine/test/libvietest/include/tb_I420_codec.h
index ec3b467..50559b2 100644
--- a/webrtc/video_engine/test/libvietest/include/tb_I420_codec.h
+++ b/webrtc/video_engine/test/libvietest/include/tb_I420_codec.h
@@ -16,7 +16,7 @@
#ifndef 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
{
diff --git a/webrtc/video_engine/test/libvietest/include/tb_external_transport.h b/webrtc/video_engine/test/libvietest/include/tb_external_transport.h
index ec9e3b9..51cc584 100644
--- a/webrtc/video_engine/test/libvietest/include/tb_external_transport.h
+++ b/webrtc/video_engine/test/libvietest/include/tb_external_transport.h
@@ -18,7 +18,7 @@
#include <list>
#include <map>
-#include "common_types.h"
+#include "webrtc/common_types.h"
namespace webrtc
{
diff --git a/webrtc/video_engine/test/libvietest/include/tb_interfaces.h b/webrtc/video_engine/test/libvietest/include/tb_interfaces.h
index 5060abb..d1b7361 100644
--- a/webrtc/video_engine/test/libvietest/include/tb_interfaces.h
+++ b/webrtc/video_engine/test/libvietest/include/tb_interfaces.h
@@ -13,17 +13,17 @@
#include <string>
-#include "constructor_magic.h"
-#include "common_types.h"
-#include "video_engine/include/vie_base.h"
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/include/vie_image_process.h"
-#include "video_engine/include/vie_network.h"
-#include "video_engine/include/vie_render.h"
-#include "video_engine/include/vie_rtp_rtcp.h"
-#include "video_engine/include/vie_encryption.h"
-#include "video_engine/vie_defines.h"
+#include "webrtc/common_types.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_encryption.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/include/vie_network.h"
+#include "webrtc/video_engine/include/vie_render.h"
+#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
+#include "webrtc/video_engine/vie_defines.h"
// 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
diff --git a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
index c3bf2b1..86534ab 100644
--- a/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
+++ b/webrtc/video_engine/test/libvietest/include/vie_file_capture_device.h
@@ -15,7 +15,7 @@
#include <string>
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
class CriticalSectionWrapper;
diff --git a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
index 2c2f304..6b04d22 100644
--- a/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
+++ b/webrtc/video_engine/test/libvietest/include/vie_to_file_renderer.h
@@ -16,9 +16,9 @@
#include <list>
#include <string>
-#include "webrtc/video_engine/include/vie_render.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/video_engine/include/vie_render.h"
namespace webrtc {
class CriticalSectionWrapper;
diff --git a/webrtc/video_engine/test/libvietest/libvietest.gypi b/webrtc/video_engine/test/libvietest/libvietest.gypi
index ab14de6..a3ba22e 100644
--- a/webrtc/video_engine/test/libvietest/libvietest.gypi
+++ b/webrtc/video_engine/test/libvietest/libvietest.gypi
@@ -16,15 +16,6 @@
'<(webrtc_root)/test/test.gyp:test_support',
'video_engine_core',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- 'include/',
- ]
- },
- 'include_dirs': [
- 'include/',
- 'helpers/',
- ],
'sources': [
# Helper classes
'include/vie_external_render_filter.h',
@@ -69,9 +60,6 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(webrtc_root)/test/test.gyp:test_support_main',
],
- 'include_dirs': [
- 'include/',
- ],
'sources': [
'testbed/fake_network_pipe_unittest.cc',
],
diff --git a/webrtc/video_engine/test/libvietest/testbed/fake_network_pipe_unittest.cc b/webrtc/video_engine/test/libvietest/testbed/fake_network_pipe_unittest.cc
index a7e30bc..7747302 100644
--- a/webrtc/video_engine/test/libvietest/testbed/fake_network_pipe_unittest.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/fake_network_pipe_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_I420_codec.cc b/webrtc/video_engine/test/libvietest/testbed/tb_I420_codec.cc
index c0161f3..bf81ebb 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_I420_codec.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_I420_codec.cc
@@ -10,9 +10,9 @@
#include "webrtc/video_engine/test/libvietest/include/tb_I420_codec.h"
-#include <string.h>
-#include <stdio.h>
#include <assert.h>
+#include <stdio.h>
+#include <string.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_capture_device.cc b/webrtc/video_engine/test/libvietest/testbed/tb_capture_device.cc
index 61b3565..faa7090 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_capture_device.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_capture_device.cc
@@ -8,10 +8,10 @@
* 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 "video_engine/test/libvietest/include/tb_interfaces.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/video_engine/test/libvietest/include/tb_interfaces.h"
TbCaptureDevice::TbCaptureDevice(TbInterfaces& Engine) :
captureId(-1),
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
index 0132b61..7ea787d 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_external_transport.cc
@@ -8,12 +8,12 @@
* 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 <stdio.h> // printf
#include <stdlib.h> // rand
-#include <cassert>
#if defined(WEBRTC_LINUX) || defined(__linux__)
#include <string.h>
@@ -22,11 +22,11 @@
#include <cstring>
#endif
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "video_engine/include/vie_network.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/video_engine/include/vie_network.h"
#if defined(_WIN32)
#pragma warning(disable: 4355) // 'this' : used in base member initializer list
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_interfaces.cc b/webrtc/video_engine/test/libvietest/testbed/tb_interfaces.cc
index 16d8902..bd4cded 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_interfaces.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_interfaces.cc
@@ -8,10 +8,10 @@
* 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 "testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
TbInterfaces::TbInterfaces(const std::string& test_name) :
video_engine(NULL),
diff --git a/webrtc/video_engine/test/libvietest/testbed/tb_video_channel.cc b/webrtc/video_engine/test/libvietest/testbed/tb_video_channel.cc
index 675d3bd..9c5feb1 100644
--- a/webrtc/video_engine/test/libvietest/testbed/tb_video_channel.cc
+++ b/webrtc/video_engine/test/libvietest/testbed/tb_video_channel.cc
@@ -8,9 +8,9 @@
* 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"
TbVideoChannel::TbVideoChannel(TbInterfaces& Engine,
diff --git a/webrtc/video_engine/test/loopback.cc b/webrtc/video_engine/test/loopback.cc
index c8c3ae3..5e7f3ca 100644
--- a/webrtc/video_engine/test/loopback.cc
+++ b/webrtc/video_engine/test/loopback.cc
@@ -8,17 +8,17 @@
* 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 <map>
+#include "webrtc/typedefs.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/generate_ssrcs.h"
#include "webrtc/video_engine/test/common/video_capturer.h"
#include "webrtc/video_engine/test/common/video_renderer.h"
-#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video_engine/video_engine_core.gypi b/webrtc/video_engine/video_engine_core.gypi
index a8630ea..4bcfbfa 100644
--- a/webrtc/video_engine/video_engine_core.gypi
+++ b/webrtc/video_engine/video_engine_core.gypi
@@ -34,16 +34,6 @@
# 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': [
# interface
'include/vie_base.h',
diff --git a/webrtc/video_engine/vie_base_impl.cc b/webrtc/video_engine/vie_base_impl.cc
index 17c1055..5c8b898 100644
--- a/webrtc/video_engine/vie_base_impl.cc
+++ b/webrtc/video_engine/vie_base_impl.cc
@@ -8,26 +8,26 @@
* 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 <string>
-#include "engine_configurations.h" // NOLINT
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/vie_channel.h"
-#include "video_engine/vie_channel_manager.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/include/vie_errors.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_base_impl.h b/webrtc/video_engine/vie_base_impl.h
index 4c57699..13723a1 100644
--- a/webrtc/video_engine/vie_base_impl.h
+++ b/webrtc/video_engine/vie_base_impl.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_BASE_IMPL_H_
-#include "video_engine/include/vie_base.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_ref_count.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/video_engine/include/vie_base.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_ref_count.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_capture_impl.cc b/webrtc/video_engine/vie_capture_impl.cc
index caec99d..d6ee015 100644
--- a/webrtc/video_engine/vie_capture_impl.cc
+++ b/webrtc/video_engine/vie_capture_impl.cc
@@ -8,18 +8,18 @@
* 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 "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"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_capture_impl.h b/webrtc/video_engine/vie_capture_impl.h
index fd6589d..541f7a2 100644
--- a/webrtc/video_engine/vie_capture_impl.h
+++ b/webrtc/video_engine/vie_capture_impl.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_CAPTURE_IMPL_H_
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc
index e72d5d8..0cb57be 100644
--- a/webrtc/video_engine/vie_capturer.cc
+++ b/webrtc/video_engine/vie_capturer.cc
@@ -8,22 +8,22 @@
* 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 "modules/interface/module_common_types.h"
-#include "modules/utility/interface/process_thread.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "system_wrappers/interface/trace_event.h"
-#include "video_engine/include/vie_image_process.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace_event.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_capturer.h b/webrtc/video_engine/vie_capturer.h
index 01a6709..5137ea5 100644
--- a/webrtc/video_engine/vie_capturer.h
+++ b/webrtc/video_engine/vie_capturer.h
@@ -13,17 +13,17 @@
#include <vector>
-#include "common_types.h" // NOLINT
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_capture/include/video_capture.h"
-#include "modules/video_coding/codecs/interface/video_codec_interface.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_capture.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_frame_provider_base.h"
+#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index d4f1957..53124a6 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -8,27 +8,27 @@
* 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 <vector>
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/pacing/include/paced_sender.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/utility/interface/process_thread.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/call_stats.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 "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/call_stats.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
+#include "webrtc/video_engine/vie_defines.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h
index 7d4fc2b..fb68803 100644
--- a/webrtc/video_engine/vie_channel_group.h
+++ b/webrtc/video_engine/vie_channel_group.h
@@ -13,7 +13,7 @@
#include <set>
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_channel_manager.cc b/webrtc/video_engine/vie_channel_manager.cc
index 7f74afd..6afa4ad 100644
--- a/webrtc/video_engine/vie_channel_manager.cc
+++ b/webrtc/video_engine/vie_channel_manager.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
-#include "engine_configurations.h" // NOLINT
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/utility/interface/process_thread.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/map_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/call_stats.h"
-#include "video_engine/encoder_state_feedback.h"
-#include "video_engine/vie_channel.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_remb.h"
-#include "voice_engine/include/voe_video_sync.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/call_stats.h"
+#include "webrtc/video_engine/encoder_state_feedback.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_remb.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_codec_impl.cc b/webrtc/video_engine/vie_codec_impl.cc
index 77b4d89..e2f405d 100644
--- a/webrtc/video_engine/vie_codec_impl.cc
+++ b/webrtc/video_engine/vie_codec_impl.cc
@@ -8,23 +8,23 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_codec_impl.h"
+#include "webrtc/video_engine/vie_codec_impl.h"
#include <list>
-#include "engine_configurations.h" // NOLINT
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "system_wrappers/interface/logging.h"
-#include "system_wrappers/interface/trace.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"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_codec_impl.h b/webrtc/video_engine/vie_codec_impl.h
index 6062460..ba04c6a 100644
--- a/webrtc/video_engine/vie_codec_impl.h
+++ b/webrtc/video_engine/vie_codec_impl.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_CODEC_IMPL_H_
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_defines.h b/webrtc/video_engine/vie_defines.h
index 46e1334..e9278ba 100644
--- a/webrtc/video_engine/vie_defines.h
+++ b/webrtc/video_engine/vie_defines.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_DEFINES_H_
#define WEBRTC_VIDEO_ENGINE_VIE_DEFINES_H_
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/engine_configurations.h"
// TODO(mflodman) Remove.
#ifdef WEBRTC_ANDROID
@@ -22,9 +22,9 @@
#include <stdio.h> // NOLINT
#include <stdlib.h> // NOLINT
#include <string.h> // NOLINT
-#include <sys/types.h> // NOLINT
#include <sys/socket.h> // NOLINT
#include <sys/time.h> // NOLINT
+#include <sys/types.h> // NOLINT
#include <time.h> // NOLINT
#endif
diff --git a/webrtc/video_engine/vie_encoder.cc b/webrtc/video_engine/vie_encoder.cc
index f5e7389..a3ce9a3 100644
--- a/webrtc/video_engine/vie_encoder.cc
+++ b/webrtc/video_engine/vie_encoder.cc
@@ -8,25 +8,25 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_encoder.h"
#include <cassert>
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "modules/pacing/include/paced_sender.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/utility/interface/process_thread.h"
-#include "modules/video_coding/codecs/interface/video_codec_interface.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "modules/video_coding/main/interface/video_coding_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/logging.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
-#include "system_wrappers/interface/trace_event.h"
-#include "video_engine/include/vie_codec.h"
-#include "video_engine/include/vie_image_process.h"
-#include "video_engine/vie_defines.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/modules/pacing/include/paced_sender.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace_event.h"
+#include "webrtc/video_engine/include/vie_codec.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/vie_defines.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h
index 43a38f6..fdc9a9e 100644
--- a/webrtc/video_engine/vie_encoder.h
+++ b/webrtc/video_engine/vie_encoder.h
@@ -14,16 +14,16 @@
#include <list>
#include <map>
-#include "common_types.h" // NOLINT
-#include "typedefs.h" //NOLINT
-#include "modules/bitrate_controller/include/bitrate_controller.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
-#include "modules/video_coding/main/interface/video_coding_defines.h"
-#include "modules/video_processing/main/interface/video_processing.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_file_recorder.h"
-#include "video_engine/vie_frame_provider_base.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
+#include "webrtc/modules/video_processing/main/interface/video_processing.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_file_recorder.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_encryption_impl.cc b/webrtc/video_engine/vie_encryption_impl.cc
index 93e7ed8..b09c449 100644
--- a/webrtc/video_engine/vie_encryption_impl.cc
+++ b/webrtc/video_engine/vie_encryption_impl.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_encryption_impl.h"
+#include "webrtc/video_engine/vie_encryption_impl.h"
-#include "system_wrappers/interface/trace.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"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_encryption_impl.h b/webrtc/video_engine/vie_encryption_impl.h
index 608a5ab..96779e3 100644
--- a/webrtc/video_engine/vie_encryption_impl.h
+++ b/webrtc/video_engine/vie_encryption_impl.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_ENCRYPTION_IMPL_H_
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_encryption.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_encryption.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_external_codec_impl.cc b/webrtc/video_engine/vie_external_codec_impl.cc
index 4d0bebe..13e421b 100644
--- a/webrtc/video_engine/vie_external_codec_impl.cc
+++ b/webrtc/video_engine/vie_external_codec_impl.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_external_codec_impl.h"
+#include "webrtc/video_engine/vie_external_codec_impl.h"
-#include "engine_configurations.h" // NOLINT
-#include "system_wrappers/interface/trace.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"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_external_codec_impl.h b/webrtc/video_engine/vie_external_codec_impl.h
index 6e8c5bc..7c8f4a2 100644
--- a/webrtc/video_engine/vie_external_codec_impl.h
+++ b/webrtc/video_engine/vie_external_codec_impl.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_EXTERNAL_CODEC_IMPL_H_
-#include "video_engine/include/vie_external_codec.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/video_engine/include/vie_external_codec.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_image.cc b/webrtc/video_engine/vie_file_image.cc
index 3a62eac..c756c26 100644
--- a/webrtc/video_engine/vie_file_image.cc
+++ b/webrtc/video_engine/vie_file_image.cc
@@ -9,7 +9,7 @@
*/
// Placed first to get WEBRTC_VIDEO_ENGINE_FILE_API.
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/engine_configurations.h"
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
diff --git a/webrtc/video_engine/vie_file_image.h b/webrtc/video_engine/vie_file_image.h
index 3bca244..1b5e1af 100644
--- a/webrtc/video_engine/vie_file_image.h
+++ b/webrtc/video_engine/vie_file_image.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMAGE_H_
-#include "common_video/interface/i420_video_frame.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_file.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_file.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_impl.cc b/webrtc/video_engine/vie_file_impl.cc
index 2938092..a7e889e 100644
--- a/webrtc/video_engine/vie_file_impl.cc
+++ b/webrtc/video_engine/vie_file_impl.cc
@@ -8,29 +8,29 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_file_impl.h"
+#include "webrtc/video_engine/vie_file_impl.h"
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/engine_configurations.h"
#ifdef WEBRTC_VIDEO_ENGINE_FILE_API
-#include "common_video/jpeg/include/jpeg.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#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/include/vie_errors.h"
-#include "video_engine/vie_capturer.h"
-#include "video_engine/vie_channel.h"
-#include "video_engine/vie_channel_manager.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_file_image.h"
-#include "video_engine/vie_file_player.h"
-#include "video_engine/vie_file_recorder.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_render_manager.h"
-#include "video_engine/vie_renderer.h"
+#include "webrtc/common_video/jpeg/include/jpeg.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_file_image.h"
+#include "webrtc/video_engine/vie_file_player.h"
+#include "webrtc/video_engine/vie_file_recorder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_render_manager.h"
+#include "webrtc/video_engine/vie_renderer.h"
#endif
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_impl.h b/webrtc/video_engine/vie_file_impl.h
index 5457d02..d62b804 100644
--- a/webrtc/video_engine/vie_file_impl.h
+++ b/webrtc/video_engine/vie_file_impl.h
@@ -11,13 +11,13 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_FILE_IMPL_H_
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
-#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"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_file.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
+#include "webrtc/video_engine/vie_ref_count.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_player.cc b/webrtc/video_engine/vie_file_player.cc
index d3ec460..07c4d11 100644
--- a/webrtc/video_engine/vie_file_player.cc
+++ b/webrtc/video_engine/vie_file_player.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_file_player.h"
+#include "webrtc/video_engine/vie_file_player.h"
-#include "modules/utility/interface/file_player.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "system_wrappers/interface/thread_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/include/vie_file.h"
-#include "video_engine/vie_defines.h"
-#include "voice_engine/include/voe_base.h"
-#include "voice_engine/include/voe_file.h"
-#include "voice_engine/include/voe_video_sync.h"
+#include "webrtc/modules/utility/interface/file_player.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_file.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_player.h b/webrtc/video_engine/vie_file_player.h
index 37e1d20..9c8aa5a 100644
--- a/webrtc/video_engine/vie_file_player.h
+++ b/webrtc/video_engine/vie_file_player.h
@@ -14,12 +14,12 @@
#include <list>
#include <set>
-#include "common_types.h" // NOLINT
-#include "common_video/interface/i420_video_frame.h"
-#include "modules/media_file/interface/media_file_defines.h"
-#include "system_wrappers/interface/file_wrapper.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/vie_frame_provider_base.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_recorder.cc b/webrtc/video_engine/vie_file_recorder.cc
index 9f2ff08..b49d330 100644
--- a/webrtc/video_engine/vie_file_recorder.cc
+++ b/webrtc/video_engine/vie_file_recorder.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_file_recorder.h"
+#include "webrtc/video_engine/vie_file_recorder.h"
-#include "modules/utility/interface/file_player.h"
-#include "modules/utility/interface/file_recorder.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/vie_defines.h"
+#include "webrtc/modules/utility/interface/file_player.h"
+#include "webrtc/modules/utility/interface/file_recorder.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/vie_defines.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_file_recorder.h b/webrtc/video_engine/vie_file_recorder.h
index 5560a04..c8f37a4 100644
--- a/webrtc/video_engine/vie_file_recorder.h
+++ b/webrtc/video_engine/vie_file_recorder.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
#define WEBRTC_VIDEO_ENGINE_VIE_FILE_RECORDER_H_
-#include "modules/utility/interface/file_recorder.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_file.h"
-#include "voice_engine/include/voe_file.h"
+#include "webrtc/modules/utility/interface/file_recorder.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_file.h"
+#include "webrtc/voice_engine/include/voe_file.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_frame_provider_base.cc b/webrtc/video_engine/vie_frame_provider_base.cc
index 5e96c75..ac05841 100644
--- a/webrtc/video_engine/vie_frame_provider_base.cc
+++ b/webrtc/video_engine/vie_frame_provider_base.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_frame_provider_base.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
#include <algorithm>
-#include "common_video/interface/i420_video_frame.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/vie_defines.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/vie_defines.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_frame_provider_base.h b/webrtc/video_engine/vie_frame_provider_base.h
index d132ea4..e5a137b 100644
--- a/webrtc/video_engine/vie_frame_provider_base.h
+++ b/webrtc/video_engine/vie_frame_provider_base.h
@@ -13,9 +13,9 @@
#include <vector>
-#include "common_types.h" // NOLINT
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
+#include "webrtc/common_types.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_image_process_impl.cc b/webrtc/video_engine/vie_image_process_impl.cc
index df70986..199073a 100644
--- a/webrtc/video_engine/vie_image_process_impl.cc
+++ b/webrtc/video_engine/vie_image_process_impl.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_image_process_impl.h"
+#include "webrtc/video_engine/vie_image_process_impl.h"
-#include "system_wrappers/interface/trace.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"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_image_process_impl.h b/webrtc/video_engine/vie_image_process_impl.h
index 4a8c5f9..81e6b78 100644
--- a/webrtc/video_engine/vie_image_process_impl.h
+++ b/webrtc/video_engine/vie_image_process_impl.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_IMAGE_PROCESS_IMPL_H_
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_image_process.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_image_process.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_impl.h b/webrtc/video_engine/vie_impl.h
index 2888912..290a67e 100644
--- a/webrtc/video_engine/vie_impl.h
+++ b/webrtc/video_engine/vie_impl.h
@@ -13,8 +13,8 @@
#include "webrtc/common.h"
#include "webrtc/engine_configurations.h"
-#include "webrtc/video_engine/vie_defines.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/video_engine/vie_defines.h"
#include "webrtc/video_engine/vie_base_impl.h"
diff --git a/webrtc/video_engine/vie_input_manager.cc b/webrtc/video_engine/vie_input_manager.cc
index 964c4df..c22aa13 100644
--- a/webrtc/video_engine/vie_input_manager.cc
+++ b/webrtc/video_engine/vie_input_manager.cc
@@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_input_manager.h"
#include <cassert>
-#include "common_types.h" // NOLINT
+#include "webrtc/common_types.h"
#include "webrtc/modules/video_capture/include/video_capture_factory.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "modules/video_coding/main/interface/video_coding_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/rw_lock_wrapper.h"
-#include "system_wrappers/interface/trace.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"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_file_player.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_input_manager.h b/webrtc/video_engine/vie_input_manager.h
index e76c646..b75c5b8 100644
--- a/webrtc/video_engine/vie_input_manager.h
+++ b/webrtc/video_engine/vie_input_manager.h
@@ -12,13 +12,13 @@
#define WEBRTC_VIDEO_ENGINE_VIE_INPUT_MANAGER_H_
#include "webrtc/modules/video_capture/include/video_capture.h"
-#include "system_wrappers/interface/map_wrapper.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
-#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"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_capture.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
+#include "webrtc/video_engine/vie_manager_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_manager_base.cc b/webrtc/video_engine/vie_manager_base.cc
index 7b13227..b9b5d1a 100644
--- a/webrtc/video_engine/vie_manager_base.cc
+++ b/webrtc/video_engine/vie_manager_base.cc
@@ -10,8 +10,8 @@
#include <assert.h>
-#include "system_wrappers/interface/rw_lock_wrapper.h"
-#include "video_engine/vie_manager_base.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
+#include "webrtc/video_engine/vie_manager_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_receiver.cc b/webrtc/video_engine/vie_receiver.cc
index 1e47c89..ca8ec14 100644
--- a/webrtc/video_engine/vie_receiver.cc
+++ b/webrtc/video_engine/vie_receiver.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_receiver.h"
+#include "webrtc/video_engine/vie_receiver.h"
#include <vector>
-#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/utility/interface/rtp_dump.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/utility/interface/rtp_dump.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_ref_count.cc b/webrtc/video_engine/vie_ref_count.cc
index 3f7e45c..b2fe7ac 100644
--- a/webrtc/video_engine/vie_ref_count.cc
+++ b/webrtc/video_engine/vie_ref_count.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/video_engine/vie_ref_count.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_ref_count.h b/webrtc/video_engine/vie_ref_count.h
index 5ac9a3e..95451c4 100644
--- a/webrtc/video_engine/vie_ref_count.h
+++ b/webrtc/video_engine/vie_ref_count.h
@@ -13,7 +13,7 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
#define WEBRTC_VIDEO_ENGINE_VIE_REF_COUNT_H_
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_remb.cc b/webrtc/video_engine/vie_remb.cc
index eb70fac..534d643 100644
--- a/webrtc/video_engine/vie_remb.cc
+++ b/webrtc/video_engine/vie_remb.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_remb.h"
+#include "webrtc/video_engine/vie_remb.h"
#include <algorithm>
#include <cassert>
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/utility/interface/process_thread.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_remb.h b/webrtc/video_engine/vie_remb.h
index d4b3803..649c8bc 100644
--- a/webrtc/video_engine/vie_remb.h
+++ b/webrtc/video_engine/vie_remb.h
@@ -15,10 +15,10 @@
#include <utility>
#include <vector>
-#include "modules/interface/module.h"
-#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_remb_unittest.cc b/webrtc/video_engine/vie_remb_unittest.cc
index 036c1f7..0cec272 100644
--- a/webrtc/video_engine/vie_remb_unittest.cc
+++ b/webrtc/video_engine/vie_remb_unittest.cc
@@ -11,8 +11,8 @@
// This file includes unit tests for ViERemb.
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include <vector>
diff --git a/webrtc/video_engine/vie_render_impl.cc b/webrtc/video_engine/vie_render_impl.cc
index 75bc0a3..507e05a 100644
--- a/webrtc/video_engine/vie_render_impl.cc
+++ b/webrtc/video_engine/vie_render_impl.cc
@@ -8,23 +8,23 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_render_impl.h"
+#include "webrtc/video_engine/vie_render_impl.h"
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/include/vie_errors.h"
-#include "video_engine/vie_capturer.h"
-#include "video_engine/vie_channel.h"
-#include "video_engine/vie_channel_manager.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_frame_provider_base.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_render_manager.h"
-#include "video_engine/vie_renderer.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_capturer.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_render_manager.h"
+#include "webrtc/video_engine/vie_renderer.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_render_impl.h b/webrtc/video_engine/vie_render_impl.h
index ac7b0e9..c419794 100644
--- a/webrtc/video_engine/vie_render_impl.h
+++ b/webrtc/video_engine/vie_render_impl.h
@@ -12,9 +12,9 @@
#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_IMPL_H_
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_render.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_render.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_render_manager.cc b/webrtc/video_engine/vie_render_manager.cc
index e79d295..79c604b 100644
--- a/webrtc/video_engine/vie_render_manager.cc
+++ b/webrtc/video_engine/vie_render_manager.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_render_manager.h"
+#include "webrtc/video_engine/vie_render_manager.h"
-#include "engine_configurations.h" // NOLINT
+#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/rw_lock_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_renderer.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_renderer.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_render_manager.h b/webrtc/video_engine/vie_render_manager.h
index 2e31222..900fcdc 100644
--- a/webrtc/video_engine/vie_render_manager.h
+++ b/webrtc/video_engine/vie_render_manager.h
@@ -11,12 +11,12 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
#define WEBRTC_VIDEO_ENGINE_VIE_RENDER_MANAGER_H_
-#include "system_wrappers/interface/list_wrapper.h"
-#include "system_wrappers/interface/map_wrapper.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
-#include "video_engine/vie_manager_base.h"
+#include "webrtc/video_engine/vie_manager_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_renderer.cc b/webrtc/video_engine/vie_renderer.cc
index c577148..597f49d 100644
--- a/webrtc/video_engine/vie_renderer.cc
+++ b/webrtc/video_engine/vie_renderer.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_renderer.h"
+#include "webrtc/video_engine/vie_renderer.h"
-#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "video_engine/vie_render_manager.h"
+#include "webrtc/video_engine/vie_render_manager.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_renderer.h b/webrtc/video_engine/vie_renderer.h
index aebdd7f..a4a1e22 100644
--- a/webrtc/video_engine/vie_renderer.h
+++ b/webrtc/video_engine/vie_renderer.h
@@ -12,10 +12,10 @@
#define WEBRTC_VIDEO_ENGINE_VIE_RENDERER_H_
#include "webrtc/modules/video_render/include/video_render_defines.h"
-#include "system_wrappers/interface/map_wrapper.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "video_engine/include/vie_render.h"
-#include "video_engine/vie_frame_provider_base.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/video_engine/include/vie_render.h"
+#include "webrtc/video_engine/vie_frame_provider_base.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_rtp_rtcp_impl.cc b/webrtc/video_engine/vie_rtp_rtcp_impl.cc
index b9992b8..134c954 100644
--- a/webrtc/video_engine/vie_rtp_rtcp_impl.cc
+++ b/webrtc/video_engine/vie_rtp_rtcp_impl.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_rtp_rtcp_impl.h"
+#include "webrtc/video_engine/vie_rtp_rtcp_impl.h"
-#include "engine_configurations.h" // NOLINT
-#include "system_wrappers/interface/file_wrapper.h"
-#include "system_wrappers/interface/trace.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"
-#include "video_engine/vie_encoder.h"
-#include "video_engine/vie_impl.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/include/vie_errors.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_encoder.h"
+#include "webrtc/video_engine/vie_impl.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_rtp_rtcp_impl.h b/webrtc/video_engine/vie_rtp_rtcp_impl.h
index 4ac88e2..fb8bd54 100644
--- a/webrtc/video_engine/vie_rtp_rtcp_impl.h
+++ b/webrtc/video_engine/vie_rtp_rtcp_impl.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
#define WEBRTC_VIDEO_ENGINE_VIE_RTP_RTCP_IMPL_H_
-#include "modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/include/vie_rtp_rtcp.h"
-#include "video_engine/vie_ref_count.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/include/vie_rtp_rtcp.h"
+#include "webrtc/video_engine/vie_ref_count.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_sender.cc b/webrtc/video_engine/vie_sender.cc
index 4812115..21f3061 100644
--- a/webrtc/video_engine/vie_sender.cc
+++ b/webrtc/video_engine/vie_sender.cc
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_sender.h"
+#include "webrtc/video_engine/vie_sender.h"
#include <cassert>
-#include "modules/utility/interface/rtp_dump.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/modules/utility/interface/rtp_dump.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_sender.h b/webrtc/video_engine/vie_sender.h
index 6fa12f4..03b9d58 100644
--- a/webrtc/video_engine/vie_sender.h
+++ b/webrtc/video_engine/vie_sender.h
@@ -14,11 +14,11 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
#define WEBRTC_VIDEO_ENGINE_VIE_SENDER_H_
-#include "common_types.h" // NOLINT
-#include "engine_configurations.h" // NOLINT
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "typedefs.h" // NOLINT
-#include "video_engine/vie_defines.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/video_engine/vie_defines.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_shared_data.cc b/webrtc/video_engine/vie_shared_data.cc
index 6e2ef13..11f136b 100644
--- a/webrtc/video_engine/vie_shared_data.cc
+++ b/webrtc/video_engine/vie_shared_data.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "modules/utility/interface/process_thread.h"
-#include "system_wrappers/interface/cpu_info.h"
-#include "system_wrappers/interface/trace.h"
-#include "video_engine/vie_channel_manager.h"
-#include "video_engine/vie_defines.h"
-#include "video_engine/vie_input_manager.h"
-#include "video_engine/vie_render_manager.h"
-#include "video_engine/vie_shared_data.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/cpu_info.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/video_engine/vie_channel_manager.h"
+#include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/video_engine/vie_input_manager.h"
+#include "webrtc/video_engine/vie_render_manager.h"
+#include "webrtc/video_engine/vie_shared_data.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc
index a974e25..d0617d6 100644
--- a/webrtc/video_engine/vie_sync_module.cc
+++ b/webrtc/video_engine/vie_sync_module.cc
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "video_engine/vie_sync_module.h"
+#include "webrtc/video_engine/vie_sync_module.h"
-#include "modules/rtp_rtcp/interface/rtp_rtcp.h"
-#include "modules/video_coding/main/interface/video_coding.h"
-#include "system_wrappers/interface/critical_section_wrapper.h"
-#include "system_wrappers/interface/trace.h"
-#include "system_wrappers/interface/trace_event.h"
-#include "video_engine/stream_synchronization.h"
-#include "video_engine/vie_channel.h"
-#include "voice_engine/include/voe_video_sync.h"
+#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/trace_event.h"
+#include "webrtc/video_engine/stream_synchronization.h"
+#include "webrtc/video_engine/vie_channel.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
namespace webrtc {
diff --git a/webrtc/video_engine/vie_sync_module.h b/webrtc/video_engine/vie_sync_module.h
index e16d3f2..51246c1 100644
--- a/webrtc/video_engine/vie_sync_module.h
+++ b/webrtc/video_engine/vie_sync_module.h
@@ -14,11 +14,11 @@
#ifndef WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_
#define WEBRTC_VIDEO_ENGINE_VIE_SYNC_MODULE_H_
-#include "modules/interface/module.h"
-#include "system_wrappers/interface/scoped_ptr.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "video_engine/stream_synchronization.h"
-#include "voice_engine/include/voe_video_sync.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/video_engine/stream_synchronization.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
namespace webrtc {