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

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

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

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4334 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-07-12 08:12:08 +00:00
parent 5b10d8fb18
commit 5aa3f1b4c0
37 changed files with 128 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/video_render/android/video_render_android_impl.cc
View File

@ -8,21 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_android_impl.h"
#include "webrtc/modules/video_render/android/video_render_android_impl.h"
#include "critical_section_wrapper.h"
#include "event_wrapper.h"
#include "thread_wrapper.h"
#include "tick_util.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"
#ifdef ANDROID
#include <stdio.h>
#include <android/log.h>
#include <stdio.h>
#undef WEBRTC_TRACE
#define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTCN*", __VA_ARGS__)
#else
#include "trace.h"
#include "webrtc/system_wrappers/interface/trace.h"
#endif
namespace webrtc {

2
webrtc/modules/video_render/android/video_render_android_impl.h
View File

@ -13,7 +13,7 @@
#include <jni.h>
#include "webrtc/modules/video_render/i_video_render.h"
#include "map_wrapper.h"
#include "webrtc/system_wrappers/interface/map_wrapper.h"
namespace webrtc {

10
webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
View File

@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_android_native_opengl2.h"
#include "critical_section_wrapper.h"
#include "tick_util.h"
#include "webrtc/modules/video_render/android/video_render_android_native_opengl2.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#ifdef ANDROID_LOG
#include <stdio.h>
#include <android/log.h>
#include <stdio.h>
#undef WEBRTC_TRACE
#define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC*", __VA_ARGS__)
#else
#include "trace.h"
#include "webrtc/system_wrappers/interface/trace.h"
#endif
namespace webrtc {

6
webrtc/modules/video_render/android/video_render_android_native_opengl2.h
View File

@ -13,9 +13,9 @@
#include <jni.h>
#include "video_render_defines.h"
#include "video_render_android_impl.h"
#include "video_render_opengles20.h"
#include "webrtc/modules/video_render/android/video_render_android_impl.h"
#include "webrtc/modules/video_render/android/video_render_opengles20.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
namespace webrtc {

12
webrtc/modules/video_render/android/video_render_android_surface_view.cc
View File

@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_android_surface_view.h"
#include "critical_section_wrapper.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "tick_util.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/android/video_render_android_surface_view.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#ifdef ANDROID_LOG
#include <stdio.h>
#include <android/log.h>
#include <stdio.h>
#undef WEBRTC_TRACE
#define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTC*", __VA_ARGS__)
#else
#include "trace.h"
#include "webrtc/system_wrappers/interface/trace.h"
#endif
namespace webrtc {

4
webrtc/modules/video_render/android/video_render_android_surface_view.h
View File

@ -13,8 +13,8 @@
#include <jni.h>
#include "video_render_defines.h"
#include "video_render_android_impl.h"
#include "webrtc/modules/video_render/android/video_render_android_impl.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
namespace webrtc {

6
webrtc/modules/video_render/android/video_render_opengles20.cc
View File

@ -14,18 +14,18 @@
#include <stdio.h>
#include <stdlib.h>
#include "video_render_opengles20.h"
#include "webrtc/modules/video_render/android/video_render_opengles20.h"
//#define ANDROID_LOG
#ifdef ANDROID_LOG
#include <stdio.h>
#include <android/log.h>
#include <stdio.h>
#undef WEBRTC_TRACE
#define WEBRTC_TRACE(a,b,c,...) __android_log_print(ANDROID_LOG_DEBUG, "*WEBRTCN*", __VA_ARGS__)
#else
#include "trace.h"
#include "webrtc/system_wrappers/interface/trace.h"
#endif
namespace webrtc {

2
webrtc/modules/video_render/android/video_render_opengles20.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_OPENGLES20_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_OPENGLES20_H_
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>

3
webrtc/modules/video_render/external/video_render_external_impl.cc vendored
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_external_impl.h"
#include "webrtc/modules/video_render/external/video_render_external_impl.h"
namespace webrtc {
@ -202,4 +202,3 @@ int32_t VideoRenderExternalImpl::RenderFrame(
return 0;
}
} // namespace webrtc

4
webrtc/modules/video_render/external/video_render_external_impl.h vendored
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_EXTERNAL_VIDEO_RENDER_EXTERNAL_IMPL_H_
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/video_render/i_video_render.h"
#include "critical_section_wrapper.h"
#include "module_common_types.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
namespace webrtc {

2
webrtc/modules/video_render/i_video_render.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_I_VIDEO_RENDER_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_I_VIDEO_RENDER_H_
#include "video_render.h"
#include "webrtc/modules/video_render/include/video_render.h"
namespace webrtc {

2
webrtc/modules/video_render/include/video_render.h
View File

@ -20,7 +20,7 @@
*
*/
#include "modules/interface/module.h"
#include "webrtc/modules/interface/module.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
namespace webrtc {

6
webrtc/modules/video_render/include/video_render_defines.h
View File

@ -12,9 +12,9 @@
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_INTERFACE_VIDEO_RENDER_DEFINES_H_
// Includes
#include "common_types.h"
#include "common_video/interface/i420_video_frame.h"
#include "modules/interface/module_common_types.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/interface/i420_video_frame.h"
#include "webrtc/modules/interface/module_common_types.h"
namespace webrtc
{

14
webrtc/modules/video_render/incoming_video_stream.cc
View File

@ -21,14 +21,14 @@
#include <sys/time.h>
#endif
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render//video_render_frames.h"
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "system_wrappers/interface/event_wrapper.h"
#include "system_wrappers/interface/map_wrapper.h"
#include "system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/tick_util.h"
#include "system_wrappers/interface/trace.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/event_wrapper.h"
#include "webrtc/system_wrappers/interface/map_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"
namespace webrtc {

2
webrtc/modules/video_render/incoming_video_stream.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_INCOMING_VIDEO_STREAM_H_
#include "webrtc/modules/video_render/include/video_render.h"
#include "system_wrappers/interface/map_wrapper.h"
#include "webrtc/system_wrappers/interface/map_wrapper.h"
namespace webrtc {
class CriticalSectionWrapper;

9
webrtc/modules/video_render/linux/video_render_linux_impl.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_linux_impl.h"
#include "webrtc/modules/video_render/linux/video_render_linux_impl.h"
#include "critical_section_wrapper.h"
#include "trace.h"
#include "video_x11_render.h"
#include "webrtc/modules/video_render/linux/video_x11_render.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <X11/Xlib.h>
@ -267,4 +267,3 @@ int32_t VideoRenderLinuxImpl::SetBitmap(const void* bitMap,
}
} // namespace webrtc

8
webrtc/modules/video_render/linux/video_x11_channel.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_x11_channel.h"
#include "webrtc/modules/video_render/linux/video_x11_channel.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"
namespace webrtc {
@ -313,5 +313,3 @@ int32_t VideoX11Channel::GetStreamProperties(uint32_t& zOrder,
} // namespace webrtc

4
webrtc/modules/video_render/linux/video_x11_channel.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_CHANNEL_H_
#include "video_render_defines.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include <sys/shm.h>
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>

9
webrtc/modules/video_render/linux/video_x11_render.cc
View File

@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_x11_render.h"
#include "video_x11_channel.h"
#include "webrtc/modules/video_render/linux/video_x11_channel.h"
#include "webrtc/modules/video_render/linux/video_x11_render.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"
namespace webrtc {
@ -151,4 +151,3 @@ int32_t VideoX11Render::GetIncomingStreamProperties(
}
} // namespace webrtc

2
webrtc/modules/video_render/linux/video_x11_render.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_RENDER_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_LINUX_VIDEO_X11_RENDER_H_
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include <X11/Xlib.h>
#include <map>

15
webrtc/modules/video_render/mac/video_render_agl.cc
View File

@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "engine_configurations.h"
#include "webrtc/engine_configurations.h"
#if defined(CARBON_RENDERING)
#include "video_render_agl.h"
#include "webrtc/modules/video_render/mac/video_render_agl.h"
// includes
#include "critical_section_wrapper.h"
#include "event_wrapper.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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"
namespace webrtc {
@ -1999,4 +1999,3 @@ void VideoRenderAGL::UnlockAGLCntx()
} // namespace webrtc
#endif // CARBON_RENDERING

6
webrtc/modules/video_render/mac/video_render_agl.h
View File

@ -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(CARBON_RENDERING)
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_AGL_H_
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#define NEW_HIVIEW_PARENT_EVENT_HANDLER 1
#define NEW_HIVIEW_EVENT_HANDLER 1
@ -24,8 +24,8 @@
#include <AGL/agl.h>
#include <Carbon/Carbon.h>
#include <OpenGL/OpenGL.h>
#include <OpenGL/glu.h>
#include <OpenGL/glext.h>
#include <OpenGL/glu.h>
#include <list>
#include <map>

10
webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc
View File

@ -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(CARBON_RENDERING)
#include "video_render_mac_carbon_impl.h"
#include "critical_section_wrapper.h"
#include "video_render_agl.h"
#include "trace.h"
#include <AGL/agl.h>
#include "webrtc/modules/video_render/mac/video_render_agl.h"
#include "webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
namespace webrtc {

2
webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "engine_configurations.h"
#include "webrtc/engine_configurations.h"
#if defined(CARBON_RENDERING)
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_MAC_CARBON_IMPL_H_

2
webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h
View File

@ -8,7 +8,7 @@
* 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)

11
webrtc/modules/video_render/mac/video_render_nsopengl.h
View File

@ -8,7 +8,7 @@
* 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_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_NSOPENGL_H_
@ -16,16 +16,16 @@
#import <Cocoa/Cocoa.h>
#import <OpenGL/OpenGL.h>
#import <OpenGL/glu.h>
#import <OpenGL/glext.h>
#import <OpenGL/glu.h>
#include <QuickTime/QuickTime.h>
#include <list>
#include <map>
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#import "cocoa_render_view.h"
#import "cocoa_full_screen_window.h"
#import "webrtc/modules/video_render/mac/cocoa_full_screen_window.h"
#import "webrtc/modules/video_render/mac/cocoa_render_view.h"
class Trace;
@ -188,4 +188,3 @@ private: // variables
#endif // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_MAC_VIDEO_RENDER_NSOPENGL_H_
#endif // COCOA_RENDERING

20
webrtc/modules/video_render/test/testAPI/testAPI.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "testAPI.h"
#include "webrtc/modules/video_render/test/testAPI/testAPI.h"
#include <stdio.h>
@ -24,21 +24,21 @@
#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
#include <iostream>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <iostream>
#include <sys/time.h>
#endif
#include "common_types.h"
#include "process_thread.h"
#include "module_common_types.h"
#include "video_render_defines.h"
#include "video_render.h"
#include "tick_util.h"
#include "trace.h"
#include "system_wrappers/interface/sleep.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/utility/interface/process_thread.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/system_wrappers/interface/sleep.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/system_wrappers/interface/trace.h"
using namespace webrtc;

2
webrtc/modules/video_render/test/testAPI/testAPI.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_TEST_TESTAPI_TESTAPI_H
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_TEST_TESTAPI_TESTAPI_H
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
void RunVideoRenderTests(void* window, webrtc::VideoRenderType windowType);

6
webrtc/modules/video_render/video_render_frames.cc
View File

@ -12,9 +12,9 @@
#include <cassert>
#include "modules/interface/module_common_types.h"
#include "system_wrappers/interface/tick_util.h"
#include "system_wrappers/interface/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 {

2
webrtc/modules/video_render/video_render_frames.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_FRAMES_H_ // NOLINT
#include "webrtc/modules/video_render/include/video_render.h"
#include "system_wrappers/interface/list_wrapper.h"
#include "webrtc/system_wrappers/interface/list_wrapper.h"
namespace webrtc {

28
webrtc/modules/video_render/video_render_impl.cc
View File

@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "video_render_impl.h"
#include "engine_configurations.h"
#include "critical_section_wrapper.h"
#include "video_render_defines.h"
#include "trace.h"
#include "incoming_video_stream.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/i_video_render.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#include "webrtc/modules/video_render/incoming_video_stream.h"
#include "webrtc/modules/video_render/video_render_impl.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include <cassert>
#ifdef WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
#if defined (_WIN32)
#include "windows/video_render_windows_impl.h"
#include "webrtc/modules/video_render/windows/video_render_windows_impl.h"
#define STANDARD_RENDERING kRenderWindows
// WEBRTC_IOS should go before WEBRTC_MAC because WEBRTC_MAC
@ -35,20 +35,20 @@
#elif defined(WEBRTC_MAC)
#if defined(COCOA_RENDERING)
#define STANDARD_RENDERING kRenderCocoa
#include "mac/video_render_mac_cocoa_impl.h"
#include "webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h"
#elif defined(CARBON_RENDERING)
#define STANDARD_RENDERING kRenderCarbon
#include "mac/video_render_mac_carbon_impl.h"
#include "webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h"
#endif
#elif defined(WEBRTC_ANDROID)
#include "android/video_render_android_impl.h"
#include "android/video_render_android_surface_view.h"
#include "android/video_render_android_native_opengl2.h"
#include "webrtc/modules/video_render/android/video_render_android_impl.h"
#include "webrtc/modules/video_render/android/video_render_android_native_opengl2.h"
#include "webrtc/modules/video_render/android/video_render_android_surface_view.h"
#define STANDARD_RENDERING kRenderAndroid
#elif defined(WEBRTC_LINUX)
#include "linux/video_render_linux_impl.h"
#include "webrtc/modules/video_render/linux/video_render_linux_impl.h"
#define STANDARD_RENDERING kRenderX11
#else
@ -58,7 +58,7 @@
#endif // WEBRTC_INCLUDE_INTERNAL_VIDEO_RENDER
// For external rendering
#include "external/video_render_external_impl.h"
#include "webrtc/modules/video_render/external/video_render_external_impl.h"
#ifndef STANDARD_RENDERING
#define STANDARD_RENDERING kRenderExternal
#endif // STANDARD_RENDERING

6
webrtc/modules/video_render/video_render_impl.h
View File

@ -11,9 +11,9 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_IMPL_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_VIDEO_RENDER_IMPL_H_
#include "engine_configurations.h"
#include "video_render.h"
#include "map_wrapper.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/include/video_render.h"
#include "webrtc/system_wrappers/interface/map_wrapper.h"
namespace webrtc {
class CriticalSectionWrapper;

2
webrtc/modules/video_render/windows/i_video_render_win.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_I_VIDEO_RENDER_WIN_H_
#include "video_render.h"
#include "webrtc/modules/video_render/include/video_render.h"
namespace webrtc {

13
webrtc/modules/video_render/windows/video_render_direct3d9.cc
View File

@ -9,17 +9,17 @@
*/
// Own include file
#include "video_render_direct3d9.h"
#include "webrtc/modules/video_render/windows/video_render_direct3d9.h"
// System include files
#include <windows.h>
// WebRtc include files
#include "critical_section_wrapper.h"
#include "event_wrapper.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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"
namespace webrtc {
@ -1175,4 +1175,3 @@ int32_t VideoRenderDirect3D9::ConfigureRenderer(const uint32_t channel,
}
} // namespace webrtc

6
webrtc/modules/video_render/windows/video_render_direct3d9.h
View File

@ -12,16 +12,16 @@
#define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_WINDOWS_VIDEO_RENDER_DIRECT3D9_H_
// WebRtc includes
#include "i_video_render_win.h"
#include "webrtc/modules/video_render/windows/i_video_render_win.h"
#include <d3d9.h>
#include <d3dx9.h>
#include "ddraw.h"
#include <ddraw.h>
#include <Map>
// Added
#include "video_render_defines.h"
#include "webrtc/modules/video_render/include/video_render_defines.h"
#pragma comment(lib, "d3d9.lib") // located in DirectX SDK

11
webrtc/modules/video_render/windows/video_render_windows_impl.cc
View File

@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "engine_configurations.h"
#include "video_render_windows_impl.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/video_render/windows/video_render_windows_impl.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"
#ifdef DIRECT3D9_RENDERING
#include "video_render_direct3d9.h"
#include "webrtc/modules/video_render/windows/video_render_direct3d9.h"
#endif
#include <tchar.h>
@ -343,4 +343,3 @@ int32_t VideoRenderWindowsImpl::SetBitmap(const void* bitMap,
}
} // namespace webrtc

2
webrtc/modules/video_render/windows/video_render_windows_impl.h
View File

@ -15,7 +15,7 @@
#include <dxdiag.h>
#include "webrtc/modules/video_render/i_video_render.h"
#include "i_video_render_win.h"
#include "webrtc/modules/video_render/windows/i_video_render_win.h"
namespace webrtc {
class CriticalSectionWrapper;