Include files from webrtc/.. paths in utility/.

BUG=1662 R=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1786004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4336 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-12 08:28:10 +00:00 · 2013-07-12 08:28:10 +00:00 · 8b06200802
commit 8b06200802
parent 0ed57c51a3
23 changed files with 88 additions and 89 deletions
--- a/webrtc/modules/utility/interface/audio_frame_operations.h
+++ b/webrtc/modules/utility/interface/audio_frame_operations.h
@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_AUDIO_FRAME_OPERATIONS_H_
 #define WEBRTC_VOICE_ENGINE_AUDIO_FRAME_OPERATIONS_H_

-#include "typedefs.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {

--- a/webrtc/modules/utility/interface/file_player.h
+++ b/webrtc/modules/utility/interface/file_player.h
@ -11,11 +11,11 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_

-#include "common_types.h"
-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "module_common_types.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class FileCallback;
--- a/webrtc/modules/utility/interface/file_recorder.h
+++ b/webrtc/modules/utility/interface/file_recorder.h
@ -11,14 +11,14 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_

-#include "common_video/interface/i420_video_frame.h"
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
-#include "modules/interface/module_common_types.h"
-#include "modules/media_file/interface/media_file_defines.h"
-#include "system_wrappers/interface/tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {

--- a/webrtc/modules/utility/interface/process_thread.h
+++ b/webrtc/modules/utility/interface/process_thread.h
@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_

-#include "typedefs.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class Module;
--- a/webrtc/modules/utility/interface/rtp_dump.h
+++ b/webrtc/modules/utility/interface/rtp_dump.h
@ -16,8 +16,8 @@
 #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_
 #define WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_

-#include "typedefs.h"
-#include "file_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class RtpDump
--- a/webrtc/modules/utility/source/audio_frame_operations.cc
+++ b/webrtc/modules/utility/source/audio_frame_operations.cc
@ -8,8 +8,8 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "audio_frame_operations.h"
-#include "module_common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/audio_frame_operations.h"

 namespace webrtc {

@ -108,4 +108,3 @@ int AudioFrameOperations::ScaleWithSat(float scale, AudioFrame& frame) {
 }

 }  // namespace webrtc
-
--- a/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
+++ b/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
@ -8,10 +8,10 @@
 *  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 "audio_frame_operations.h"
