mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

ges: Use registry to select the compositor element

Browse source
This commit is contained in:
Thibault Saunier 2014-06-16 11:38:29 +02:00
parent 0d2256b5bd
commit ea2b814fba
4 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ges/ges-internal.h
View file

@ -261,6 +261,8 @@ G_GNUC_INTERNAL gint element_start_compare (GESTimelineElement *
GESTimelineElement * b); GESTimelineElement * b);
G_GNUC_INTERNAL gint element_end_compare (GESTimelineElement * a, G_GNUC_INTERNAL gint element_end_compare (GESTimelineElement * a,
GESTimelineElement * b); GESTimelineElement * b);
G_GNUC_INTERNAL GstElementFactory *
ges_get_compositor_factory (void);
void void
ges_base_xml_formatter_set_timeline_properties(GESBaseXmlFormatter * self, ges_base_xml_formatter_set_timeline_properties(GESBaseXmlFormatter * self,

4
ges/ges-smart-video-mixer.c
View file

@ -209,10 +209,10 @@ static void
ges_smart_mixer_init (GESSmartMixer * self) ges_smart_mixer_init (GESSmartMixer * self)
{ {
GstPad *pad; GstPad *pad;
g_mutex_init (&self->lock); g_mutex_init (&self->lock);
self->mixer = gst_element_factory_make ("videomixer", "smart-mixer-mixer"); self->mixer = gst_element_factory_create (ges_get_compositor_factory (),
"smart-mixer-mixer");
g_object_set (self->mixer, "background", 1, NULL); g_object_set (self->mixer, "background", 1, NULL);
gst_bin_add (GST_BIN (self), self->mixer); gst_bin_add (GST_BIN (self), self->mixer);

39
ges/ges-utils.c
View file

@ -31,6 +31,8 @@
#include "ges-layer.h" #include "ges-layer.h"
#include "ges.h" #include "ges.h"
static GstElementFactory *compositor_factory = NULL;
/** /**
* ges_timeline_new_audio_video: * ges_timeline_new_audio_video:
* *
@ -122,3 +124,40 @@ ges_pspec_hash (gconstpointer key_spec)
return h; return h;
} }
static gboolean
find_compositor (GstPluginFeatureFilter * feature, gpointer udata)
{
const gchar *klass;
if (G_UNLIKELY (!GST_IS_ELEMENT_FACTORY (feature)))
return FALSE;
klass = gst_element_factory_get_metadata (GST_ELEMENT_FACTORY_CAST (feature),
GST_ELEMENT_METADATA_KLASS);
return (strstr (klass, "Compositor") != NULL);
}
GstElementFactory *
ges_get_compositor_factory (void)
{
GList *result;
if (compositor_factory)
return compositor_factory;
result = gst_registry_feature_filter (gst_registry_get (),
(GstPluginFeatureFilter) find_compositor, FALSE, NULL);
/* sort on rank and name */
result = g_list_sort (result, gst_plugin_feature_rank_compare_func);
g_assert (result);
compositor_factory = result->data;
gst_plugin_feature_list_free (result);
return compositor_factory;
}

2
ges/ges-video-transition.c
View file

@ -311,7 +311,7 @@ ges_video_transition_create_element (GESTrackElement * object)
gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, oconv, NULL); gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, oconv, NULL);
mixer = gst_element_factory_make ("videomixer", NULL); mixer = gst_element_factory_create (ges_get_compositor_factory (), NULL);
g_assert (mixer); g_assert (mixer);
g_object_set (G_OBJECT (mixer), "background", 1, NULL); g_object_set (G_OBJECT (mixer), "background", 1, NULL);
gst_bin_add (GST_BIN (topbin), mixer); gst_bin_add (GST_BIN (topbin), mixer);