mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

glimagesink: avoid updating the viewport in the draw loop

Browse source 
Fixes flashes/incorrect aspect ratio when resizing glimagesink on OSX.
This commit is contained in:
Matthew Waters 2015-09-16 17:28:05 +10:00 committed by Tim-Philipp Müller
parent 990a49fe4f
commit b537e98ae7
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/gl/gstglimagesink.c
View file

@ -1742,11 +1742,19 @@ gst_glimage_sink_cleanup_glthread (GstGLImageSink * gl_sink)
static void static void
gst_glimage_sink_on_resize (GstGLImageSink * gl_sink, gint width, gint height) gst_glimage_sink_on_resize (GstGLImageSink * gl_sink, gint width, gint height)
{ {
const GstGLFuncs *gl = gl_sink->context->gl_vtable;
GST_DEBUG_OBJECT (gl_sink, "GL Window resized to %ux%u", width, height); GST_DEBUG_OBJECT (gl_sink, "GL Window resized to %ux%u", width, height);
GST_GLIMAGE_SINK_LOCK (gl_sink); GST_GLIMAGE_SINK_LOCK (gl_sink);
gl_sink->output_mode_changed = TRUE; gl_sink->output_mode_changed = TRUE;
gst_glimage_sink_do_resize (gl_sink, width, height); gst_glimage_sink_do_resize (gl_sink, width, height);
gl->Viewport (gl_sink->display_rect.x, gl_sink->display_rect.y,
gl_sink->display_rect.w, gl_sink->display_rect.h);
GST_DEBUG_OBJECT (gl_sink, "GL output area now %u,%u %ux%u",
gl_sink->display_rect.x, gl_sink->display_rect.y,
gl_sink->display_rect.w, gl_sink->display_rect.h);
GST_GLIMAGE_SINK_UNLOCK (gl_sink); GST_GLIMAGE_SINK_UNLOCK (gl_sink);
} }
@ -1812,8 +1820,6 @@ gst_glimage_sink_do_resize (GstGLImageSink * gl_sink, gint width, gint height)
gl_sink->display_rect.w = width; gl_sink->display_rect.w = width;
gl_sink->display_rect.h = height; gl_sink->display_rect.h = height;
} }
gl_sink->update_viewport = TRUE;
} }
} }
@ -1852,18 +1858,12 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
if (gl_sink->caps_change && gl_sink->window_width > 0 if (gl_sink->caps_change && gl_sink->window_width > 0
&& gl_sink->window_height > 0) { && gl_sink->window_height > 0) {
/* FIXME: invoke a winsys resize event to get the correct viewport
* on OSX where the calayer messes with the viewport */
gst_glimage_sink_do_resize (gl_sink, gl_sink->window_width, gst_glimage_sink_do_resize (gl_sink, gl_sink->window_width,
gl_sink->window_height); gl_sink->window_height);
gl_sink->caps_change = FALSE; gl_sink->caps_change = FALSE;
} }
if (gl_sink->update_viewport == TRUE) {
gl->Viewport (gl_sink->display_rect.x, gl_sink->display_rect.y,
gl_sink->display_rect.w, gl_sink->display_rect.h);
GST_DEBUG_OBJECT (gl_sink, "GL output area now %u,%u %ux%u",
gl_sink->display_rect.x, gl_sink->display_rect.y,
gl_sink->display_rect.w, gl_sink->display_rect.h);
gl_sink->update_viewport = FALSE;
}
sync_meta = gst_buffer_get_gl_sync_meta (gl_sink->stored_sync); sync_meta = gst_buffer_get_gl_sync_meta (gl_sink->stored_sync);
if (sync_meta) if (sync_meta)

1
ext/gl/gstglimagesink.h
View file

@ -101,7 +101,6 @@ struct _GstGLImageSink
gboolean caps_change; gboolean caps_change;
guint window_width; guint window_width;
guint window_height; guint window_height;
gboolean update_viewport;
GstVideoRectangle display_rect; GstVideoRectangle display_rect;