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

Fix mac video_render implementation on cocoa.

Browse Source 
Hit this while playing around with all compile possibilities for issue 3770.

BUG=3770
TBR=mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7166 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org 2014-09-12 13:57:47 +00:00
parent f7e5f22f98
commit d2cf48de1a
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_render/mac/cocoa_full_screen_window.mm
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.
*/ */
#import "cocoa_full_screen_window.h" #include "webrtc/modules/video_render/mac/cocoa_full_screen_window.h"
#include "trace.h" #include "webrtc/system_wrappers/interface/trace.h"
using namespace webrtc; using namespace webrtc;

5
webrtc/modules/video_render/mac/cocoa_render_view.mm
View File

@ -10,8 +10,9 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
#import "cocoa_render_view.h"
#include "trace.h" #include "webrtc/modules/video_render/mac/cocoa_render_view.h"
#include "webrtc/system_wrappers/interface/trace.h"
using namespace webrtc; using namespace webrtc;

11
webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
View File

@ -11,12 +11,11 @@
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
#import "cocoa_render_view.h" #include "webrtc/modules/video_render/mac/cocoa_render_view.h"
#include "webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h"
#include "video_render_mac_cocoa_impl.h" #include "webrtc/modules/video_render/mac/video_render_nsopengl.h"
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "video_render_nsopengl.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "trace.h"
namespace webrtc { namespace webrtc {

10
webrtc/modules/video_render/mac/video_render_nsopengl.mm
View File

@ -11,12 +11,12 @@
#include "webrtc/engine_configurations.h" #include "webrtc/engine_configurations.h"
#if defined(COCOA_RENDERING) #if defined(COCOA_RENDERING)
#include "video_render_nsopengl.h"
#include "critical_section_wrapper.h"
#include "event_wrapper.h"
#include "trace.h"
#include "thread_wrapper.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_render/mac/video_render_nsopengl.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 { namespace webrtc {