[555/906] Make the query for a GstGLDisplay a pad peer query

Allows the query to pass through bin boundaries and makes it possible for
arbitrary gl elements to be placed in bins.
This commit is contained in:
Matthew Waters 2012-08-10 15:31:20 +10:00 committed by Tim-Philipp Müller
parent c7ddead74b
commit 9761f2cfa1
2 changed files with 169 additions and 243 deletions

View file

@ -62,9 +62,6 @@ static void gst_gl_filter_set_property (GObject * object, guint prop_id,
static void gst_gl_filter_get_property (GObject * object, guint prop_id, static void gst_gl_filter_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static gboolean gst_gl_filter_src_query (GstPad * pad, GstObject * parent,
GstQuery * query);
static GstCaps *gst_gl_filter_transform_caps (GstBaseTransform * bt, static GstCaps *gst_gl_filter_transform_caps (GstBaseTransform * bt,
GstPadDirection direction, GstCaps * caps, GstCaps * filter); GstPadDirection direction, GstCaps * caps, GstCaps * filter);
static void gst_gl_filter_reset (GstGLFilter * filter); static void gst_gl_filter_reset (GstGLFilter * filter);
@ -133,11 +130,6 @@ gst_gl_filter_class_init (GstGLFilterClass * klass)
static void static void
gst_gl_filter_init (GstGLFilter * filter) gst_gl_filter_init (GstGLFilter * filter)
{ {
GstBaseTransform *base_trans = GST_BASE_TRANSFORM (filter);
gst_pad_set_query_function (base_trans->srcpad,
GST_DEBUG_FUNCPTR (gst_gl_filter_src_query));
gst_gl_filter_reset (filter); gst_gl_filter_reset (filter);
} }
@ -172,40 +164,6 @@ gst_gl_filter_get_property (GObject * object, guint prop_id,
} }
} }
static gboolean
gst_gl_filter_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
{
gboolean res = FALSE;
GstGLFilter *filter = GST_GL_FILTER (parent);
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CUSTOM:
{
GstStructure *structure = gst_query_writable_structure (query);
if (filter->display) {
/* this gl filter is a sink in terms of the gl chain */
gst_structure_set (structure, "gstgldisplay", G_TYPE_POINTER,
filter->display, NULL);
} else {
gchar *name;
/* at least one gl element is after in our gl chain */
name = gst_element_get_name (parent);
res = g_strcmp0 (name, gst_structure_get_name (structure)) == 0;
g_free (name);
}
if (!res)
res = gst_pad_query_default (pad, parent, query);
break;
}
default:
res = gst_pad_query_default (pad, parent, query);
break;
}
return res;
}
static void static void
gst_gl_filter_reset (GstGLFilter * filter) gst_gl_filter_reset (GstGLFilter * filter)
{ {
@ -238,49 +196,27 @@ gst_gl_filter_start (GstBaseTransform * bt)
{ {
GstGLFilter *filter = GST_GL_FILTER (bt); GstGLFilter *filter = GST_GL_FILTER (bt);
GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter); GstGLFilterClass *filter_class = GST_GL_FILTER_GET_CLASS (filter);
GstElement *parent = GST_ELEMENT (gst_element_get_parent (filter)); GstStructure *structure;
GstStructure *structure = NULL; GstQuery *display_query;
GstQuery *query = NULL; const GValue *id_value;
gboolean isPerformed = FALSE;
gchar *name;
if (!parent) { structure = gst_structure_new_empty ("gstgldisplay");
GST_ELEMENT_ERROR (filter, CORE, STATE_CHANGE, (NULL), display_query = gst_query_new_custom (GST_QUERY_CUSTOM, structure);
("A parent bin is required"));
if (!gst_pad_peer_query (bt->srcpad, display_query)) {
GST_WARNING ("Could not query GstGLDisplay from downstream");
return FALSE; return FALSE;
} }
name = gst_element_get_name (filter); id_value = gst_structure_get_value (structure, "gstgldisplay");
structure = gst_structure_new_empty (name);
query = gst_query_new_custom (GST_QUERY_CUSTOM, structure);
g_free (name);
isPerformed = gst_element_query (parent, query);
if (isPerformed) {
const GValue *id_value =
gst_structure_get_value (structure, "gstgldisplay");
if (G_VALUE_HOLDS_POINTER (id_value)) if (G_VALUE_HOLDS_POINTER (id_value))
/* at least one gl element is after in our gl chain */ /* at least one gl element is after in our gl chain */
filter->display = filter->display =
g_object_ref (GST_GL_DISPLAY (g_value_get_pointer (id_value))); g_object_ref (GST_GL_DISPLAY (g_value_get_pointer (id_value)));
else { else {
/* this gl filter is a sink in terms of the gl chain */ GST_WARNING ("Incorrect GstGLDisplay from downstream");
filter->display = gst_gl_display_new ();
isPerformed = gst_gl_display_create_context (filter->display,
filter->external_gl_context);
if (!isPerformed)
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
}
}
gst_query_unref (query);
gst_object_unref (GST_OBJECT (parent));
if (!isPerformed)
return FALSE; return FALSE;
}
if (filter_class->onStart) if (filter_class->onStart)
filter_class->onStart (filter); filter_class->onStart (filter);
@ -389,59 +325,52 @@ gst_gl_filter_set_caps (GstBaseTransform * bt, GstCaps * incaps,
{ {
GstVideoInfo info; GstVideoInfo info;
GstGLFilter *filter; GstGLFilter *filter;
gboolean ret;
GstGLFilterClass *filter_class; GstGLFilterClass *filter_class;
ret = FALSE;
filter = GST_GL_FILTER (bt); filter = GST_GL_FILTER (bt);
filter_class = GST_GL_FILTER_GET_CLASS (filter); filter_class = GST_GL_FILTER_GET_CLASS (filter);
if (!filter->display) if (!gst_video_info_from_caps (&info, outcaps))
return FALSE; goto wrong_caps;
ret = gst_video_info_from_caps (&info, outcaps);
filter->width = GST_VIDEO_INFO_WIDTH (&info); filter->width = GST_VIDEO_INFO_WIDTH (&info);
filter->height = GST_VIDEO_INFO_HEIGHT (&info); filter->height = GST_VIDEO_INFO_HEIGHT (&info);
if (!ret) {
GST_DEBUG ("bad caps");
return FALSE;
}
//blocking call, generate a FBO //blocking call, generate a FBO
ret = gst_gl_display_gen_fbo (filter->display, filter->width, filter->height, if (!gst_gl_display_gen_fbo (filter->display, filter->width, filter->height,
&filter->fbo, &filter->depthbuffer); &filter->fbo, &filter->depthbuffer))
goto display_error;
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE;
}
if (filter_class->display_init_cb != NULL) { if (filter_class->display_init_cb != NULL) {
gst_gl_display_thread_add (filter->display, gst_gl_filter_start_gl, filter); gst_gl_display_thread_add (filter->display, gst_gl_filter_start_gl, filter);
} }
if (filter_class->onInitFBO) if (filter_class->onInitFBO) {
ret = filter_class->onInitFBO (filter); if (!filter_class->onInitFBO (filter))
goto display_error;
}
if (!ret) { if (filter_class->set_caps) {
if (!filter_class->set_caps (filter, incaps, outcaps))
goto display_error;
}
GST_DEBUG ("set_caps %dx%d", filter->width, filter->height);
return TRUE;
/* ERRORS */
wrong_caps:
{
GST_WARNING ("Wrong caps");
return FALSE;
}
display_error:
{
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND, GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL)); GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE; return FALSE;
} }
if (filter_class->set_caps)
ret = filter_class->set_caps (filter, incaps, outcaps);
if (!ret) {
GST_ELEMENT_ERROR (filter, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (filter->display), (NULL));
return FALSE;
}
GST_DEBUG ("set_caps %d %d", filter->width, filter->height);
return ret;
} }
static gboolean static gboolean

View file

@ -273,16 +273,12 @@ beach:
} }
static GstCaps * static GstCaps *
gst_gl_mixer_pad_sink_getcaps (GstPad * pad, GstObject * parent, gst_gl_mixer_pad_sink_getcaps (GstPad * pad, GstGLMixer * mix, GstCaps * filter)
GstCaps * filter)
{ {
GstGLMixer *mix;
GstCaps *srccaps; GstCaps *srccaps;
GstStructure *s; GstStructure *s;
gint i, n; gint i, n;
mix = GST_GL_MIXER (parent);
srccaps = gst_pad_get_current_caps (GST_PAD (mix->srcpad)); srccaps = gst_pad_get_current_caps (GST_PAD (mix->srcpad));
if (srccaps == NULL) if (srccaps == NULL)
srccaps = gst_pad_get_pad_template_caps (GST_PAD (mix->srcpad)); srccaps = gst_pad_get_pad_template_caps (GST_PAD (mix->srcpad));
@ -306,16 +302,14 @@ gst_gl_mixer_pad_sink_getcaps (GstPad * pad, GstObject * parent,
} }
static gboolean static gboolean
gst_gl_mixer_pad_sink_acceptcaps (GstPad * pad, GstObject * parent, gst_gl_mixer_pad_sink_acceptcaps (GstPad * pad, GstGLMixer * mix,
GstCaps * caps) GstCaps * caps)
{ {
gboolean ret; gboolean ret;
GstGLMixer *mix;
GstCaps *accepted_caps; GstCaps *accepted_caps;
gint i, n; gint i, n;
GstStructure *s; GstStructure *s;
mix = GST_GL_MIXER (parent);
GST_DEBUG_OBJECT (pad, "%" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (pad, "%" GST_PTR_FORMAT, caps);
accepted_caps = gst_pad_get_current_caps (GST_PAD (mix->srcpad)); accepted_caps = gst_pad_get_current_caps (GST_PAD (mix->srcpad));
@ -346,11 +340,14 @@ gst_gl_mixer_pad_sink_acceptcaps (GstPad * pad, GstObject * parent,
} }
static gboolean static gboolean
gst_gl_mixer_pad_sink_query (GstPad * pad, GstObject * parent, GstQuery * query) gst_gl_mixer_sink_query (GstCollectPads * pads, GstCollectData * data,
GstQuery * query, GstGLMixer * mix)
{ {
GstPad *pad = data->pad;
GstGLMixerPad *mixpad = GST_GL_MIXER_PAD (data->pad);
gboolean ret = FALSE; gboolean ret = FALSE;
GST_TRACE ("QUERY %d", GST_QUERY_TYPE (query)); GST_TRACE ("QUERY %" GST_PTR_FORMAT, query);
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_CAPS: case GST_QUERY_CAPS:
@ -358,7 +355,7 @@ gst_gl_mixer_pad_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
GstCaps *filter, *caps; GstCaps *filter, *caps;
gst_query_parse_caps (query, &filter); gst_query_parse_caps (query, &filter);
caps = gst_gl_mixer_pad_sink_getcaps (pad, parent, filter); caps = gst_gl_mixer_pad_sink_getcaps (pad, mix, filter);
gst_query_set_caps_result (query, caps); gst_query_set_caps_result (query, caps);
gst_caps_unref (caps); gst_caps_unref (caps);
ret = TRUE; ret = TRUE;
@ -369,13 +366,46 @@ gst_gl_mixer_pad_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
GstCaps *caps; GstCaps *caps;
gst_query_parse_accept_caps (query, &caps); gst_query_parse_accept_caps (query, &caps);
ret = gst_gl_mixer_pad_sink_acceptcaps (pad, parent, caps); ret = gst_gl_mixer_pad_sink_acceptcaps (pad, mix, caps);
gst_query_set_accept_caps_result (query, ret); gst_query_set_accept_caps_result (query, ret);
ret = TRUE; ret = TRUE;
break; break;
} }
case GST_QUERY_CUSTOM:
{
/* mix is a sink in terms of gl chain, so we are sharing the gldisplay that
* comes from src pad with every display of the sink pads */
GstStructure *structure = gst_query_writable_structure (query);
if (gst_structure_has_name (structure, "gstgldisplay")) {
gulong foreign_gl_context = 0;
foreign_gl_context =
gst_gl_display_get_internal_gl_context (mix->display);
g_return_val_if_fail (mixpad->display != NULL, FALSE);
gst_gl_display_activate_gl_context (mix->display, FALSE);
ret = gst_gl_display_create_context (mixpad->display,
foreign_gl_context);
gst_gl_display_activate_gl_context (mix->display, TRUE);
if (ret) {
gst_structure_set (structure, "gstgldisplay", G_TYPE_POINTER,
mix->display, NULL);
} else {
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (mixpad->display), (NULL));
}
} else {
ret = gst_collect_pads_query_default (pads, data, query, FALSE);
}
break;
}
default: default:
ret = gst_pad_query_default (pad, parent, query); ret = gst_collect_pads_query_default (pads, data, query, FALSE);
break; break;
} }
@ -385,8 +415,6 @@ gst_gl_mixer_pad_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
static void static void
gst_gl_mixer_pad_init (GstGLMixerPad * mixerpad) gst_gl_mixer_pad_init (GstGLMixerPad * mixerpad)
{ {
gst_pad_set_query_function (GST_PAD (mixerpad), gst_gl_mixer_pad_sink_query);
mixerpad->display = NULL; mixerpad->display = NULL;
} }
@ -418,6 +446,9 @@ static void gst_gl_mixer_finalize (GObject * object);
static gboolean gst_gl_mixer_src_query (GstPad * pad, GstObject * object, static gboolean gst_gl_mixer_src_query (GstPad * pad, GstObject * object,
GstQuery * query); GstQuery * query);
static gboolean gst_gl_mixer_src_activate_mode (GstPad * pad,
GstObject * parent, GstPadMode mode, gboolean active);
static gboolean gst_gl_mixer_activate (GstGLMixer * mix, gboolean activate);
static GstFlowReturn gst_gl_mixer_sink_clip (GstCollectPads * pads, static GstFlowReturn gst_gl_mixer_sink_clip (GstCollectPads * pads,
GstCollectData * data, GstBuffer * buf, GstBuffer ** outbuf, GstCollectData * data, GstBuffer * buf, GstBuffer ** outbuf,
GstGLMixer * mix); GstGLMixer * mix);
@ -588,6 +619,8 @@ gst_gl_mixer_init (GstGLMixer * mix)
GST_DEBUG_FUNCPTR (gst_gl_mixer_src_query)); GST_DEBUG_FUNCPTR (gst_gl_mixer_src_query));
gst_pad_set_event_function (GST_PAD (mix->srcpad), gst_pad_set_event_function (GST_PAD (mix->srcpad),
GST_DEBUG_FUNCPTR (gst_gl_mixer_src_event)); GST_DEBUG_FUNCPTR (gst_gl_mixer_src_event));
gst_pad_set_activatemode_function (GST_PAD (mix->srcpad),
GST_DEBUG_FUNCPTR (gst_gl_mixer_src_activate_mode));
gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad); gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad);
mix->collect = gst_collect_pads_new (); mix->collect = gst_collect_pads_new ();
@ -596,6 +629,8 @@ gst_gl_mixer_init (GstGLMixer * mix)
(GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_gl_mixer_collected), mix); (GstCollectPadsFunction) GST_DEBUG_FUNCPTR (gst_gl_mixer_collected), mix);
gst_collect_pads_set_event_function (mix->collect, gst_collect_pads_set_event_function (mix->collect,
(GstCollectPadsEventFunction) gst_gl_mixer_sink_event, mix); (GstCollectPadsEventFunction) gst_gl_mixer_sink_event, mix);
gst_collect_pads_set_query_function (mix->collect,
(GstCollectPadsQueryFunction) gst_gl_mixer_sink_query, mix);
gst_collect_pads_set_clip_function (mix->collect, gst_collect_pads_set_clip_function (mix->collect,
(GstCollectPadsClipFunction) gst_gl_mixer_sink_clip, mix); (GstCollectPadsClipFunction) gst_gl_mixer_sink_clip, mix);
@ -888,68 +923,6 @@ gst_gl_mixer_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
case GST_QUERY_CAPS: case GST_QUERY_CAPS:
res = gst_gl_mixer_query_caps (pad, parent, query); res = gst_gl_mixer_query_caps (pad, parent, query);
break; break;
case GST_QUERY_CUSTOM:
{
/* mix is a sink in terms of gl chain, so we are sharing the gldisplay that
* comes from src pad with every display of the sink pads */
GSList *walk = mix->sinkpads;
GstStructure *structure = gst_query_writable_structure (query);
gchar *name = gst_element_get_name (mix);
res = g_strcmp0 (name, gst_structure_get_name (structure)) == 0;
g_free (name);
if (!res) {
GstGLDisplay *foreign_display = NULL;
gulong foreign_gl_context = 0;
if (mix->display) {
/* this gl filter is a sink in terms of the gl chain */
foreign_display = mix->display;
} else {
/* at least one gl element is after in our gl chain */
/* id_value is set by upstream element of itself when going
* to paused state */
const GValue *id_value =
gst_structure_get_value (structure, "gstgldisplay");
foreign_display = GST_GL_DISPLAY (g_value_get_pointer (id_value));
}
foreign_gl_context =
gst_gl_display_get_internal_gl_context (foreign_display);
/* iterate on each sink pad until reaching the gl element
* that requested the query */
while (!res && walk) {
GstGLMixerPad *sink_pad = GST_GL_MIXER_PAD (walk->data);
GstPad *peer = gst_pad_get_peer (GST_PAD_CAST (sink_pad));
walk = g_slist_next (walk);
g_return_val_if_fail (sink_pad->display != NULL, FALSE);
gst_gl_display_activate_gl_context (foreign_display, FALSE);
res =
gst_gl_display_create_context (sink_pad->display,
foreign_gl_context);
gst_gl_display_activate_gl_context (foreign_display, TRUE);
if (res)
gst_structure_set (structure, "gstgldisplay", G_TYPE_POINTER,
sink_pad->display, NULL);
else
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (sink_pad->display), (NULL));
/* does not work:
* res = gst_pad_query_default (GST_PAD_CAST (sink_pad), query);*/
res = gst_pad_query (peer, query);
gst_object_unref (peer);
}
}
break;
}
default: default:
/* FIXME, needs a custom query handler because we have multiple /* FIXME, needs a custom query handler because we have multiple
* sinkpads, send to the master pad until then */ * sinkpads, send to the master pad until then */
@ -961,6 +934,59 @@ gst_gl_mixer_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
return res; return res;
} }
static gboolean
gst_gl_mixer_src_activate_mode (GstPad * pad, GstObject * parent,
GstPadMode mode, gboolean active)
{
gboolean result = FALSE;
GstGLMixer *mix;
mix = GST_GL_MIXER (parent);
switch (mode) {
case GST_PAD_MODE_PULL:
case GST_PAD_MODE_PUSH:
{
result = gst_gl_mixer_activate (mix, active);
break;
}
default:
result = TRUE;
break;
}
return result;
}
static gboolean
gst_gl_mixer_activate (GstGLMixer * mix, gboolean activate)
{
if (activate) {
GstStructure *structure;
GstQuery *display_query;
const GValue *id_value;
structure = gst_structure_new_empty ("gstgldisplay");
display_query = gst_query_new_custom (GST_QUERY_CUSTOM, structure);
if (!gst_pad_peer_query (mix->srcpad, display_query)) {
GST_WARNING ("Could not query GstGLDisplay from downstream");
return FALSE;
}
id_value = gst_structure_get_value (structure, "gstgldisplay");
if (G_VALUE_HOLDS_POINTER (id_value))
mix->display =
g_object_ref (GST_GL_DISPLAY (g_value_get_pointer (id_value)));
else {
GST_WARNING ("Incorrect GstGLDisplay from downstream");
return FALSE;
}
}
return TRUE;
}
static gboolean static gboolean
gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query) gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query)
{ {
@ -969,6 +995,7 @@ gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query)
GstCaps *caps; GstCaps *caps;
guint min, max, size; guint min, max, size;
gboolean update_pool; gboolean update_pool;
guint idx;
gst_query_parse_allocation (query, &caps, NULL); gst_query_parse_allocation (query, &caps, NULL);
@ -991,8 +1018,15 @@ gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query)
config = gst_buffer_pool_get_config (pool); config = gst_buffer_pool_get_config (pool);
gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_set_params (config, caps, size, min, max);
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, &idx)) {
gst_buffer_pool_config_add_option (config,
GST_BUFFER_POOL_OPTION_VIDEO_META);
}
if (gst_query_find_allocation_meta (query, GST_GL_META_API_TYPE, &idx)) {
gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_GL_META); gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_GL_META);
}
gst_buffer_pool_set_config (pool, config); gst_buffer_pool_set_config (pool, config);
if (update_pool) if (update_pool)
@ -1039,7 +1073,7 @@ gst_gl_mixer_set_allocation (GstGLMixer * mix,
gst_object_unref (oldpool); gst_object_unref (oldpool);
} }
if (oldalloc) { if (oldalloc) {
gst_allocator_unref (oldalloc); gst_object_unref (oldalloc);
} }
if (oldquery) { if (oldquery) {
gst_query_unref (oldquery); gst_query_unref (oldquery);
@ -1131,12 +1165,8 @@ gst_gl_mixer_src_setcaps (GstPad * pad, GstGLMixer * mix, GstCaps * caps)
GST_GL_MIXER_UNLOCK (mix); GST_GL_MIXER_UNLOCK (mix);
if (!gst_gl_display_gen_fbo (mix->display, GST_VIDEO_INFO_WIDTH (&mix->info), if (!gst_gl_display_gen_fbo (mix->display, GST_VIDEO_INFO_WIDTH (&mix->info),
GST_VIDEO_INFO_HEIGHT (&mix->info), &mix->fbo, &mix->depthbuffer)) { GST_VIDEO_INFO_HEIGHT (&mix->info), &mix->fbo, &mix->depthbuffer))
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND, goto display_error;
GST_GL_DISPLAY_ERR_MSG (mix->display), (NULL));
ret = FALSE;
goto done;
}
if (mixer_class->set_caps) if (mixer_class->set_caps)
mixer_class->set_caps (mix, caps); mixer_class->set_caps (mix, caps);
@ -1149,6 +1179,14 @@ done:
priv->negotiated = ret; priv->negotiated = ret;
return ret; return ret;
/* ERRORS */
display_error:
{
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,
GST_GL_DISPLAY_ERR_MSG (mix->display), (NULL));
return FALSE;
}
} }
static GstPad * static GstPad *
@ -1595,10 +1633,6 @@ gst_gl_mixer_collected (GstCollectPads * pads, GstGLMixer * mix)
ret = gst_buffer_pool_acquire_buffer (mix->priv->pool, &outbuf, NULL); ret = gst_buffer_pool_acquire_buffer (mix->priv->pool, &outbuf, NULL);
gst_buffer_add_video_meta (outbuf, 0, GST_VIDEO_INFO_FORMAT (&mix->info),
GST_VIDEO_INFO_WIDTH (&mix->info), GST_VIDEO_INFO_HEIGHT (&mix->info));
gst_buffer_add_gl_meta (outbuf, mix->display);
gst_gl_mixer_process_buffers (mix, outbuf); gst_gl_mixer_process_buffers (mix, outbuf);
mix->qos_processed++; mix->qos_processed++;
} else { } else {
@ -1645,8 +1679,9 @@ error:
} }
static gboolean static gboolean
forward_event_func (GstPad * pad, GValue * ret, GstEvent * event) forward_event_func (GValue * item, GValue * ret, GstEvent * event)
{ {
GstPad *pad = g_value_get_object (item);
gst_event_ref (event); gst_event_ref (event);
GST_LOG_OBJECT (pad, "About to send event %s", GST_EVENT_TYPE_NAME (event)); GST_LOG_OBJECT (pad, "About to send event %s", GST_EVENT_TYPE_NAME (event));
if (!gst_pad_push_event (pad, event)) { if (!gst_pad_push_event (pad, event)) {
@ -1657,7 +1692,6 @@ forward_event_func (GstPad * pad, GValue * ret, GstEvent * event)
GST_LOG_OBJECT (pad, "Sent event %p (%s).", GST_LOG_OBJECT (pad, "Sent event %p (%s).",
event, GST_EVENT_TYPE_NAME (event)); event, GST_EVENT_TYPE_NAME (event));
} }
gst_object_unref (pad);
return TRUE; return TRUE;
} }
@ -1967,43 +2001,6 @@ gst_gl_mixer_change_state (GstElement * element, GstStateChange transition)
{ {
GSList *walk = mix->sinkpads; GSList *walk = mix->sinkpads;
gint i = 0; gint i = 0;
gchar *name;
GstElement *parent = GST_ELEMENT (gst_element_get_parent (mix));
GstStructure *structure = NULL;
GstQuery *query = NULL;
gboolean isPerformed = FALSE;
if (!parent) {
GST_ELEMENT_ERROR (mix, CORE, STATE_CHANGE, (NULL),
("A parent bin is required"));
return FALSE;
}
name = gst_element_get_name (mix);
structure = gst_structure_new_empty (name);
g_free (name);
query = gst_query_new_custom (GST_QUERY_CUSTOM, structure);
/* retrieve the gldisplay that is owned by gl elements after the gl mixer */
isPerformed = gst_element_query (parent, query);
if (isPerformed) {
const GValue *id_value =
gst_structure_get_value (structure, "gstgldisplay");
if (G_VALUE_HOLDS_POINTER (id_value))
/* at least one gl element is after in our gl chain */
mix->display =
g_object_ref (GST_GL_DISPLAY (g_value_get_pointer (id_value)));
else {
/* this gl filter is a sink in terms of the gl chain */
mix->display = gst_gl_display_new ();
gst_gl_display_create_context (mix->display, 0);
}
}
gst_query_unref (query);
gst_object_unref (GST_OBJECT (parent));
/* instanciate a gldisplay for each sink pad */ /* instanciate a gldisplay for each sink pad */
while (walk) { while (walk) {