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

gl: avoid adding a NULL pool to propose allocation

Browse source
This commit is contained in:
Matthew Waters 2014-04-02 22:42:50 +11:00 committed by Tim-Philipp Müller
parent 790f34c7a6
commit 71548893bf
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/gl/gstglimagesink.c
View file

@ -921,12 +921,14 @@ gst_glimage_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
goto config_failed; goto config_failed;
} }
/* we need at least 2 buffer because we hold on to the last one */ /* we need at least 2 buffer because we hold on to the last one */
if (pool) {
gst_query_add_allocation_pool (query, pool, size, 2, 0); gst_query_add_allocation_pool (query, pool, size, 2, 0);
gst_object_unref (pool);
}
/* we also support various metadata */ /* we also support various metadata */
gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0); gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);
gst_object_unref (pool);
gl_apis = gl_apis =
gst_gl_api_to_string (gst_gl_context_get_gl_api (glimage_sink->context)); gst_gl_api_to_string (gst_gl_context_get_gl_api (glimage_sink->context));

2
gst-libs/gst/gl/gstglfilter.c
View file

@ -806,8 +806,10 @@ gst_gl_filter_propose_allocation (GstBaseTransform * trans,
goto config_failed; goto config_failed;
} }
/* we need at least 2 buffer because we hold on to the last one */ /* we need at least 2 buffer because we hold on to the last one */
if (pool) {
gst_query_add_allocation_pool (query, pool, size, 1, 0); gst_query_add_allocation_pool (query, pool, size, 1, 0);
gst_object_unref (pool); gst_object_unref (pool);
}
/* we also support various metadata */ /* we also support various metadata */
gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0); gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);

7
gst-libs/gst/gl/gstglmixer.c
View file

@ -321,7 +321,7 @@ gst_gl_mixer_propose_allocation (GstGLMixer * mix,
GstBufferPool *pool; GstBufferPool *pool;
GstStructure *config; GstStructure *config;
GstCaps *caps; GstCaps *caps;
guint size; guint size = 0;
gboolean need_pool; gboolean need_pool;
GError *error = NULL; GError *error = NULL;
GstStructure *gl_context; GstStructure *gl_context;
@ -381,8 +381,11 @@ gst_gl_mixer_propose_allocation (GstGLMixer * mix,
if (!gst_buffer_pool_set_config (pool, config)) if (!gst_buffer_pool_set_config (pool, config))
goto config_failed; goto config_failed;
} }
if (pool) {
gst_query_add_allocation_pool (query, pool, size, 1, 0); gst_query_add_allocation_pool (query, pool, size, 1, 0);
gst_object_unref (pool); gst_object_unref (pool);
}
/* we also support various metadata */ /* we also support various metadata */
gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0); gst_query_add_allocation_meta (query, GST_VIDEO_META_API_TYPE, 0);
@ -1614,7 +1617,7 @@ gst_gl_mixer_process_textures (GstGLMixer * mix, GstBuffer * outbuf)
guint out_tex; guint out_tex;
guint array_index = 0; guint array_index = 0;
guint i; guint i;
gboolean res; gboolean res = TRUE;
GST_TRACE ("Processing buffers"); GST_TRACE ("Processing buffers");