Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Side by Side Diff: webrtc/modules/video_render/test/testAPI/testAPI_mac.mm

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "testAPI.h" 11 #include "testAPI.h"
12 12
13 #include <iostream> 13 #include <iostream>
14 14
15 #import <Foundation/Foundation.h> 15 #import <Foundation/Foundation.h>
16 #import <Cocoa/Cocoa.h> 16 #import <Cocoa/Cocoa.h>
17 #import <AppKit/AppKit.h> 17 #import <AppKit/AppKit.h>
18 #import <QTKit/QTKit.h> 18 #import <QTKit/QTKit.h>
19 #include <sys/time.h> 19 #include <sys/time.h>
20 20
21 #import "webrtc/modules/video_render/mac/cocoa_render_view.h" 21 #import "webrtc/modules/video_render/mac/cocoa_render_view.h"
22 #include "webrtc/common_types.h" 22 #include "webrtc/common_types.h"
23 #include "webrtc/modules/interface/module_common_types.h" 23 #include "webrtc/modules/interface/module_common_types.h"
24 #include "webrtc/modules/utility/interface/process_thread.h" 24 #include "webrtc/modules/utility/interface/process_thread.h"
25 #include "webrtc/modules/video_render/include/video_render.h" 25 #include "webrtc/modules/video_render/include/video_render.h"
26 #include "webrtc/modules/video_render/include/video_render_defines.h" 26 #include "webrtc/modules/video_render/include/video_render_defines.h"
27 #include "webrtc/system_wrappers/interface/tick_util.h" 27 #include "webrtc/system_wrappers/include/tick_util.h"
28 #include "webrtc/system_wrappers/interface/trace.h" 28 #include "webrtc/system_wrappers/include/trace.h"
29 29
30 using namespace webrtc; 30 using namespace webrtc;
31 31
32 int WebRtcCreateWindow(CocoaRenderView*& cocoaRenderer, int winNum, int width, i nt height) 32 int WebRtcCreateWindow(CocoaRenderView*& cocoaRenderer, int winNum, int width, i nt height)
33 { 33 {
34 // In Cocoa, rendering is not done directly to a window like in Windows and Linux. 34 // In Cocoa, rendering is not done directly to a window like in Windows and Linux.
35 // It is rendererd to a Subclass of NSOpenGLView 35 // It is rendererd to a Subclass of NSOpenGLView
36 36
37 // create cocoa container window 37 // create cocoa container window
38 NSRect outWindowFrame = NSMakeRect(200, 800, width + 20, height + 20); 38 NSRect outWindowFrame = NSMakeRect(200, 800, width + 20, height + 20);
(...skipping 21 matching lines...) Expand all
60 60
61 CocoaRenderView* testWindow; 61 CocoaRenderView* testWindow;
62 WebRtcCreateWindow(testWindow, 0, 352, 288); 62 WebRtcCreateWindow(testWindow, 0, 352, 288);
63 VideoRenderType windowType = kRenderCocoa; 63 VideoRenderType windowType = kRenderCocoa;
64 void* window = (void*)testWindow; 64 void* window = (void*)testWindow;
65 65
66 RunVideoRenderTests(window, windowType); 66 RunVideoRenderTests(window, windowType);
67 67
68 [pool release]; 68 [pool release];
69 } 69 }
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/test/testAPI/testAPI.cc ('k') | webrtc/modules/video_render/video_render_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698