-#include "module_common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/interface/audio_frame_operations.h"

 namespace webrtc {
 namespace {
--- a/webrtc/modules/utility/source/coder.cc
+++ b/webrtc/modules/utility/source/coder.cc
@ -8,9 +8,9 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "coder.h"
-#include "common_types.h"
-#include "module_common_types.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/utility/source/coder.h"

 // OS independent case insensitive string comparison.
 #ifdef WIN32
--- a/webrtc/modules/utility/source/coder.h
+++ b/webrtc/modules/utility/source/coder.h
@ -11,9 +11,9 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_

-#include "audio_coding_module.h"
-#include "common_types.h"
-#include "typedefs.h"
+#include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class AudioFrame;
--- a/webrtc/modules/utility/source/file_player_impl.cc
+++ b/webrtc/modules/utility/source/file_player_impl.cc
@ -8,8 +8,8 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "file_player_impl.h"
-#include "trace.h"
+#include "webrtc/modules/utility/source/file_player_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
    #include "frame_scaler.h"
--- a/webrtc/modules/utility/source/file_player_impl.h
+++ b/webrtc/modules/utility/source/file_player_impl.h
@ -11,16 +11,16 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_

-#include "coder.h"
-#include "common_types.h"
-#include "critical_section_wrapper.h"
-#include "engine_configurations.h"
-#include "file_player.h"
-#include "media_file_defines.h"
-#include "media_file.h"
-#include "resampler.h"
-#include "tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/modules/utility/interface/file_player.h"
+#include "webrtc/modules/utility/source/coder.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class VideoCoder;
--- a/webrtc/modules/utility/source/file_recorder_impl.cc
+++ b/webrtc/modules/utility/source/file_recorder_impl.cc
@ -8,11 +8,11 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "common_video/libyuv/include/webrtc_libyuv.h"
-#include "engine_configurations.h"
-#include "file_recorder_impl.h"
-#include "media_file.h"
-#include "trace.h"
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/utility/source/file_recorder_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
    #include "critical_section_wrapper.h"
--- a/webrtc/modules/utility/source/file_recorder_impl.h
+++ b/webrtc/modules/utility/source/file_recorder_impl.h
@ -15,18 +15,18 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_

-#include "coder.h"
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "event_wrapper.h"
-#include "file_recorder.h"
-#include "media_file_defines.h"
-#include "media_file.h"
-#include "module_common_types.h"
-#include "resampler.h"
-#include "thread_wrapper.h"
-#include "tick_util.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/modules/media_file/interface/media_file_defines.h"
+#include "webrtc/modules/utility/interface/file_recorder.h"
+#include "webrtc/modules/utility/source/coder.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/typedefs.h"

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO
    #include "frame_scaler.h"
--- a/webrtc/modules/utility/source/frame_scaler.cc
+++ b/webrtc/modules/utility/source/frame_scaler.cc
@ -8,12 +8,12 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "modules/utility/source/frame_scaler.h"
+#include "webrtc/modules/utility/source/frame_scaler.h"

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

-#include "common_video/libyuv/include/scaler.h"
-#include "system_wrappers/interface/trace.h"
+#include "webrtc/common_video/libyuv/include/scaler.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 namespace webrtc {

--- a/webrtc/modules/utility/source/frame_scaler.h
+++ b/webrtc/modules/utility/source/frame_scaler.h
@ -15,10 +15,10 @@

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "modules/interface/module_common_types.h"
-#include "system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"

 namespace webrtc {

--- a/webrtc/modules/utility/source/process_thread_impl.cc
+++ b/webrtc/modules/utility/source/process_thread_impl.cc
@ -8,9 +8,9 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "process_thread_impl.h"
-#include "module.h"
-#include "trace.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/modules/utility/source/process_thread_impl.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 namespace webrtc {
 ProcessThread::~ProcessThread()
--- a/webrtc/modules/utility/source/process_thread_impl.h
+++ b/webrtc/modules/utility/source/process_thread_impl.h
@ -11,12 +11,12 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_

-#include "critical_section_wrapper.h"
-#include "event_wrapper.h"
-#include "list_wrapper.h"
-#include "process_thread.h"
-#include "thread_wrapper.h"
-#include "typedefs.h"
+#include "webrtc/modules/utility/interface/process_thread.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/event_wrapper.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {
 class ProcessThreadImpl : public ProcessThread
--- a/webrtc/modules/utility/source/rtp_dump_impl.cc
+++ b/webrtc/modules/utility/source/rtp_dump_impl.cc
@ -8,13 +8,13 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "rtp_dump_impl.h"
+#include "webrtc/modules/utility/source/rtp_dump_impl.h"

 #include <cassert>
 #include <stdio.h>

-#include "critical_section_wrapper.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 #if defined(_WIN32)
 #include <Windows.h>
--- a/webrtc/modules/utility/source/rtp_dump_impl.h
+++ b/webrtc/modules/utility/source/rtp_dump_impl.h
@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_

-#include "rtp_dump.h"
+#include "webrtc/modules/utility/interface/rtp_dump.h"

 namespace webrtc {
 class CriticalSectionWrapper;
--- a/webrtc/modules/utility/source/video_coder.cc
+++ b/webrtc/modules/utility/source/video_coder.cc
@ -10,7 +10,7 @@

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

-#include "video_coder.h"
+#include "webrtc/modules/utility/source/video_coder.h"

 namespace webrtc {
 VideoCoder::VideoCoder(uint32_t instanceID)
--- a/webrtc/modules/utility/source/video_coder.h
+++ b/webrtc/modules/utility/source/video_coder.h
@ -13,8 +13,8 @@

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

-#include "engine_configurations.h"
-#include "video_coding.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/modules/video_coding/main/interface/video_coding.h"

 namespace webrtc {
 class VideoCoder : public VCMPacketizationCallback, public VCMReceiveCallback
--- a/webrtc/modules/utility/source/video_frames_queue.cc
+++ b/webrtc/modules/utility/source/video_frames_queue.cc
@ -8,15 +8,15 @@
 *  be found in the AUTHORS file in the root of the source tree.
 */

-#include "video_frames_queue.h"
+#include "webrtc/modules/utility/source/video_frames_queue.h"

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

 #include <cassert>

-#include "module_common_types.h"
-#include "tick_util.h"
-#include "trace.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/tick_util.h"
+#include "webrtc/system_wrappers/interface/trace.h"

 namespace webrtc {
 VideoFramesQueue::VideoFramesQueue()
--- a/webrtc/modules/utility/source/video_frames_queue.h
+++ b/webrtc/modules/utility/source/video_frames_queue.h
@ -13,10 +13,10 @@

 #ifdef WEBRTC_MODULE_UTILITY_VIDEO

-#include "common_video/interface/i420_video_frame.h"
-#include "engine_configurations.h"
-#include "list_wrapper.h"
-#include "typedefs.h"
+#include "webrtc/common_video/interface/i420_video_frame.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/list_wrapper.h"
+#include "webrtc/typedefs.h"

 namespace webrtc {