mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

glimagesink: Cache caps for passing to the client draw call

Browse source 
Don't convert the GstVideoInfo to caps on every draw call,
just cache the caps and pass them into the GstSample.
This commit is contained in:
Jan Schmidt 2015-04-29 02:30:05 +10:00
parent 1de2e2bc39
commit ff12434b9f
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ext/gl/gstglimagesink.c
View file

@ -926,6 +926,11 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
GST_VIDEO_SINK_WIDTH (glimage_sink) = 1; GST_VIDEO_SINK_WIDTH (glimage_sink) = 1;
GST_VIDEO_SINK_HEIGHT (glimage_sink) = 1; GST_VIDEO_SINK_HEIGHT (glimage_sink) = 1;
/* Clear cached caps */
if (glimage_sink->caps) {
gst_caps_unref (glimage_sink->caps);
glimage_sink->caps = NULL;
}
/* we're losing the context, this pool is no use anymore */ /* we're losing the context, this pool is no use anymore */
if (glimage_sink->pool) { if (glimage_sink->pool) {
@ -1087,6 +1092,8 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
GST_VIDEO_SINK_HEIGHT (glimage_sink)); GST_VIDEO_SINK_HEIGHT (glimage_sink));
glimage_sink->info = vinfo; glimage_sink->info = vinfo;
glimage_sink->caps = gst_caps_ref (caps);
if (!_ensure_gl_setup (glimage_sink)) if (!_ensure_gl_setup (glimage_sink))
return FALSE; return FALSE;
@ -1475,7 +1482,6 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
gboolean do_redisplay = FALSE; gboolean do_redisplay = FALSE;
GstGLSyncMeta *sync_meta = NULL; GstGLSyncMeta *sync_meta = NULL;
GstSample *sample = NULL; GstSample *sample = NULL;
GstCaps *caps = NULL;
g_return_if_fail (GST_IS_GLIMAGE_SINK (gl_sink)); g_return_if_fail (GST_IS_GLIMAGE_SINK (gl_sink));
@ -1518,15 +1524,12 @@ gst_glimage_sink_on_draw (GstGLImageSink * gl_sink)
gl->BindTexture (GL_TEXTURE_2D, 0); gl->BindTexture (GL_TEXTURE_2D, 0);
caps = gst_video_info_to_caps (&gl_sink->info);
sample = gst_sample_new (gl_sink->stored_buffer, sample = gst_sample_new (gl_sink->stored_buffer,
caps, &GST_BASE_SINK (gl_sink)->segment, NULL); gl_sink->caps, &GST_BASE_SINK (gl_sink)->segment, NULL);
g_signal_emit (gl_sink, gst_glimage_sink_signals[CLIENT_DRAW_SIGNAL], 0, g_signal_emit (gl_sink, gst_glimage_sink_signals[CLIENT_DRAW_SIGNAL], 0,
gl_sink->context, sample, &do_redisplay); gl_sink->context, sample, &do_redisplay);
gst_caps_unref (caps);
gst_sample_unref (sample); gst_sample_unref (sample);
if (!do_redisplay) { if (!do_redisplay) {

1
ext/gl/gstglimagesink.h
View file

@ -61,6 +61,7 @@ struct _GstGLImageSink
//caps //caps
GstVideoInfo info; GstVideoInfo info;
GstCaps *caps;
GstGLDisplay *display; GstGLDisplay *display;
GstGLContext *context; GstGLContext *context;