jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: Make OSX test application compatible w/ windowless contexts

master
Palana 2015-08-11 14:53:13 +02:00
parent a14d242369
commit a56109b6e6
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/osx/test.mm
View File

@ -32,11 +32,14 @@ using SourceContext = OBSUniqueHandle<obs_source,
using SceneContext = OBSUniqueHandle<obs_scene, using SceneContext = OBSUniqueHandle<obs_scene,
DECLARE_DELETER(obs_scene_release)>; DECLARE_DELETER(obs_scene_release)>;
using DisplayContext = OBSUniqueHandle<obs_display,
DECLARE_DELETER(obs_display_destroy)>;
#undef DECLARE_DELETER #undef DECLARE_DELETER
/* --------------------------------------------------- */ /* --------------------------------------------------- */
static void CreateOBS(NSView *view) static void CreateOBS()
{ {
if (!obs_startup("en")) if (!obs_startup("en"))
throw "Couldn't create OBS"; throw "Couldn't create OBS";
@ -51,14 +54,23 @@ static void CreateOBS(NSView *view)
ovi.base_height = cy; ovi.base_height = cy;
ovi.output_width = cx; ovi.output_width = cx;
ovi.output_height = cy; ovi.output_height = cy;
ovi.window_width = cx;
ovi.window_height = cy;
ovi.window.view = view;
if (obs_reset_video(&ovi) != 0) if (obs_reset_video(&ovi) != 0)
throw "Couldn't initialize video"; throw "Couldn't initialize video";
} }
static DisplayContext CreateDisplay(NSView *view)
{
gs_init_data info = {};
info.cx = cx;
info.cy = cy;
info.format = GS_RGBA;
info.zsformat = GS_ZS_NONE;
info.window.view = view;
return DisplayContext{obs_display_create(&info)};
}
static SceneContext SetupScene() static SceneContext SetupScene()
{ {
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
@ -91,6 +103,7 @@ static SceneContext SetupScene()
{ {
NSWindow *win; NSWindow *win;
NSView *view; NSView *view;
DisplayContext display;
SceneContext scene; SceneContext scene;
} }
- (void)applicationDidFinishLaunching:(NSNotification*)notification; - (void)applicationDidFinishLaunching:(NSNotification*)notification;
@ -117,6 +130,8 @@ static SceneContext SetupScene()
if (!view) if (!view)
throw "Could not create view"; throw "Could not create view";
CreateOBS();
win.title = @"foo"; win.title = @"foo";
win.delegate = self; win.delegate = self;
win.contentView = view; win.contentView = view;
@ -125,11 +140,11 @@ static SceneContext SetupScene()
[win center]; [win center];
[win makeMainWindow]; [win makeMainWindow];
CreateOBS(view); display = CreateDisplay(view);
scene = SetupScene(); scene = SetupScene();
obs_add_draw_callback( obs_display_add_draw_callback(display.get(),
[](void *, uint32_t, uint32_t) { [](void *, uint32_t, uint32_t) {
obs_render_main_view(); obs_render_main_view();
}, nullptr); }, nullptr);
@ -154,6 +169,7 @@ static SceneContext SetupScene()
obs_set_output_source(0, nullptr); obs_set_output_source(0, nullptr);
scene.reset(); scene.reset();
display.reset();
obs_shutdown(); obs_shutdown();
NSLog(@"Number of memory leaks: %lu", bnum_allocs()); NSLog(@"Number of memory leaks: %lu", bnum_allocs());