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

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

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2013-07-12 08:28:10 +00:00
parent 0ed57c51a3
commit 8b06200802
23 changed files with 88 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/utility/interface/audio_frame_operations.h
View File

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

10
webrtc/modules/utility/interface/file_player.h
View File

@ -11,11 +11,11 @@
#ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_ #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_
#define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_ #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_PLAYER_H_
#include "common_types.h" #include "webrtc/common_types.h"
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class FileCallback; class FileCallback;

16
webrtc/modules/utility/interface/file_recorder.h
View File

@ -11,14 +11,14 @@
#ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_ #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_
#define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_ #define WEBRTC_MODULES_UTILITY_INTERFACE_FILE_RECORDER_H_
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_types.h"
#include "common_types.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "modules/audio_coding/main/interface/audio_coding_module_typedefs.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
#include "modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "modules/media_file/interface/media_file_defines.h" #include "webrtc/modules/media_file/interface/media_file_defines.h"
#include "system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {

2
webrtc/modules/utility/interface/process_thread.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_ #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_
#define WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_ #define WEBRTC_MODULES_UTILITY_INTERFACE_PROCESS_THREAD_H_
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class Module; class Module;

4
webrtc/modules/utility/interface/rtp_dump.h
View File

@ -16,8 +16,8 @@
#ifndef WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_ #ifndef WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_
#define WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_ #define WEBRTC_MODULES_UTILITY_INTERFACE_RTP_DUMP_H_
#include "typedefs.h" #include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "file_wrapper.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class RtpDump class RtpDump

5
webrtc/modules/utility/source/audio_frame_operations.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "audio_frame_operations.h" #include "webrtc/modules/interface/module_common_types.h"
#include "module_common_types.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h"
namespace webrtc { namespace webrtc {
@ -108,4 +108,3 @@ int AudioFrameOperations::ScaleWithSat(float scale, AudioFrame& frame) {
} }
} // namespace webrtc } // namespace webrtc

