FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

eglglessink: Also unref current caps after usage

Browse Source
This commit is contained in:
Sebastian Dröge 2012-09-24 12:36:12 +02:00
parent c2de59b19c
commit aa463f0274
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/eglgles/gsteglglessink.c
View File

@ -1084,6 +1084,11 @@ gst_eglglessink_stop (GstBaseSink * sink)
eglglessink->have_window = FALSE; eglglessink->have_window = FALSE;
} }
if (eglglessink->current_caps) {
gst_caps_unref (eglglessink->current_caps);
eglglessink->current_caps = NULL;
}
return TRUE; return TRUE;
} }
@ -2112,7 +2117,8 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
if (gst_caps_can_intersect (caps, eglglessink->current_caps)) { if (gst_caps_can_intersect (caps, eglglessink->current_caps)) {
GST_INFO_OBJECT (eglglessink, "Caps are compatible anyway"); GST_INFO_OBJECT (eglglessink, "Caps are compatible anyway");
goto SUCCEED; goto SUCCEED;
} else { }
GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring"); GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring");
if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) { if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) {
glDeleteBuffers (1, &eglglessink->vdata); glDeleteBuffers (1, &eglglessink->vdata);
@ -2140,7 +2146,11 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
eglDestroyContext (eglglessink->display, eglglessink->context); eglDestroyContext (eglglessink->display, eglglessink->context);
eglglessink->context = NULL; eglglessink->context = NULL;
} }
}
g_mutex_lock (eglglessink->flow_lock);
gst_caps_unref (eglglessink->current_caps);
eglglessink->current_caps = NULL;
g_mutex_unlock (eglglessink->flow_lock);
} }
if (!gst_eglglessink_choose_config (eglglessink)) { if (!gst_eglglessink_choose_config (eglglessink)) {

1
ext/eglgles/gsteglglessink.h
View File

@ -125,7 +125,6 @@ struct _GstEglGlesSink
GstVideoSink videosink; GstVideoSink videosink;
GstVideoFormat format; GstVideoFormat format;
GstCaps *current_caps; GstCaps *current_caps;
GstPad *sink;
GstVideoRectangle display_region; GstVideoRectangle display_region;
GList *supported_fmts; GList *supported_fmts;