From a8fe984d6589bf41562ebb06ef224dc9c5cdc519 Mon Sep 17 00:00:00 2001
From: Alexey Chernov <achernov@neosphere.com>
Date: Fri, 11 Jan 2013 19:24:43 +0400
Subject: osxvideosink: Fix crash in osxvideosink with external window output

---
 sys/osxvideo/cocoawindow.m  |  2 --
 sys/osxvideo/osxvideosink.m | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'sys/osxvideo')

diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index 3ba3812f2..6b9540ecf 100644
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -69,8 +69,6 @@
   width = size.width;
   height = size.height;
 
-  [gstview setVideoSize: (int) width:(int) height];
-
   [super setContentSize:size];
 }
 
diff --git a/sys/osxvideo/osxvideosink.m b/sys/osxvideo/osxvideosink.m
index 349216421..873df0609 100644
--- a/sys/osxvideo/osxvideosink.m
+++ b/sys/osxvideo/osxvideosink.m
@@ -683,6 +683,10 @@ gst_osx_video_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle
         osxvideosink->osxwindow->gstview,
         @selector(addToSuperview:), osxvideosink->superview, YES);
   }
+
+  if (window_id) {
+    osxvideosink->osxwindow->internal = FALSE;
+  }
 }
 
 static void
@@ -838,7 +842,12 @@ gst_osx_video_sink_get_type (void)
 
   GST_INFO_OBJECT (osxvideosink, "resizing");
   NSSize size = {osxwindow->width, osxwindow->height};
-  [osxwindow->win setContentSize:size];
+  if (osxwindow->internal) {
+    [osxwindow->win setContentSize:size];
+  }
+  if (osxwindow->gstview) {
+      [osxwindow->gstview setVideoSize :(int)osxwindow->width :(int)osxwindow->height];
+  }
   GST_INFO_OBJECT (osxvideosink, "done");
 
   [pool release];
-- 
cgit v1.2.3