mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-13 12:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

nleurisource: Always provide a srcpad

Browse source 
By putting uridecodebin into a bin with a ghostpad. Without this,
nlesource tries to get a srcpad too early (before uridecodebin added
one) and everything fails miserably.

This has to be fixed properly in nlesource at some point, by properly
handling dynamically added pads. Currently they can only work if they
are added in states <= READY, which is not the usual case.

https://bugzilla.gnome.org/show_bug.cgi?id=771843
This commit is contained in:
Sebastian Dröge 2016-09-22 11:25:18 -04:00
parent 5a0731a0a5
commit 7aa69d0ea0
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/nle/nleurisource.c
View file

@ -93,25 +93,41 @@ nle_urisource_class_init (NleURISourceClass * klass)
nleobject_class->prepare = nle_urisource_prepare;
}
static void
pad_added_cb (GstElement * element, GstPad * srcpad, GstPad * ghostpad)
{
gst_ghost_pad_set_target (GST_GHOST_PAD (ghostpad), srcpad);
}
static void
nle_urisource_init (NleURISource * urisource)
{
GstElement *decodebin = NULL;
GstElement *bin, *decodebin = NULL;
GstPad *ghostpad;
GST_OBJECT_FLAG_SET (urisource, NLE_OBJECT_SOURCE);
/* We create a bin with source and decodebin within */
decodebin =
urisource->decodebin = decodebin =
gst_element_factory_make ("uridecodebin", "internal-uridecodebin");
g_object_set (decodebin, "expose-all-streams", FALSE, NULL);
gst_bin_add (GST_BIN (urisource), decodebin);
bin = gst_bin_new ("internal-bin");
gst_bin_add (GST_BIN (bin), decodebin);
ghostpad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC);
gst_element_add_pad (bin, ghostpad);
gst_bin_add (GST_BIN (urisource), bin);
g_signal_connect (decodebin, "pad-added", G_CALLBACK (pad_added_cb),
ghostpad);
}
static inline void
nle_urisource_set_uri (NleURISource * fs, const gchar * uri)
{
g_object_set (NLE_SOURCE (fs)->element, "uri", uri, NULL);
g_object_set (fs->decodebin, "uri", uri, NULL);
}
static void
@ -138,8 +154,7 @@ nle_urisource_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case ARG_URI:
g_object_get_property ((GObject *) NLE_SOURCE (fs)->element, "uri",
value);
g_object_get_property ((GObject *) fs->decodebin, "uri", value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -151,7 +166,7 @@ nle_urisource_get_property (GObject * object, guint prop_id,
static gboolean
nle_urisource_prepare (NleObject * object)
{
NleSource *fs = (NleSource *) object;
NleURISource *fs = (NleURISource *) object;
GST_DEBUG ("prepare");
@ -159,7 +174,7 @@ nle_urisource_prepare (NleObject * object)
if (!gst_caps_is_any (object->caps)) {
GST_DEBUG_OBJECT (object, "Setting uridecodebin caps to %" GST_PTR_FORMAT,
object->caps);
g_object_set (fs->element, "caps", object->caps, NULL);
g_object_set (fs->decodebin, "caps", object->caps, NULL);
}
return NLE_OBJECT_CLASS (parent_class)->prepare (object);

1
plugins/nle/nleurisource.h
View file

@ -44,6 +44,7 @@ struct _NleURISource
NleSource parent;
gchar *uri;
GstElement *decodebin;
};
struct _NleURISourceClass