ff761fba82
This changes the following module directories:
* webrtc/modules/audio_conference_mixer/interface
* webrtc/modules/interface
* webrtc/modules/media_file/interface
* webrtc/modules/rtp_rtcp/interface
* webrtc/modules/utility/interface
To avoid breaking downstream, I followed this recipe:
1. Copy the interface dir to a new sibling directory: include
2. Update the header guards in the include directory to match the style guide.
3. Update the header guards in the interface directory to match the ones in include. This is required to avoid getting redefinitions in the not-yet-updated downstream code.
4. Add a pragma warning in the header files in the interface dir. Example:
#pragma message("WARNING: webrtc/modules/interface is DEPRECATED; "
"use webrtc/modules/include")
5. Search for all source references to webrtc/modules/interface and update them to webrtc/modules/include (*.c*,*.h,*.mm,*.S)
6. Update all GYP+GN files. This required manual inspection since many subdirectories of webrtc/modules referenced the interface dir using ../interface etc(*.gyp*,*.gn*)
BUG=5095
TESTED=Passing compile-trybots with --clobber flag:
git cl try --clobber --bot=win_compile_rel --bot=linux_compile_rel --bot=android_compile_rel --bot=mac_compile_rel --bot=ios_rel -m tryserver.webrtc
R=stefan@webrtc.org, tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1417683006 .
Cr-Commit-Position: refs/heads/master@{#10500}
70 lines
2.5 KiB
Plaintext
70 lines
2.5 KiB
Plaintext
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "testAPI.h"
|
|
|
|
#include <iostream>
|
|
|
|
#import <Foundation/Foundation.h>
|
|
#import <Cocoa/Cocoa.h>
|
|
#import <AppKit/AppKit.h>
|
|
#import <QTKit/QTKit.h>
|
|
#include <sys/time.h>
|
|
|
|
#import "webrtc/modules/video_render/mac/cocoa_render_view.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/include/module_common_types.h"
|
|
#include "webrtc/modules/utility/include/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/include/tick_util.h"
|
|
#include "webrtc/system_wrappers/include/trace.h"
|
|
|
|
using namespace webrtc;
|
|
|
|
int WebRtcCreateWindow(CocoaRenderView*& cocoaRenderer, int winNum, int width, int height)
|
|
{
|
|
// In Cocoa, rendering is not done directly to a window like in Windows and Linux.
|
|
// It is rendererd to a Subclass of NSOpenGLView
|
|
|
|
// create cocoa container window
|
|
NSRect outWindowFrame = NSMakeRect(200, 800, width + 20, height + 20);
|
|
NSWindow* outWindow = [[NSWindow alloc] initWithContentRect:outWindowFrame
|
|
styleMask:NSTitledWindowMask
|
|
backing:NSBackingStoreBuffered
|
|
defer:NO];
|
|
[outWindow orderOut:nil];
|
|
[outWindow setTitle:@"Cocoa Renderer"];
|
|
[outWindow setBackgroundColor:[NSColor blueColor]];
|
|
|
|
// create renderer and attach to window
|
|
NSRect cocoaRendererFrame = NSMakeRect(10, 10, width, height);
|
|
cocoaRenderer = [[CocoaRenderView alloc] initWithFrame:cocoaRendererFrame];
|
|
[[outWindow contentView] addSubview:(NSView*)cocoaRenderer];
|
|
|
|
[outWindow makeKeyAndOrderFront:NSApp];
|
|
|
|
return 0;
|
|
}
|
|
|
|
int main (int argc, const char * argv[]) {
|
|
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
|
|
[NSApplication sharedApplication];
|
|
|
|
CocoaRenderView* testWindow;
|
|
WebRtcCreateWindow(testWindow, 0, 352, 288);
|
|
VideoRenderType windowType = kRenderCocoa;
|
|
void* window = (void*)testWindow;
|
|
|
|
RunVideoRenderTests(window, windowType);
|
|
|
|
[pool release];
|
|
}
|