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

Added ability for caps_nego_failed signal to indicate that it's solved the problem, via a gboolean * argument that's ...

Browse source 
Original commit message from CVS:
Added ability for caps_nego_failed signal to indicate that it's solved the
problem, via a gboolean * argument that's FALSE, and can be set to TRUE if
the handler has fixed things up.

Updated the autoplugger so it now works in both the unknown and known cases
with and without other issues like a crippled (mono-only) osssink.
This commit is contained in:
Erik Walthinsen 2001-05-22 01:42:50 +00:00
parent aa743e581b
commit 61805cfb88
2 changed files with 57 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
gst/autoplug/gstautoplugger.c
View file

@ -62,6 +62,8 @@ struct _GstAutoplugger {
GstAutoplug *autoplug; GstAutoplug *autoplug;
GstElement *autobin; GstElement *autobin;
gboolean disable_nocaps;
}; };
struct _GstAutopluggerClass { struct _GstAutopluggerClass {
@ -90,8 +92,8 @@ static void gst_autoplugger_get_arg (GtkObject *object, GtkArg *arg, guint id
static void gst_autoplugger_external_sink_caps_changed (GstPad *pad, GstCaps *caps, GstAutoplugger *autoplugger); static void gst_autoplugger_external_sink_caps_changed (GstPad *pad, GstCaps *caps, GstAutoplugger *autoplugger);
static void gst_autoplugger_external_src_caps_changed (GstPad *pad, GstCaps *caps, GstAutoplugger *autoplugger); static void gst_autoplugger_external_src_caps_changed (GstPad *pad, GstCaps *caps, GstAutoplugger *autoplugger);
static void gst_autoplugger_external_sink_caps_nego_failed (GstPad *pad, GstAutoplugger *autoplugger); static void gst_autoplugger_external_sink_caps_nego_failed (GstPad *pad, gboolean *result, GstAutoplugger *autoplugger);
static void gst_autoplugger_external_src_caps_nego_failed (GstPad *pad, GstAutoplugger *autoplugger); static void gst_autoplugger_external_src_caps_nego_failed (GstPad *pad, gboolean *result, GstAutoplugger *autoplugger);
static void gst_autoplugger_external_sink_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger); static void gst_autoplugger_external_sink_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger);
static void gst_autoplugger_external_src_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger); static void gst_autoplugger_external_src_connected (GstPad *pad, GstPad *peerpad, GstAutoplugger *autoplugger);
@ -266,7 +268,7 @@ gst_autoplugger_external_src_caps_changed(GstPad *pad, GstCaps *caps, GstAutoplu
} }
static void static gboolean
gst_autoplugger_autoplug(GstAutoplugger *autoplugger,GstPad *srcpad,GstCaps *srccaps,GstCaps *sinkcaps) gst_autoplugger_autoplug(GstAutoplugger *autoplugger,GstPad *srcpad,GstCaps *srccaps,GstCaps *sinkcaps)
{ {
GstPad *sinkpad; GstPad *sinkpad;
@ -283,30 +285,39 @@ gst_autoplugger_autoplug(GstAutoplugger *autoplugger,GstPad *srcpad,GstCaps *src
if (!autoplugger->autoplug) { if (!autoplugger->autoplug) {
autoplugger->autoplug = gst_autoplugfactory_make("static"); autoplugger->autoplug = gst_autoplugfactory_make("static");
g_return_val_if_fail(autoplugger->autoplug != NULL, FALSE);
} }
GST_DEBUG(GST_CAT_AUTOPLUG, "building autoplugged bin between caps\n"); GST_DEBUG(GST_CAT_AUTOPLUG, "building autoplugged bin between caps\n");
autoplugger->autobin = gst_autoplug_to_caps(autoplugger->autoplug, autoplugger->autobin = gst_autoplug_to_caps(autoplugger->autoplug,
srccaps,sinkcaps,NULL); srccaps,sinkcaps,NULL);
g_return_if_fail(autoplugger->autobin != NULL); g_return_val_if_fail(autoplugger->autobin != NULL, FALSE);
gst_bin_add(GST_BIN(autoplugger),autoplugger->autobin); gst_bin_add(GST_BIN(autoplugger),autoplugger->autobin);
gst_schedule_show(GST_ELEMENT_SCHED(autoplugger));
// FIXME this is a hack // FIXME this is a hack
GST_DEBUG(GST_CAT_AUTOPLUG, "copying failed caps to srcpad %s:%s to ensure renego\n",GST_DEBUG_PAD_NAME(autoplugger->cache_srcpad)); // GST_DEBUG(GST_CAT_AUTOPLUG, "copying failed caps to srcpad %s:%s to ensure renego\n",GST_DEBUG_PAD_NAME(autoplugger->cache_srcpad));
gst_pad_set_caps(srcpad,srccaps); // gst_pad_set_caps(srcpad,srccaps);
if (GST_PAD_CAPS(srcpad) == NULL) GST_DEBUG(GST_CAT_AUTOPLUG,"no caps on cache:src!\n");
// attach the autoplugged bin // attach the autoplugged bin
GST_DEBUG(GST_CAT_AUTOPLUG, "attaching the autoplugged bin between the two pads\n"); GST_DEBUG(GST_CAT_AUTOPLUG, "attaching the autoplugged bin between the two pads\n");
gst_pad_connect(srcpad,gst_element_get_pad(autoplugger->autobin,"sink")); gst_pad_connect(srcpad,gst_element_get_pad(autoplugger->autobin,"sink"));
gst_schedule_show(GST_ELEMENT_SCHED(autoplugger));
gst_pad_connect(gst_element_get_pad(autoplugger->autobin,"src_00"),sinkpad); gst_pad_connect(gst_element_get_pad(autoplugger->autobin,"src_00"),sinkpad);
gst_schedule_show(GST_ELEMENT_SCHED(autoplugger));
// FIXME try to force the renego // FIXME try to force the renego
GST_DEBUG(GST_CAT_AUTOPLUG, "trying to force everyone to nego\n"); // GST_DEBUG(GST_CAT_AUTOPLUG, "trying to force everyone to nego\n");
gst_pad_renegotiate(gst_element_get_pad(autoplugger->autobin,"sink")); // gst_pad_renegotiate(gst_element_get_pad(autoplugger->autobin,"sink"));
gst_pad_renegotiate(sinkpad); // gst_pad_renegotiate(sinkpad);
return TRUE;
} }
static void static void
gst_autoplugger_external_sink_caps_nego_failed(GstPad *pad, GstAutoplugger *autoplugger) gst_autoplugger_external_sink_caps_nego_failed(GstPad *pad, gboolean *result, GstAutoplugger *autoplugger)
{ {
GstPad *srcpad_peer; GstPad *srcpad_peer;
GstPadTemplate *srcpad_peer_template; GstPadTemplate *srcpad_peer_template;
@ -333,16 +344,22 @@ gst_autoplugger_external_sink_caps_nego_failed(GstPad *pad, GstAutoplugger *auto
sinkpad_peer_caps = GST_PAD_CAPS(sinkpad_peer); sinkpad_peer_caps = GST_PAD_CAPS(sinkpad_peer);
g_return_if_fail(sinkpad_peer_caps != NULL); g_return_if_fail(sinkpad_peer_caps != NULL);
gst_autoplugger_autoplug(autoplugger,autoplugger->cache_srcpad,sinkpad_peer_caps,srcpad_peer_caps); if (gst_autoplugger_autoplug(autoplugger,autoplugger->cache_srcpad,sinkpad_peer_caps,srcpad_peer_caps))
*result = TRUE;
// force renego
gst_pad_renegotiate(GST_PAD(GST_PAD_PEER(autoplugger->cache_sinkpad)));
autoplugger->paused--; autoplugger->paused--;
if (autoplugger->paused == 0) if (autoplugger->paused == 0)
// try to PLAY the whole thing // try to PLAY the whole thing
gst_element_set_state(GST_ELEMENT_SCHED(autoplugger)->parent,GST_STATE_PLAYING); gst_element_set_state(GST_ELEMENT_SCHED(autoplugger)->parent,GST_STATE_PLAYING);
GST_INFO(GST_CAT_AUTOPLUG, "done dealing with caps nego failure on sinkpad %s:%s",GST_DEBUG_PAD_NAME(pad));
} }
static void static void
gst_autoplugger_external_src_caps_nego_failed(GstPad *pad, GstAutoplugger *autoplugger) gst_autoplugger_external_src_caps_nego_failed(GstPad *pad, gboolean *result, GstAutoplugger *autoplugger)
{ {
GstCaps *srcpad_caps; GstCaps *srcpad_caps;
GstPad *srcpad_peer; GstPad *srcpad_peer;
@ -365,12 +382,17 @@ gst_autoplugger_external_src_caps_nego_failed(GstPad *pad, GstAutoplugger *autop
srcpad_peer_caps = GST_PADTEMPLATE_CAPS(srcpad_peer_template); srcpad_peer_caps = GST_PADTEMPLATE_CAPS(srcpad_peer_template);
g_return_if_fail(srcpad_peer_caps != NULL); g_return_if_fail(srcpad_peer_caps != NULL);
gst_autoplugger_autoplug(autoplugger,autoplugger->cache_srcpad,srcpad_caps,srcpad_peer_caps); if (gst_autoplugger_autoplug(autoplugger,autoplugger->cache_srcpad,srcpad_caps,srcpad_peer_caps))
*result = TRUE;
autoplugger->paused--; autoplugger->paused--;
if (autoplugger->paused == 0) if (autoplugger->paused == 0)
// try to PLAY the whole thing // try to PLAY the whole thing
gst_element_set_state(GST_ELEMENT_SCHED(autoplugger)->parent,GST_STATE_PLAYING); gst_element_set_state(GST_ELEMENT_SCHED(autoplugger)->parent,GST_STATE_PLAYING);
autoplugger->disable_nocaps = TRUE;
GST_INFO(GST_CAT_AUTOPLUG, "done dealing with caps nego failure on srcpad %s:%s",GST_DEBUG_PAD_NAME(pad));
} }
@ -451,8 +473,8 @@ gst_schedule_show(GST_ELEMENT_SCHED(autoplugger));
*/ */
// FIXME set the caps on the new connection // FIXME set the caps on the new connection
GST_DEBUG(GST_CAT_AUTOPLUG,"forcing caps on the typefound pad\n"); // GST_DEBUG(GST_CAT_AUTOPLUG,"forcing caps on the typefound pad\n");
gst_pad_set_caps(autoplugger->cache_srcpad,caps); // gst_pad_set_caps(autoplugger->cache_srcpad,caps);
// reattach the original outside srcpad // reattach the original outside srcpad
GST_DEBUG(GST_CAT_AUTOPLUG,"re-attaching downstream peer to autoplugcache\n"); GST_DEBUG(GST_CAT_AUTOPLUG,"re-attaching downstream peer to autoplugcache\n");
@ -486,6 +508,11 @@ gst_autoplugger_cache_first_buffer(GstElement *element,GstBuffer *buf,GstAutoplu
if (!autoplugger->sinkcaps) { if (!autoplugger->sinkcaps) {
GST_INFO(GST_CAT_AUTOPLUG, "have no caps for the buffer, Danger Will Robinson!"); GST_INFO(GST_CAT_AUTOPLUG, "have no caps for the buffer, Danger Will Robinson!");
if (autoplugger->disable_nocaps) {
GST_DEBUG(GST_CAT_AUTOPLUG, "not dealing with lack of caps this time\n");
return;
}
gst_schedule_show(GST_ELEMENT_SCHED(autoplugger)); gst_schedule_show(GST_ELEMENT_SCHED(autoplugger));
autoplugger->paused++; autoplugger->paused++;

23
gst/gstpad.c
View file

@ -150,7 +150,8 @@ gst_real_pad_class_init (GstRealPadClass *klass)
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] = gst_real_pad_signals[REAL_CAPS_NEGO_FAILED] =
gtk_signal_new ("caps_nego_failed", GTK_RUN_LAST, gtkobject_class->type, gtk_signal_new ("caps_nego_failed", GTK_RUN_LAST, gtkobject_class->type,
GTK_SIGNAL_OFFSET (GstRealPadClass, caps_nego_failed), GTK_SIGNAL_OFFSET (GstRealPadClass, caps_nego_failed),
gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
gst_real_pad_signals[REAL_CONNECTED] = gst_real_pad_signals[REAL_CONNECTED] =
gtk_signal_new ("connected", GTK_RUN_LAST, gtkobject_class->type, gtk_signal_new ("connected", GTK_RUN_LAST, gtkobject_class->type,
GTK_SIGNAL_OFFSET (GstRealPadClass, connected), GTK_SIGNAL_OFFSET (GstRealPadClass, connected),
@ -1273,9 +1274,22 @@ gst_pad_renegotiate (GstPad *pad)
result = gst_pad_renegotiate_func (GST_PAD (currentpad), &data1, GST_PAD (otherpad), &data2, &newcaps); result = gst_pad_renegotiate_func (GST_PAD (currentpad), &data1, GST_PAD (otherpad), &data2, &newcaps);
if (!result) {
GST_DEBUG (GST_CAT_NEGOTIATION, "firing caps_nego_failed signal on %s:%s and %s:%s to give it a chance to succeed\n",
GST_DEBUG_PAD_NAME(currentpad),GST_DEBUG_PAD_NAME(otherpad));
gtk_signal_emit (GTK_OBJECT(currentpad),
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED],&result);
gtk_signal_emit (GTK_OBJECT(otherpad),
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED],&result);
if (result)
GST_DEBUG (GST_CAT_NEGOTIATION, "caps_nego_failed handler claims success at renego, believing\n");
}
if (result) { if (result) {
GST_DEBUG (GST_CAT_NEGOTIATION, "pads aggreed on caps :)\n"); GST_DEBUG (GST_CAT_NEGOTIATION, "pads aggreed on caps :)\n");
newcaps = GST_PAD_CAPS (pad);
/* here we have some sort of aggreement of the caps */ /* here we have some sort of aggreement of the caps */
GST_PAD_CAPS (currentpad) = gst_caps_ref (newcaps); GST_PAD_CAPS (currentpad) = gst_caps_ref (newcaps);
if (GST_RPAD_NEWCAPSFUNC (currentpad)) if (GST_RPAD_NEWCAPSFUNC (currentpad))
@ -1291,13 +1305,6 @@ gst_pad_renegotiate (GstPad *pad)
gst_real_pad_signals[REAL_CAPS_CHANGED],GST_PAD_CAPS(currentpad)); gst_real_pad_signals[REAL_CAPS_CHANGED],GST_PAD_CAPS(currentpad));
gtk_signal_emit (GTK_OBJECT(otherpad), gtk_signal_emit (GTK_OBJECT(otherpad),
gst_real_pad_signals[REAL_CAPS_CHANGED],GST_PAD_CAPS(otherpad)); gst_real_pad_signals[REAL_CAPS_CHANGED],GST_PAD_CAPS(otherpad));
} else {
GST_DEBUG (GST_CAT_NEGOTIATION, "firing caps_nego_failed signal on %s:%s and %s:%s\n",
GST_DEBUG_PAD_NAME(currentpad),GST_DEBUG_PAD_NAME(otherpad));
gtk_signal_emit (GTK_OBJECT(currentpad),
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED]);
gtk_signal_emit (GTK_OBJECT(otherpad),
gst_real_pad_signals[REAL_CAPS_NEGO_FAILED]);
} }
return result; return result;