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

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

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

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4351 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-07-16 13:05:40 +00:00
parent 9b82dced8d
commit 0c4e05afbb
9 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/media_file/interface/media_file.h
View File

@ -11,11 +11,11 @@
#ifndef WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_
#define WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_H_
#include "common_types.h"
#include "typedefs.h"
#include "module.h"
#include "module_common_types.h"
#include "media_file_defines.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/interface/module.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/media_file/interface/media_file_defines.h"
#include "webrtc/typedefs.h"
namespace webrtc {
class MediaFile : public Module

6
webrtc/modules/media_file/interface/media_file_defines.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_DEFINES_H_
#define WEBRTC_MODULES_MEDIA_FILE_INTERFACE_MEDIA_FILE_DEFINES_H_
#include "engine_configurations.h"
#include "module_common_types.h"
#include "typedefs.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/typedefs.h"
namespace webrtc {
// Callback class for the MediaFile class.

10
webrtc/modules/media_file/source/avi_file.cc
View File

@ -12,7 +12,7 @@
// is detected by asserts in many places. Also a refactoring of this class would
// be beneficial.
#include "avi_file.h"
#include "webrtc/modules/media_file/source/avi_file.h"
#include <assert.h>
#include <string.h>
@ -21,10 +21,10 @@
#include <windows.h>
#endif
#include "critical_section_wrapper.h"
#include "file_wrapper.h"
#include "list_wrapper.h"
#include "trace.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "webrtc/system_wrappers/interface/list_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
// http://msdn2.microsoft.com/en-us/library/ms779636.aspx
// A chunk has the following form:

2
webrtc/modules/media_file/source/avi_file.h
View File

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

10
webrtc/modules/media_file/source/media_file_impl.cc
View File

@ -10,11 +10,11 @@
#include <assert.h>
#include "critical_section_wrapper.h"
#include "file_wrapper.h"
#include "media_file_impl.h"
#include "tick_util.h"
#include "trace.h"
#include "webrtc/modules/media_file/source/media_file_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/system_wrappers/interface/trace.h"
#if (defined(WIN32) || defined(WINCE))
#define STR_CASE_CMP _stricmp

11
webrtc/modules/media_file/source/media_file_impl.h
View File

@ -11,11 +11,12 @@
#ifndef WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_
#define WEBRTC_MODULES_MEDIA_FILE_SOURCE_MEDIA_FILE_IMPL_H_
#include "common_types.h"
#include "media_file.h"
#include "media_file_defines.h"
#include "media_file_utility.h"
#include "module_common_types.h"
#include "webrtc/common_types.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/media_file/source/media_file_utility.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
namespace webrtc {
class MediaFileImpl : public MediaFile

2
webrtc/modules/media_file/source/media_file_unittest.cc
View File

@ -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/modules/media_file/interface/media_file.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/test/testsupport/fileutils.h"

12
webrtc/modules/media_file/source/media_file_utility.cc
View File

@ -12,12 +12,12 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "common_types.h"
#include "engine_configurations.h"
#include "file_wrapper.h"
#include "media_file_utility.h"
#include "module_common_types.h"
#include "trace.h"
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/media_file/source/media_file_utility.h"
#include "webrtc/system_wrappers/interface/file_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#ifdef WEBRTC_MODULE_UTILITY_VIDEO
#include "avi_file.h"

4
webrtc/modules/media_file/source/media_file_utility.h
View File

@ -14,8 +14,8 @@
#include <stdio.h>
#include "common_types.h"
#include "media_file_defines.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/media_file/interface/media_file_defines.h"
namespace webrtc {
class AviFile;