6
webrtc/modules/utility/source/audio_frame_operations_unittest.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "audio_frame_operations.h" #include "webrtc/modules/interface/module_common_types.h"
#include "module_common_types.h" #include "webrtc/modules/utility/interface/audio_frame_operations.h"
namespace webrtc { namespace webrtc {
namespace { namespace {

6
webrtc/modules/utility/source/coder.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "coder.h" #include "webrtc/common_types.h"
#include "common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "module_common_types.h" #include "webrtc/modules/utility/source/coder.h"
// OS independent case insensitive string comparison. // OS independent case insensitive string comparison.
#ifdef WIN32 #ifdef WIN32

6
webrtc/modules/utility/source/coder.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ #ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
#define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
#include "audio_coding_module.h" #include "webrtc/common_types.h"
#include "common_types.h" #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class AudioFrame; class AudioFrame;

4
webrtc/modules/utility/source/file_player_impl.cc
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "file_player_impl.h" #include "webrtc/modules/utility/source/file_player_impl.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "frame_scaler.h" #include "frame_scaler.h"

20
webrtc/modules/utility/source/file_player_impl.h
View File

@ -11,16 +11,16 @@
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_ #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
#define WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_ #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
#include "coder.h" #include "webrtc/common_audio/resampler/include/resampler.h"
#include "common_types.h" #include "webrtc/common_types.h"
#include "critical_section_wrapper.h" #include "webrtc/engine_configurations.h"
#include "engine_configurations.h" #include "webrtc/modules/media_file/interface/media_file.h"
#include "file_player.h" #include "webrtc/modules/media_file/interface/media_file_defines.h"
#include "media_file_defines.h" #include "webrtc/modules/utility/interface/file_player.h"
#include "media_file.h" #include "webrtc/modules/utility/source/coder.h"
#include "resampler.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class VideoCoder; class VideoCoder;

10
webrtc/modules/utility/source/file_recorder_impl.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "file_recorder_impl.h" #include "webrtc/modules/media_file/interface/media_file.h"
#include "media_file.h" #include "webrtc/modules/utility/source/file_recorder_impl.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "critical_section_wrapper.h" #include "critical_section_wrapper.h"

24
webrtc/modules/utility/source/file_recorder_impl.h
View File

@ -15,18 +15,18 @@
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_ #ifndef WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_
#define WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_ #define WEBRTC_MODULES_UTILITY_SOURCE_FILE_RECORDER_IMPL_H_
#include "coder.h" #include "webrtc/common_audio/resampler/include/resampler.h"
#include "common_types.h" #include "webrtc/common_types.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "event_wrapper.h" #include "webrtc/modules/interface/module_common_types.h"
#include "file_recorder.h" #include "webrtc/modules/media_file/interface/media_file.h"
#include "media_file_defines.h" #include "webrtc/modules/media_file/interface/media_file_defines.h"
#include "media_file.h" #include "webrtc/modules/utility/interface/file_recorder.h"
#include "module_common_types.h" #include "webrtc/modules/utility/source/coder.h"
#include "resampler.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "frame_scaler.h" #include "frame_scaler.h"

6
webrtc/modules/utility/source/frame_scaler.cc
View File

@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "modules/utility/source/frame_scaler.h" #include "webrtc/modules/utility/source/frame_scaler.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "common_video/libyuv/include/scaler.h" #include "webrtc/common_video/libyuv/include/scaler.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc { namespace webrtc {

8
webrtc/modules/utility/source/frame_scaler.h
View File

@ -15,10 +15,10 @@
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "modules/interface/module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc { namespace webrtc {

6
webrtc/modules/utility/source/process_thread_impl.cc
View File

@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "process_thread_impl.h" #include "webrtc/modules/interface/module.h"
#include "module.h" #include "webrtc/modules/utility/source/process_thread_impl.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc { namespace webrtc {
ProcessThread::~ProcessThread() ProcessThread::~ProcessThread()

12
webrtc/modules/utility/source/process_thread_impl.h
View File

@ -11,12 +11,12 @@
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ #ifndef WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
#define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_ #define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
#include "critical_section_wrapper.h" #include "webrtc/modules/utility/interface/process_thread.h"
#include "event_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "list_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "process_thread.h" #include "webrtc/system_wrappers/interface/list_wrapper.h"
#include "thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
class ProcessThreadImpl : public ProcessThread class ProcessThreadImpl : public ProcessThread

6
webrtc/modules/utility/source/rtp_dump_impl.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "rtp_dump_impl.h" #include "webrtc/modules/utility/source/rtp_dump_impl.h"
#include <cassert> #include <cassert>
#include <stdio.h> #include <stdio.h>
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#if defined(_WIN32) #if defined(_WIN32)
#include <Windows.h> #include <Windows.h>

2
webrtc/modules/utility/source/rtp_dump_impl.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_ #ifndef WEBRTC_MODULES_UTILITY_SOURCE_RTP_DUMP_IMPL_H_
#define 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 { namespace webrtc {
class CriticalSectionWrapper; class CriticalSectionWrapper;

2
webrtc/modules/utility/source/video_coder.cc
View File

@ -10,7 +10,7 @@
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "video_coder.h" #include "webrtc/modules/utility/source/video_coder.h"
namespace webrtc { namespace webrtc {
VideoCoder::VideoCoder(uint32_t instanceID) VideoCoder::VideoCoder(uint32_t instanceID)

4
webrtc/modules/utility/source/video_coder.h
View File

@ -13,8 +13,8 @@
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "video_coding.h" #include "webrtc/modules/video_coding/main/interface/video_coding.h"
namespace webrtc { namespace webrtc {
class VideoCoder : public VCMPacketizationCallback, public VCMReceiveCallback class VideoCoder : public VCMPacketizationCallback, public VCMReceiveCallback

8
webrtc/modules/utility/source/video_frames_queue.cc
View File

@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "video_frames_queue.h" #include "webrtc/modules/utility/source/video_frames_queue.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include <cassert> #include <cassert>
#include "module_common_types.h" #include "webrtc/modules/interface/module_common_types.h"
#include "tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc { namespace webrtc {
VideoFramesQueue::VideoFramesQueue() VideoFramesQueue::VideoFramesQueue()

8
webrtc/modules/utility/source/video_frames_queue.h
View File

@ -13,10 +13,10 @@
#ifdef WEBRTC_MODULE_UTILITY_VIDEO #ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "common_video/interface/i420_video_frame.h" #include "webrtc/common_video/interface/i420_video_frame.h"
#include "engine_configurations.h" #include "webrtc/engine_configurations.h"
#include "list_wrapper.h" #include "webrtc/system_wrappers/interface/list_wrapper.h"
#include "typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {