mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 11:08:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

playbin2: Put sinks before the other element factories in the autoplug factory list

Browse source 
This makes sure that we always prefer sinks that support a format without
decoding, independant of its rank. Previously we only sorted by rank.

Conflicts:

	gst/playback/gstplaybin2.c
This commit is contained in:
Sebastian Dröge 2012-05-23 16:34:37 +02:00
parent 663abda778
commit a67d9b349d
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
gst/playback/gstplaybin2.c
View file

@ -1247,6 +1247,35 @@ colorbalance_value_changed_cb (GstColorBalance * balance,
gst_color_balance_value_changed (GST_COLOR_BALANCE (playbin), channel, value); gst_color_balance_value_changed (GST_COLOR_BALANCE (playbin), channel, value);
} }
static gint
compare_factories_func (gconstpointer p1, gconstpointer p2)
{
GstPluginFeature *f1, *f2;
gint diff;
gboolean s1, s2;
f1 = (GstPluginFeature *) p1;
f2 = (GstPluginFeature *) p2;
s1 = gst_element_factory_list_is_type (GST_ELEMENT_FACTORY_CAST (f1),
GST_ELEMENT_FACTORY_TYPE_SINK);
s2 = gst_element_factory_list_is_type (GST_ELEMENT_FACTORY_CAST (f2),
GST_ELEMENT_FACTORY_TYPE_SINK);
if (s1 && !s2)
return -1;
else if (!s1 && s2)
return 1;
diff = f2->rank - f1->rank;
if (diff != 0)
return diff;
diff = strcmp (f2->name, f1->name);
return diff;
}
/* Must be called with elements lock! */ /* Must be called with elements lock! */
static void static void
gst_play_bin_update_elements_list (GstPlayBin * playbin) gst_play_bin_update_elements_list (GstPlayBin * playbin)
@ -1265,8 +1294,7 @@ gst_play_bin_update_elements_list (GstPlayBin * playbin)
gst_element_factory_list_get_elements gst_element_factory_list_get_elements
(GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS, GST_RANK_MARGINAL); (GST_ELEMENT_FACTORY_TYPE_AUDIOVIDEO_SINKS, GST_RANK_MARGINAL);
playbin->elements = g_list_concat (res, tmp); playbin->elements = g_list_concat (res, tmp);
playbin->elements = playbin->elements = g_list_sort (playbin->elements, compare_factories_func);
g_list_sort (playbin->elements, gst_plugin_feature_rank_compare_func);
playbin->elements_cookie = cookie; playbin->elements_cookie = cookie;
} }
} }