diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/osxvideo/cocoawindow.m | 2 | ||||
| -rw-r--r-- | sys/osxvideo/osxvideosink.m | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m index 6a6281c54..9c894dd90 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 2e239e8d6..4419d37b8 100644 --- a/sys/osxvideo/osxvideosink.m +++ b/sys/osxvideo/osxvideosink.m @@ -700,6 +700,10 @@ gst_osx_video_sink_set_window_handle (GstXOverlay * overlay, guintptr handle_id) osxvideosink->osxwindow->gstview, @selector(addToSuperview:), osxvideosink->superview, YES); } + + if (window_id) { + osxvideosink->osxwindow->internal = FALSE; + } } static void @@ -863,7 +867,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]; |