[clutter-gst] gst-indent code
- From: Damien Lespiau <dlespiau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter-gst] gst-indent code
- Date: Tue, 25 Sep 2012 22:47:11 +0000 (UTC)
commit 7e3ce6efe56f806afe6354de863185f71e1cdacd
Author: Edward Hervey <edward hervey collabora co uk>
Date: Mon Sep 17 11:05:55 2012 +0200
gst-indent code
clutter-gst/clutter-gst-auto-video-sink.c | 568 +++++++---------
clutter-gst/clutter-gst-video-sink.c | 1057 +++++++++++++----------------
2 files changed, 737 insertions(+), 888 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-auto-video-sink.c b/clutter-gst/clutter-gst-auto-video-sink.c
index df6d224..d151bd8 100644
--- a/clutter-gst/clutter-gst-auto-video-sink.c
+++ b/clutter-gst/clutter-gst-auto-video-sink.c
@@ -39,10 +39,10 @@ GST_DEBUG_CATEGORY_EXTERN (clutter_gst_auto_video_sink_debug);
#define GST_CAT_DEFAULT clutter_gst_auto_video_sink_debug
static GstStaticPadTemplate sink_template_factory =
- GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS_ANY);
+GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS_ANY);
enum
{
@@ -54,8 +54,7 @@ enum
#define DEFAULT_TS_OFFSET 0
G_DEFINE_TYPE (ClutterGstAutoVideoSink,
- clutter_gst_auto_video_sink,
- GST_TYPE_BIN);
+ clutter_gst_auto_video_sink, GST_TYPE_BIN);
#define parent_class clutter_gst_auto_video_sink_parent_class
@@ -67,7 +66,7 @@ typedef struct
} SinkElement;
static GstCaps *
-_get_sink_caps (GstElement *sink)
+_get_sink_caps (GstElement * sink)
{
GstPad *sinkpad;
GstCaps *caps = NULL;
@@ -75,15 +74,14 @@ _get_sink_caps (GstElement *sink)
/* try to activate */
if (GST_STATE (sink) < GST_STATE_READY &&
gst_element_set_state (sink, GST_STATE_READY) == GST_STATE_CHANGE_FAILURE)
- {
- goto beach;
- }
+ {
+ goto beach;
+ }
- if ((sinkpad = gst_element_get_static_pad (sink, "sink")))
- {
- /* Got the sink pad, now let's see which caps will be accepted */
- caps = gst_pad_query_caps (sinkpad, NULL);
- }
+ if ((sinkpad = gst_element_get_static_pad (sink, "sink"))) {
+ /* Got the sink pad, now let's see which caps will be accepted */
+ caps = gst_pad_query_caps (sinkpad, NULL);
+ }
gst_object_unref (sinkpad);
beach:
@@ -91,30 +89,26 @@ beach:
}
static SinkElement *
-_sink_element_create (GstElement *element)
+_sink_element_create (GstElement * element)
{
SinkElement *se = NULL;
GstCaps *caps = NULL;
/* Check if the sink can be set to READY and recover it's caps */
- if (!(caps = _get_sink_caps (element)))
- {
- gst_element_set_state (element, GST_STATE_NULL);
- gst_object_unref (element);
- goto beach;
- }
+ if (!(caps = _get_sink_caps (element))) {
+ gst_element_set_state (element, GST_STATE_NULL);
+ gst_object_unref (element);
+ goto beach;
+ }
- if ((se = g_new0 (SinkElement, 1)))
- {
- gst_object_ref_sink (element);
- se->element = element;
- se->caps = caps;
- }
- else
- {
- gst_caps_unref (caps);
- gst_object_unref (element);
- }
+ if ((se = g_new0 (SinkElement, 1))) {
+ gst_object_ref_sink (element);
+ se->element = element;
+ se->caps = caps;
+ } else {
+ gst_caps_unref (caps);
+ gst_object_unref (element);
+ }
beach:
return se;
@@ -123,7 +117,7 @@ beach:
static void
_sink_element_free (gpointer data, gpointer user_data)
{
- SinkElement *se = (SinkElement *)data;
+ SinkElement *se = (SinkElement *) data;
gst_element_set_state (se->element, GST_STATE_NULL);
gst_caps_unref (se->caps);
@@ -132,7 +126,7 @@ _sink_element_free (gpointer data, gpointer user_data)
}
static gboolean
-_factory_filter (GstPluginFeature *feature, gpointer data)
+_factory_filter (GstPluginFeature * feature, gpointer data)
{
const gchar *klass;
guint rank;
@@ -155,7 +149,7 @@ _factory_filter (GstPluginFeature *feature, gpointer data)
}
static gint
-_factories_compare_ranks (GstPluginFeature *f1, GstPluginFeature *f2)
+_factories_compare_ranks (GstPluginFeature * f1, GstPluginFeature * f2)
{
gint diff;
@@ -165,17 +159,18 @@ _factories_compare_ranks (GstPluginFeature *f1, GstPluginFeature *f2)
return diff;
return strcmp (gst_plugin_feature_get_name (f2),
- gst_plugin_feature_get_name (f1));
+ gst_plugin_feature_get_name (f1));
}
static GstElement *
-_create_element_with_pretty_name (ClutterGstAutoVideoSink *bin,
- GstElementFactory *factory)
+_create_element_with_pretty_name (ClutterGstAutoVideoSink * bin,
+ GstElementFactory * factory)
{
GstElement *element;
gchar *name, *marker;
- marker = g_strdup (gst_plugin_feature_get_name(GST_PLUGIN_FEATURE (factory)));
+ marker =
+ g_strdup (gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory)));
if (g_str_has_suffix (marker, "sink"))
marker[strlen (marker) - 4] = '\0';
if (g_str_has_prefix (marker, "gst"))
@@ -190,87 +185,77 @@ _create_element_with_pretty_name (ClutterGstAutoVideoSink *bin,
}
static inline gboolean
-_is_clutter_sink (GstElement *element)
+_is_clutter_sink (GstElement * element)
{
GParamSpec *pspec;
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (element),
- "texture");
+ "texture");
- if (pspec == NULL)
- {
- GST_DEBUG_OBJECT (element, "don't have a texture property");
- return FALSE;
- }
+ if (pspec == NULL) {
+ GST_DEBUG_OBJECT (element, "don't have a texture property");
+ return FALSE;
+ }
if (CLUTTER_TYPE_TEXTURE == pspec->value_type ||
- g_type_is_a (pspec->value_type, CLUTTER_TYPE_TEXTURE))
- {
- GST_DEBUG_OBJECT (element, "has a clutter texture property");
- return TRUE;
- }
+ g_type_is_a (pspec->value_type, CLUTTER_TYPE_TEXTURE)) {
+ GST_DEBUG_OBJECT (element, "has a clutter texture property");
+ return TRUE;
+ }
GST_WARNING_OBJECT (element, "has texture property, but it's of type %s "
- "and we expected it to be of type CLUTTER_TYPE_TEXTURE",
- g_type_name (pspec->value_type));
+ "and we expected it to be of type CLUTTER_TYPE_TEXTURE",
+ g_type_name (pspec->value_type));
return FALSE;
}
static inline void
-_sinks_discover (ClutterGstAutoVideoSink *bin)
+_sinks_discover (ClutterGstAutoVideoSink * bin)
{
GstCaps *caps = gst_caps_new_empty ();
GList *factories, *item;
- factories = gst_registry_feature_filter (gst_registry_get(),
- (GstPluginFeatureFilter)_factory_filter, FALSE, bin);
- factories = g_list_sort (factories, (GCompareFunc)_factories_compare_ranks);
+ factories = gst_registry_feature_filter (gst_registry_get (),
+ (GstPluginFeatureFilter) _factory_filter, FALSE, bin);
+ factories = g_list_sort (factories, (GCompareFunc) _factories_compare_ranks);
- for (item = factories; item != NULL; item = item->next)
- {
- GstElementFactory *f = GST_ELEMENT_FACTORY (item->data);
- GstElement *el;
- SinkElement *se;
-
- if ((el = _create_element_with_pretty_name (bin, f)))
- {
- GST_DEBUG_OBJECT (bin, "Testing %s", gst_plugin_feature_get_name(
- GST_PLUGIN_FEATURE (f)));
-
- /* Check for a texture property with CLUTTER_TYPE_TEXTURE type */
- if (!_is_clutter_sink (el))
- {
- gst_object_unref (el);
- continue;
- }
- se = _sink_element_create (el);
- if (se)
- {
- GstCaps *caps_union = gst_caps_merge (caps, gst_caps_ref(se->caps));
- caps = caps_union;
- bin->sinks = g_slist_append (bin->sinks, se);
- GST_DEBUG_OBJECT (bin, "Added %s with caps %" GST_PTR_FORMAT,
- gst_plugin_feature_get_name(GST_PLUGIN_FEATURE (f)), se->caps);
- }
- else
- {
- gst_object_unref (el);
- }
- }
- }
+ for (item = factories; item != NULL; item = item->next) {
+ GstElementFactory *f = GST_ELEMENT_FACTORY (item->data);
+ GstElement *el;
+ SinkElement *se;
- if (!gst_caps_is_empty (caps))
- {
- gst_caps_replace (&bin->video_caps, caps);
- GST_DEBUG_OBJECT (bin, "Supported caps %" GST_PTR_FORMAT,
- bin->video_caps);
+ if ((el = _create_element_with_pretty_name (bin, f))) {
+ GST_DEBUG_OBJECT (bin, "Testing %s",
+ gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (f)));
+
+ /* Check for a texture property with CLUTTER_TYPE_TEXTURE type */
+ if (!_is_clutter_sink (el)) {
+ gst_object_unref (el);
+ continue;
+ }
+ se = _sink_element_create (el);
+ if (se) {
+ GstCaps *caps_union = gst_caps_merge (caps, gst_caps_ref (se->caps));
+ caps = caps_union;
+ bin->sinks = g_slist_append (bin->sinks, se);
+ GST_DEBUG_OBJECT (bin, "Added %s with caps %" GST_PTR_FORMAT,
+ gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (f)), se->caps);
+ } else {
+ gst_object_unref (el);
+ }
}
+ }
+
+ if (!gst_caps_is_empty (caps)) {
+ gst_caps_replace (&bin->video_caps, caps);
+ GST_DEBUG_OBJECT (bin, "Supported caps %" GST_PTR_FORMAT, bin->video_caps);
+ }
gst_caps_unref (caps);
}
static inline void
-_sinks_destroy (ClutterGstAutoVideoSink *bin)
+_sinks_destroy (ClutterGstAutoVideoSink * bin)
{
g_slist_foreach (bin->sinks, _sink_element_free, NULL);
g_slist_free (bin->sinks);
@@ -278,74 +263,67 @@ _sinks_destroy (ClutterGstAutoVideoSink *bin)
}
static inline GstElement *
-_sinks_find_sink_by_caps (ClutterGstAutoVideoSink *bin, GstCaps *caps)
+_sinks_find_sink_by_caps (ClutterGstAutoVideoSink * bin, GstCaps * caps)
{
GstElement *element = NULL;
GSList *walk = bin->sinks;
- while (walk)
- {
- SinkElement *se = (SinkElement *)walk->data;
- if (se)
- {
- GstCaps *intersect = NULL;
-
- intersect = gst_caps_intersect (caps, se->caps);
- if (!gst_caps_is_empty (intersect))
- {
- element = se->element;
- gst_caps_unref (intersect);
- GST_DEBUG_OBJECT (bin, "found sink %" GST_PTR_FORMAT, element);
- goto beach;
- }
- gst_caps_unref (intersect);
- }
- walk = g_slist_next (walk);
+ while (walk) {
+ SinkElement *se = (SinkElement *) walk->data;
+ if (se) {
+ GstCaps *intersect = NULL;
+
+ intersect = gst_caps_intersect (caps, se->caps);
+ if (!gst_caps_is_empty (intersect)) {
+ element = se->element;
+ gst_caps_unref (intersect);
+ GST_DEBUG_OBJECT (bin, "found sink %" GST_PTR_FORMAT, element);
+ goto beach;
+ }
+ gst_caps_unref (intersect);
}
+ walk = g_slist_next (walk);
+ }
beach:
return element;
}
static void
-clutter_gst_auto_video_sink_do_async_start (ClutterGstAutoVideoSink *bin)
+clutter_gst_auto_video_sink_do_async_start (ClutterGstAutoVideoSink * bin)
{
GstMessage *message;
- if (!bin->need_async_start)
- {
- GST_DEBUG_OBJECT (bin, "no async_start needed");
- return;
- }
+ if (!bin->need_async_start) {
+ GST_DEBUG_OBJECT (bin, "no async_start needed");
+ return;
+ }
bin->async_pending = TRUE;
GST_INFO_OBJECT (bin, "Sending async_start message");
message = gst_message_new_async_start (GST_OBJECT_CAST (bin));
- GST_BIN_CLASS (parent_class)->handle_message (
- GST_BIN_CAST (bin), message);
+ GST_BIN_CLASS (parent_class)->handle_message (GST_BIN_CAST (bin), message);
}
static void
-clutter_gst_auto_video_sink_do_async_done (ClutterGstAutoVideoSink *bin)
+clutter_gst_auto_video_sink_do_async_done (ClutterGstAutoVideoSink * bin)
{
GstMessage *message;
- if (bin->async_pending)
- {
- GST_INFO_OBJECT (bin, "Sending async_done message");
- message = gst_message_new_async_done (GST_OBJECT_CAST (bin), FALSE);
- GST_BIN_CLASS (parent_class)->handle_message (
- GST_BIN_CAST (bin),message);
+ if (bin->async_pending) {
+ GST_INFO_OBJECT (bin, "Sending async_done message");
+ message = gst_message_new_async_done (GST_OBJECT_CAST (bin), FALSE);
+ GST_BIN_CLASS (parent_class)->handle_message (GST_BIN_CAST (bin), message);
- bin->async_pending = FALSE;
- }
+ bin->async_pending = FALSE;
+ }
bin->need_async_start = FALSE;
}
static gboolean
-clutter_gst_auto_video_sink_reconfigure (ClutterGstAutoVideoSink *bin,
- GstCaps *caps)
+clutter_gst_auto_video_sink_reconfigure (ClutterGstAutoVideoSink * bin,
+ GstCaps * caps)
{
GstElement *sink;
GstPad *sink_pad_target = NULL;
@@ -355,37 +333,34 @@ clutter_gst_auto_video_sink_reconfigure (ClutterGstAutoVideoSink *bin,
sink = _sinks_find_sink_by_caps (bin, caps);
- if (sink && sink == bin->child)
- {
- GST_DEBUG_OBJECT (bin, "we already using that sink, done");
- ret = TRUE;
- goto beach;
- }
+ if (sink && sink == bin->child) {
+ GST_DEBUG_OBJECT (bin, "we already using that sink, done");
+ ret = TRUE;
+ goto beach;
+ }
- if (bin->child)
- {
- /* Deactivate current child */
- GST_DEBUG_OBJECT (bin, "going to remove %" GST_PTR_FORMAT, bin->child);
- gst_ghost_pad_set_target (GST_GHOST_PAD (bin->sink_pad), NULL);
- gst_element_set_state (bin->child, GST_STATE_NULL);
- gst_bin_remove (GST_BIN (bin), bin->child);
- bin->child = NULL;
- }
+ if (bin->child) {
+ /* Deactivate current child */
+ GST_DEBUG_OBJECT (bin, "going to remove %" GST_PTR_FORMAT, bin->child);
+ gst_ghost_pad_set_target (GST_GHOST_PAD (bin->sink_pad), NULL);
+ gst_element_set_state (bin->child, GST_STATE_NULL);
+ gst_bin_remove (GST_BIN (bin), bin->child);
+ bin->child = NULL;
+ }
/* This might have failed */
- if (!sink)
- {
- GST_ELEMENT_ERROR (bin, LIBRARY, INIT,
- ("No usable video rendering element found."),
- ("Failed detecting a video sink for the requested"
- " caps."));
- goto beach;
- }
+ if (!sink) {
+ GST_ELEMENT_ERROR (bin, LIBRARY, INIT,
+ ("No usable video rendering element found."),
+ ("Failed detecting a video sink for the requested" " caps."));
+ goto beach;
+ }
/* Now we are ready to add the sink to bin */
bin->child = gst_object_ref (sink);
- g_object_set (G_OBJECT(bin->child), "texture", bin->texture,
+ g_object_set (G_OBJECT (bin->child), "texture", bin->texture,
"ts-offset", bin->ts_offset, NULL);
+
GST_DEBUG_OBJECT (bin, "going to add %" GST_PTR_FORMAT, bin->child);
/* Add our child */
gst_bin_add (GST_BIN (bin), bin->child);
@@ -404,88 +379,81 @@ beach:
}
static GstPadProbeReturn
-clutter_gst_auto_video_sink_sink_pad_blocked_cb (GstPad *pad, GstPadProbeInfo *info,
- gpointer user_data)
+clutter_gst_auto_video_sink_sink_pad_blocked_cb (GstPad * pad,
+ GstPadProbeInfo * info, gpointer user_data)
{
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK_CAST (user_data);
GstCaps *caps = NULL;
/* This only occurs when our bin is first initialised || stream changes */
- if (G_UNLIKELY (!bin->setup))
- {
+ if (G_UNLIKELY (!bin->setup)) {
- caps = gst_pad_peer_query_caps (bin->sink_pad, NULL);
+ caps = gst_pad_peer_query_caps (bin->sink_pad, NULL);
- if (G_UNLIKELY (!caps))
- {
- GST_WARNING_OBJECT (bin, "no incoming caps defined, can't setup");
- goto beach;
- }
+ if (G_UNLIKELY (!caps)) {
+ GST_WARNING_OBJECT (bin, "no incoming caps defined, can't setup");
+ goto beach;
+ }
- if (G_UNLIKELY (gst_caps_is_empty (caps)))
- {
- GST_WARNING_OBJECT (bin, "caps empty, can't setup");
- goto beach;
- }
+ if (G_UNLIKELY (gst_caps_is_empty (caps))) {
+ GST_WARNING_OBJECT (bin, "caps empty, can't setup");
+ goto beach;
+ }
- GST_DEBUG_OBJECT (bin, "incoming caps %" GST_PTR_FORMAT, caps);
+ GST_DEBUG_OBJECT (bin, "incoming caps %" GST_PTR_FORMAT, caps);
- if (!clutter_gst_auto_video_sink_reconfigure (bin, caps))
- goto beach;
+ if (!clutter_gst_auto_video_sink_reconfigure (bin, caps))
+ goto beach;
- /* We won't be doing this again unless stream changes */
- bin->setup = TRUE;
- }
+ /* We won't be doing this again unless stream changes */
+ bin->setup = TRUE;
+ }
/* Note that we finished our ASYNC state change but our children will have
- * posted their own messages on our bus. */
+ * posted their own messages on our bus. */
clutter_gst_auto_video_sink_do_async_done (bin);
GST_DEBUG_OBJECT (bin, "unblock the pad");
beach:
- if (caps)
- {
- gst_caps_unref (caps);
- }
+ if (caps) {
+ gst_caps_unref (caps);
+ }
bin->sink_block_id = 0;
return GST_PAD_PROBE_REMOVE;
}
static GstCaps *
-clutter_gst_auto_video_sink_get_caps (ClutterGstAutoVideoSink *bin)
+clutter_gst_auto_video_sink_get_caps (ClutterGstAutoVideoSink * bin)
{
GstCaps *ret;
- if (bin->video_caps)
- {
- ret = gst_caps_ref (bin->video_caps);
- }
- else
- {
- ret = gst_static_pad_template_get_caps (&sink_template_factory);
- }
+ if (bin->video_caps) {
+ ret = gst_caps_ref (bin->video_caps);
+ } else {
+ ret = gst_static_pad_template_get_caps (&sink_template_factory);
+ }
return ret;
}
static gboolean
-clutter_gst_auto_video_sink_accept_caps (ClutterGstAutoVideoSink *bin, GstCaps *caps)
+clutter_gst_auto_video_sink_accept_caps (ClutterGstAutoVideoSink * bin,
+ GstCaps * caps)
{
gboolean ret = FALSE;
GstCaps *allowed_caps = clutter_gst_auto_video_sink_get_caps (bin);
- if (allowed_caps)
- {
- GstCaps *result = NULL;
+ if (allowed_caps) {
+ GstCaps *result = NULL;
- result = gst_caps_intersect (caps, allowed_caps);
+ result = gst_caps_intersect (caps, allowed_caps);
- if (!gst_caps_is_empty (result))
- ret = TRUE;
+ if (!gst_caps_is_empty (result))
+ ret = TRUE;
- caps = result;
- }
+ caps = result;
+ }
gst_caps_unref (allowed_caps);
@@ -493,33 +461,34 @@ clutter_gst_auto_video_sink_accept_caps (ClutterGstAutoVideoSink *bin, GstCaps *
}
static gboolean
-clutter_gst_auto_video_sink_query (GstPad * pad, GstObject * parent, GstQuery * query)
+clutter_gst_auto_video_sink_query (GstPad * pad, GstObject * parent,
+ GstQuery * query)
{
gboolean res;
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (parent);
switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_ACCEPT_CAPS:
- {
- GstCaps *caps;
-
- gst_query_parse_accept_caps (query, &caps);
- res = clutter_gst_auto_video_sink_accept_caps (bin, caps);
- gst_query_set_accept_caps_result (query, res);
- /* return TRUE, we have answered the query */
- res = TRUE;
- }
+ {
+ GstCaps *caps;
+
+ gst_query_parse_accept_caps (query, &caps);
+ res = clutter_gst_auto_video_sink_accept_caps (bin, caps);
+ gst_query_set_accept_caps_result (query, res);
+ /* return TRUE, we have answered the query */
+ res = TRUE;
+ }
break;
case GST_QUERY_CAPS:
- {
- GstCaps *caps, *filter;
-
- gst_query_parse_caps (query, &filter);
- caps = clutter_gst_auto_video_sink_get_caps (bin);
- gst_query_set_caps_result (query, caps);
- gst_caps_unref (caps);
- res = TRUE;
- }
+ {
+ GstCaps *caps, *filter;
+
+ gst_query_parse_caps (query, &filter);
+ caps = clutter_gst_auto_video_sink_get_caps (bin);
+ gst_query_set_caps_result (query, caps);
+ gst_caps_unref (caps);
+ res = TRUE;
+ }
break;
default:
res = gst_pad_query_default (pad, parent, query);
@@ -530,14 +499,13 @@ clutter_gst_auto_video_sink_query (GstPad * pad, GstObject * parent, GstQuery *
static GstStateChangeReturn
-clutter_gst_auto_video_sink_change_state (GstElement *element,
- GstStateChange transition)
+clutter_gst_auto_video_sink_change_state (GstElement * element,
+ GstStateChange transition)
{
GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS, bret;
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (element);
- switch (transition)
- {
+ switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
_sinks_discover (bin);
break;
@@ -546,25 +514,25 @@ clutter_gst_auto_video_sink_change_state (GstElement *element,
bin->need_async_start = TRUE;
/* Here we set our callback to intercept data flow on the first buffer */
GST_DEBUG_OBJECT (bin, "try to block input pad to setup internal "
- "pipeline");
+ "pipeline");
if (bin->sink_block_id == 0)
- bin->sink_block_id = gst_pad_add_probe(bin->sink_block_pad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
- clutter_gst_auto_video_sink_sink_pad_blocked_cb,
- bin, NULL);
+ bin->sink_block_id =
+ gst_pad_add_probe (bin->sink_block_pad,
+ GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
+ clutter_gst_auto_video_sink_sink_pad_blocked_cb, bin, NULL);
ret = GST_STATE_CHANGE_ASYNC;
clutter_gst_auto_video_sink_do_async_start (bin);
CLUTTER_GST_AUTO_VIDEO_SINK_UNLOCK (bin);
break;
default:
break;
- }
+ }
/* do the state change of the children */
bret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
/* now look at the result of our children and adjust the return value */
- switch (bret)
- {
+ switch (bret) {
case GST_STATE_CHANGE_FAILURE:
/* failure, we stop */
goto activate_failed;
@@ -581,10 +549,9 @@ clutter_gst_auto_video_sink_change_state (GstElement *element,
default:
/* return our previously configured return value */
break;
- }
+ }
- switch (transition)
- {
+ switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
bin->need_async_start = TRUE;
break;
@@ -601,13 +568,12 @@ clutter_gst_auto_video_sink_change_state (GstElement *element,
gst_ghost_pad_set_target (GST_GHOST_PAD (bin->sink_pad), NULL);
/* Destroy our child */
- if (bin->child)
- {
- GST_DEBUG_OBJECT (bin->child, "removing child sink");
- gst_element_set_state (bin->child, GST_STATE_NULL);
- gst_bin_remove (GST_BIN (bin), bin->child);
- bin->child = NULL;
- }
+ if (bin->child) {
+ GST_DEBUG_OBJECT (bin->child, "removing child sink");
+ gst_element_set_state (bin->child, GST_STATE_NULL);
+ gst_bin_remove (GST_BIN (bin), bin->child);
+ bin->child = NULL;
+ }
bin->setup = FALSE;
CLUTTER_GST_AUTO_VIDEO_SINK_UNLOCK (bin);
@@ -618,7 +584,7 @@ clutter_gst_auto_video_sink_change_state (GstElement *element,
break;
default:
break;
- }
+ }
return ret;
/* ERRORS */
@@ -631,32 +597,30 @@ activate_failed:
}
static void
-clutter_gst_auto_video_sink_dispose (GObject *object)
+clutter_gst_auto_video_sink_dispose (GObject * object)
{
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (object);
GST_DEBUG_OBJECT (bin, "Disposing");
- if (bin->child)
- {
- gst_element_set_state (bin->child, GST_STATE_NULL);
- gst_object_unref (bin->child);
- bin->child = NULL;
- }
+ if (bin->child) {
+ gst_element_set_state (bin->child, GST_STATE_NULL);
+ gst_object_unref (bin->child);
+ bin->child = NULL;
+ }
- if (bin->sink_block_pad)
- {
- gst_object_unref (bin->sink_block_pad);
- bin->sink_block_pad = NULL;
- }
+ if (bin->sink_block_pad) {
+ gst_object_unref (bin->sink_block_pad);
+ bin->sink_block_pad = NULL;
+ }
bin->texture = NULL;
- G_OBJECT_CLASS (parent_class)->dispose((GObject *) object);
+ G_OBJECT_CLASS (parent_class)->dispose ((GObject *) object);
}
static void
-clutter_gst_auto_video_sink_finalize (GObject *object)
+clutter_gst_auto_video_sink_finalize (GObject * object)
{
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (object);
@@ -670,26 +634,22 @@ clutter_gst_auto_video_sink_finalize (GObject *object)
}
static void
-clutter_gst_auto_video_sink_set_texture (ClutterGstAutoVideoSink *bin,
- ClutterTexture *texture)
+clutter_gst_auto_video_sink_set_texture (ClutterGstAutoVideoSink * bin,
+ ClutterTexture * texture)
{
bin->texture = texture;
- if (bin->setup)
- {
- g_object_set (G_OBJECT(bin->child), "texture", texture, NULL);
- }
+ if (bin->setup) {
+ g_object_set (G_OBJECT (bin->child), "texture", texture, NULL);
+ }
}
static void
-clutter_gst_auto_video_sink_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+clutter_gst_auto_video_sink_set_property (GObject * object,
+ guint prop_id, const GValue * value, GParamSpec * pspec)
{
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_TEXTURE:
clutter_gst_auto_video_sink_set_texture (bin, g_value_get_object (value));
break;
@@ -703,19 +663,16 @@ clutter_gst_auto_video_sink_set_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
-clutter_gst_auto_video_sink_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+clutter_gst_auto_video_sink_get_property (GObject * object,
+ guint prop_id, GValue * value, GParamSpec * pspec)
{
ClutterGstAutoVideoSink *bin = CLUTTER_GST_AUTO_VIDEO_SINK (object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_TEXTURE:
g_value_set_object (value, bin->texture);
break;
@@ -725,14 +682,14 @@ clutter_gst_auto_video_sink_get_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
-clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
+clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass * klass)
{
GObjectClass *oclass = G_OBJECT_CLASS (klass);
- GstElementClass *gstelement_class = GST_ELEMENT_CLASS(klass);
+ GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
GParamSpec *pspec;
oclass->dispose = clutter_gst_auto_video_sink_dispose;
@@ -741,13 +698,13 @@ clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
oclass->get_property = clutter_gst_auto_video_sink_get_property;
gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&sink_template_factory));
+ gst_static_pad_template_get (&sink_template_factory));
gst_element_class_set_details_simple (gstelement_class,
- "Auto Clutter Sink",
- "Sink/Video",
- "Autoplug clutter capable video sinks",
- "Josep Torra <support fluendo com>");
+ "Auto Clutter Sink",
+ "Sink/Video",
+ "Autoplug clutter capable video sinks",
+ "Josep Torra <support fluendo com>");
/**
* ClutterGstAutoVideoSink:texture:
@@ -758,10 +715,9 @@ clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
* interface.
*/
pspec = g_param_spec_object ("texture",
- "Texture",
- "Texture the video will be decoded into",
- CLUTTER_TYPE_TEXTURE,
- CLUTTER_GST_PARAM_READWRITE);
+ "Texture",
+ "Texture the video will be decoded into",
+ CLUTTER_TYPE_TEXTURE, CLUTTER_GST_PARAM_READWRITE);
g_object_class_install_property (oclass, PROP_TEXTURE, pspec);
@@ -771,15 +727,15 @@ clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
DEFAULT_TS_OFFSET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gstelement_class->change_state =
- GST_DEBUG_FUNCPTR (clutter_gst_auto_video_sink_change_state);
+ GST_DEBUG_FUNCPTR (clutter_gst_auto_video_sink_change_state);
}
static void
-clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink *bin)
+clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink * bin)
{
GstPad *proxypad;
GstPadTemplate *template;
- GValue val = {0, };
+ GValue val = { 0, };
bin->setup = FALSE;
bin->texture = NULL;
@@ -794,28 +750,24 @@ clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink *bin)
proxypad = NULL;
- if (bin->sink_pad)
- {
- GstIterator *it = gst_pad_iterate_internal_links (bin->sink_pad);
- if (G_UNLIKELY (!it ||
- gst_iterator_next (it,
- &val) !=
- GST_ITERATOR_OK ||
- g_value_get_object (&val) == NULL))
- {
- GST_ERROR_OBJECT (bin,
- "failed to get internally linked pad from sinkpad");
- }
- if (it)
- gst_iterator_free (it);
- proxypad = GST_PAD_CAST (g_value_get_object (&val));
+ if (bin->sink_pad) {
+ GstIterator *it = gst_pad_iterate_internal_links (bin->sink_pad);
+ if (G_UNLIKELY (!it ||
+ gst_iterator_next (it,
+ &val) !=
+ GST_ITERATOR_OK || g_value_get_object (&val) == NULL)) {
+ GST_ERROR_OBJECT (bin,
+ "failed to get internally linked pad from sinkpad");
}
+ if (it)
+ gst_iterator_free (it);
+ proxypad = GST_PAD_CAST (g_value_get_object (&val));
+ }
bin->sink_block_pad = proxypad;
gst_pad_set_query_function (bin->sink_pad,
- GST_DEBUG_FUNCPTR (
- clutter_gst_auto_video_sink_query));
+ GST_DEBUG_FUNCPTR (clutter_gst_auto_video_sink_query));
gst_element_add_pad (GST_ELEMENT (bin), bin->sink_pad);
/* Setup the element */
GST_OBJECT_FLAG_SET (GST_OBJECT (bin), GST_ELEMENT_FLAG_SINK);
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 6e7590b..9bf6367 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -77,40 +77,35 @@
#define CLUTTER_GST_TEXTURE_FLAGS COGL_TEXTURE_NO_SLICING
#endif
-static gchar *ayuv_to_rgba_shader = \
- FRAGMENT_SHADER_VARS
- "uniform sampler2D tex;"
- "void main () {"
- " vec4 color = texture2D (tex, vec2(" TEX_COORD "));"
- " float y = 1.1640625 * (color.g - 0.0625);"
- " float u = color.b - 0.5;"
- " float v = color.a - 0.5;"
- " color.a = color.r;"
- " color.r = y + 1.59765625 * v;"
- " color.g = y - 0.390625 * u - 0.8125 * v;"
- " color.b = y + 2.015625 * u;"
- " gl_FragColor = color;"
- FRAGMENT_SHADER_END
- "}";
-
-static gchar *yv12_to_rgba_shader = \
- FRAGMENT_SHADER_VARS
- "uniform sampler2D ytex;"
- "uniform sampler2D utex;"
- "uniform sampler2D vtex;"
- "void main () {"
- " vec2 coord = vec2(" TEX_COORD ");"
- " float y = 1.1640625 * (texture2D (ytex, coord).g - 0.0625);"
- " float u = texture2D (utex, coord).g - 0.5;"
- " float v = texture2D (vtex, coord).g - 0.5;"
- " vec4 color;"
- " color.r = y + 1.59765625 * v;"
- " color.g = y - 0.390625 * u - 0.8125 * v;"
- " color.b = y + 2.015625 * u;"
- " color.a = 1.0;"
- " gl_FragColor = color;"
- FRAGMENT_SHADER_END
- "}";
+static gchar *ayuv_to_rgba_shader =
+ FRAGMENT_SHADER_VARS
+ "uniform sampler2D tex;"
+ "void main () {"
+ " vec4 color = texture2D (tex, vec2(" TEX_COORD "));"
+ " float y = 1.1640625 * (color.g - 0.0625);"
+ " float u = color.b - 0.5;"
+ " float v = color.a - 0.5;"
+ " color.a = color.r;"
+ " color.r = y + 1.59765625 * v;"
+ " color.g = y - 0.390625 * u - 0.8125 * v;"
+ " color.b = y + 2.015625 * u;"
+ " gl_FragColor = color;" FRAGMENT_SHADER_END "}";
+
+static gchar *yv12_to_rgba_shader =
+ FRAGMENT_SHADER_VARS
+ "uniform sampler2D ytex;"
+ "uniform sampler2D utex;"
+ "uniform sampler2D vtex;"
+ "void main () {"
+ " vec2 coord = vec2(" TEX_COORD ");"
+ " float y = 1.1640625 * (texture2D (ytex, coord).g - 0.0625);"
+ " float u = texture2D (utex, coord).g - 0.5;"
+ " float v = texture2D (vtex, coord).g - 0.5;"
+ " vec4 color;"
+ " color.r = y + 1.59765625 * v;"
+ " color.g = y - 0.390625 * u - 0.8125 * v;"
+ " color.b = y + 2.015625 * u;"
+ " color.a = 1.0;" " gl_FragColor = color;" FRAGMENT_SHADER_END "}";
#define BASE_SINK_CAPS "{ AYUV," \
"YV12," \
@@ -123,11 +118,10 @@ static gchar *yv12_to_rgba_shader = \
#define SINK_CAPS GST_VIDEO_CAPS_MAKE(BASE_SINK_CAPS)
-static GstStaticPadTemplate sinktemplate_all
- = GST_STATIC_PAD_TEMPLATE ("sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS (SINK_CAPS));
+static GstStaticPadTemplate sinktemplate_all = GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS (SINK_CAPS));
GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug);
#define GST_CAT_DEFAULT clutter_gst_video_sink_debug
@@ -156,9 +150,9 @@ typedef enum
*/
typedef enum _ClutterGstFeatures
{
- CLUTTER_GST_FP = 0x1, /* fragment programs (ARB fp1.0) */
- CLUTTER_GST_GLSL = 0x2, /* GLSL */
- CLUTTER_GST_MULTI_TEXTURE = 0x4, /* multi-texturing */
+ CLUTTER_GST_FP = 0x1, /* fragment programs (ARB fp1.0) */
+ CLUTTER_GST_GLSL = 0x2, /* GLSL */
+ CLUTTER_GST_MULTI_TEXTURE = 0x4, /* multi-texturing */
} ClutterGstFeatures;
/*
@@ -169,13 +163,13 @@ typedef enum _ClutterGstFeatures
typedef struct _ClutterGstSource
{
- GSource source;
+ GSource source;
ClutterGstVideoSink *sink;
- GMutex buffer_lock; /* mutex for the buffer */
- GstBuffer *buffer;
- gboolean has_new_caps;
- gboolean stage_lost;
+ GMutex buffer_lock; /* mutex for the buffer */
+ GstBuffer *buffer;
+ gboolean has_new_caps;
+ gboolean stage_lost;
} ClutterGstSource;
/*
@@ -183,19 +177,18 @@ typedef struct _ClutterGstSource
*/
typedef void (ClutterGstRendererPaint) (ClutterActor *, ClutterGstVideoSink *);
typedef void (ClutterGstRendererPostPaint) (ClutterActor *,
- ClutterGstVideoSink *);
+ ClutterGstVideoSink *);
typedef struct _ClutterGstRenderer
{
- const char *name; /* user friendly name */
- ClutterGstVideoFormat format; /* the format handled by this renderer */
- int flags; /* ClutterGstFeatures ORed flags */
- GstStaticCaps caps; /* caps handled by the renderer */
-
- void (*init) (ClutterGstVideoSink *sink);
- void (*deinit) (ClutterGstVideoSink *sink);
- void (*upload) (ClutterGstVideoSink *sink,
- GstBuffer *buffer);
+ const char *name; /* user friendly name */
+ ClutterGstVideoFormat format; /* the format handled by this renderer */
+ int flags; /* ClutterGstFeatures ORed flags */
+ GstStaticCaps caps; /* caps handled by the renderer */
+
+ void (*init) (ClutterGstVideoSink * sink);
+ void (*deinit) (ClutterGstVideoSink * sink);
+ void (*upload) (ClutterGstVideoSink * sink, GstBuffer * buffer);
} ClutterGstRenderer;
typedef enum _ClutterGstRendererState
@@ -207,41 +200,41 @@ typedef enum _ClutterGstRendererState
struct _ClutterGstVideoSinkPrivate
{
- ClutterTexture *texture;
- CoglMaterial *material_template;
+ ClutterTexture *texture;
+ CoglMaterial *material_template;
- ClutterGstVideoFormat format;
- gboolean bgr;
- int width;
- int height;
- int fps_n, fps_d;
- int par_n, par_d;
+ ClutterGstVideoFormat format;
+ gboolean bgr;
+ int width;
+ int height;
+ int fps_n, fps_d;
+ int par_n, par_d;
- GMainContext *clutter_main_context;
- ClutterGstSource *source;
- int priority;
+ GMainContext *clutter_main_context;
+ ClutterGstSource *source;
+ int priority;
- GSList *renderers;
- GstCaps *caps;
- ClutterGstRenderer *renderer;
+ GSList *renderers;
+ GstCaps *caps;
+ ClutterGstRenderer *renderer;
- GArray *signal_handler_ids;
+ GArray *signal_handler_ids;
#ifdef HAVE_HW_DECODER_SUPPORT
- GstSurfaceConverter *converter;
+ GstSurfaceConverter *converter;
#endif
};
static void
-clutter_gst_navigation_interface_init (GstNavigationInterface *iface);
+clutter_gst_navigation_interface_init (GstNavigationInterface * iface);
#define clutter_gst_video_sink_parent_class parent_class
-G_DEFINE_TYPE_WITH_CODE (ClutterGstVideoSink, clutter_gst_video_sink, GST_TYPE_BASE_SINK,
- G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
- clutter_gst_navigation_interface_init));
+G_DEFINE_TYPE_WITH_CODE (ClutterGstVideoSink, clutter_gst_video_sink,
+ GST_TYPE_BASE_SINK, G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
+ clutter_gst_navigation_interface_init));
-static void clutter_gst_video_sink_set_texture (ClutterGstVideoSink *sink,
- ClutterTexture *texture);
+static void clutter_gst_video_sink_set_texture (ClutterGstVideoSink * sink,
+ ClutterTexture * texture);
/*
* ClutterGstSource implementation
@@ -250,7 +243,7 @@ static void clutter_gst_video_sink_set_texture (ClutterGstVideoSink *sink,
static GSourceFuncs gst_source_funcs;
static ClutterGstSource *
-clutter_gst_source_new (ClutterGstVideoSink *sink)
+clutter_gst_source_new (ClutterGstVideoSink * sink)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
GSource *source;
@@ -270,7 +263,7 @@ clutter_gst_source_new (ClutterGstVideoSink *sink)
}
static void
-clutter_gst_source_finalize (GSource *source)
+clutter_gst_source_finalize (GSource * source)
{
ClutterGstSource *gst_source = (ClutterGstSource *) source;
@@ -283,8 +276,7 @@ clutter_gst_source_finalize (GSource *source)
}
static gboolean
-clutter_gst_source_prepare (GSource *source,
- gint *timeout)
+clutter_gst_source_prepare (GSource * source, gint * timeout)
{
ClutterGstSource *gst_source = (ClutterGstSource *) source;
@@ -294,7 +286,7 @@ clutter_gst_source_prepare (GSource *source,
}
static gboolean
-clutter_gst_source_check (GSource *source)
+clutter_gst_source_check (GSource * source)
{
ClutterGstSource *gst_source = (ClutterGstSource *) source;
@@ -302,63 +294,59 @@ clutter_gst_source_check (GSource *source)
}
static ClutterGstRenderer *
-clutter_gst_find_renderer_by_format (ClutterGstVideoSink *sink,
- ClutterGstVideoFormat format)
+clutter_gst_find_renderer_by_format (ClutterGstVideoSink * sink,
+ ClutterGstVideoFormat format)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
ClutterGstRenderer *renderer = NULL;
GSList *element;
- for (element = priv->renderers; element; element = g_slist_next(element))
- {
- ClutterGstRenderer *candidate = (ClutterGstRenderer *)element->data;
+ for (element = priv->renderers; element; element = g_slist_next (element)) {
+ ClutterGstRenderer *candidate = (ClutterGstRenderer *) element->data;
- if (candidate->format == format)
- {
- renderer = candidate;
- break;
- }
+ if (candidate->format == format) {
+ renderer = candidate;
+ break;
}
+ }
return renderer;
}
static void
-ensure_texture_pixel_aspect_ratio (ClutterGstVideoSink *sink)
+ensure_texture_pixel_aspect_ratio (ClutterGstVideoSink * sink)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
GParamSpec *pspec;
- GValue par = {0, };
+ GValue par = { 0, };
if (priv->texture == NULL)
return;
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (priv->texture),
- "pixel-aspect-ratio");
- if (pspec)
- {
- g_value_init (&par, GST_TYPE_FRACTION);
- gst_value_set_fraction (&par, priv->par_n, priv->par_d);
- g_object_set_property (G_OBJECT(priv->texture),
- "pixel-aspect-ratio", &par);
- g_value_unset (&par);
- }
+ "pixel-aspect-ratio");
+ if (pspec) {
+ g_value_init (&par, GST_TYPE_FRACTION);
+ gst_value_set_fraction (&par, priv->par_n, priv->par_d);
+ g_object_set_property (G_OBJECT (priv->texture),
+ "pixel-aspect-ratio", &par);
+ g_value_unset (&par);
+ }
}
static gboolean
-clutter_gst_parse_caps (GstCaps *caps,
- ClutterGstVideoSink *sink,
- gboolean save)
+clutter_gst_parse_caps (GstCaps * caps,
+ ClutterGstVideoSink * sink, gboolean save)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
- GstCaps *intersection;
- GstVideoInfo vinfo;
- gint fps_n, fps_d;
- gint par_n, par_d;
- gint width, height;
- ClutterGstVideoFormat format;
- gboolean bgr;
- ClutterGstRenderer *renderer;
+ GstCaps *intersection;
+ GstVideoInfo vinfo;
+ gint fps_n, fps_d;
+ gint par_n, par_d;
+ gint width, height;
+ ClutterGstVideoFormat format;
+ gboolean bgr;
+ ClutterGstRenderer *renderer;
intersection = gst_caps_intersect (priv->caps, caps);
if (gst_caps_is_empty (intersection))
@@ -369,84 +357,82 @@ clutter_gst_parse_caps (GstCaps *caps,
if (!gst_video_info_from_caps (&vinfo, caps))
goto unknown_format;
- width = vinfo.width;
+ width = vinfo.width;
height = vinfo.height;
/* We dont yet use fps or pixel aspect into but handy to have */
- fps_n = vinfo.fps_n;
- fps_d = vinfo.fps_d;
+ fps_n = vinfo.fps_n;
+ fps_d = vinfo.fps_d;
par_n = vinfo.par_n;
par_d = vinfo.par_d;
switch (vinfo.finfo->format) {
- case GST_VIDEO_FORMAT_YV12:
- format = CLUTTER_GST_YV12;
- break;
- case GST_VIDEO_FORMAT_I420:
- format = CLUTTER_GST_I420;
- break;
- case GST_VIDEO_FORMAT_AYUV:
- format = CLUTTER_GST_AYUV;
- bgr = FALSE;
- break;
- case GST_VIDEO_FORMAT_RGB:
- format = CLUTTER_GST_RGB24;
- bgr = FALSE;
- break;
- case GST_VIDEO_FORMAT_BGR:
- format = CLUTTER_GST_RGB24;
- bgr = TRUE;
- break;
- case GST_VIDEO_FORMAT_RGBA:
- format = CLUTTER_GST_RGB32;
- bgr = FALSE;
- break;
- case GST_VIDEO_FORMAT_BGRA:
- format = CLUTTER_GST_RGB32;
- bgr = TRUE;
- break;
- default:
- break;
+ case GST_VIDEO_FORMAT_YV12:
+ format = CLUTTER_GST_YV12;
+ break;
+ case GST_VIDEO_FORMAT_I420:
+ format = CLUTTER_GST_I420;
+ break;
+ case GST_VIDEO_FORMAT_AYUV:
+ format = CLUTTER_GST_AYUV;
+ bgr = FALSE;
+ break;
+ case GST_VIDEO_FORMAT_RGB:
+ format = CLUTTER_GST_RGB24;
+ bgr = FALSE;
+ break;
+ case GST_VIDEO_FORMAT_BGR:
+ format = CLUTTER_GST_RGB24;
+ bgr = TRUE;
+ break;
+ case GST_VIDEO_FORMAT_RGBA:
+ format = CLUTTER_GST_RGB32;
+ bgr = FALSE;
+ break;
+ case GST_VIDEO_FORMAT_BGRA:
+ format = CLUTTER_GST_RGB32;
+ bgr = TRUE;
+ break;
+ default:
+ break;
}
/* find a renderer that can display our format */
renderer = clutter_gst_find_renderer_by_format (sink, format);
- if (G_UNLIKELY (renderer == NULL))
- {
- GST_ERROR_OBJECT (sink, "could not find a suitable renderer");
- return FALSE;
- }
+ if (G_UNLIKELY (renderer == NULL)) {
+ GST_ERROR_OBJECT (sink, "could not find a suitable renderer");
+ return FALSE;
+ }
GST_INFO_OBJECT (sink, "using the %s renderer", renderer->name);
- if (save)
- {
- priv->width = width;
- priv->height = height;
+ if (save) {
+ priv->width = width;
+ priv->height = height;
- /* We dont yet use fps or pixel aspect into but handy to have */
- priv->fps_n = fps_n;
- priv->fps_d = fps_d;
+ /* We dont yet use fps or pixel aspect into but handy to have */
+ priv->fps_n = fps_n;
+ priv->fps_d = fps_d;
- priv->par_n = par_n;
- priv->par_d = par_d;
+ priv->par_n = par_n;
+ priv->par_d = par_d;
- /* If we happen to use a ClutterGstVideoTexture, now is to good time
- * to instruct it about the pixel aspect ratio so we can have a
- * correct natural width/height */
- ensure_texture_pixel_aspect_ratio (sink);
+ /* If we happen to use a ClutterGstVideoTexture, now is to good time
+ * to instruct it about the pixel aspect ratio so we can have a
+ * correct natural width/height */
+ ensure_texture_pixel_aspect_ratio (sink);
- priv->format = format;
- priv->bgr = bgr;
+ priv->format = format;
+ priv->bgr = bgr;
- priv->renderer = renderer;
- GST_INFO_OBJECT (sink, "using the %s renderer", priv->renderer->name);
- }
+ priv->renderer = renderer;
+ GST_INFO_OBJECT (sink, "using the %s renderer", priv->renderer->name);
+ }
return TRUE;
- unknown_format:
+unknown_format:
{
GST_WARNING_OBJECT (sink, "Could not figure format of input caps");
return FALSE;
@@ -454,9 +440,8 @@ clutter_gst_parse_caps (GstCaps *caps,
}
static gboolean
-on_stage_destroyed (ClutterStage *stage,
- ClutterEvent *event,
- gpointer user_data)
+on_stage_destroyed (ClutterStage * stage,
+ ClutterEvent * event, gpointer user_data)
{
ClutterGstSource *gst_source = user_data;
ClutterGstVideoSinkPrivate *priv = gst_source->sink->priv;
@@ -480,10 +465,8 @@ on_stage_destroyed (ClutterStage *stage,
}
static void
-on_stage_allocation_changed (ClutterStage *stage,
- ClutterActorBox *box,
- ClutterAllocationFlags flags,
- gpointer user_data)
+on_stage_allocation_changed (ClutterStage * stage,
+ ClutterActorBox * box, ClutterAllocationFlags flags, gpointer user_data)
{
ClutterGstSource *gst_source = user_data;
ClutterGstVideoSinkPrivate *priv = gst_source->sink->priv;
@@ -500,9 +483,8 @@ on_stage_allocation_changed (ClutterStage *stage,
}
static gboolean
-clutter_gst_source_dispatch (GSource *source,
- GSourceFunc callback,
- gpointer user_data)
+clutter_gst_source_dispatch (GSource * source,
+ GSourceFunc callback, gpointer user_data)
{
ClutterGstSource *gst_source = (ClutterGstSource *) source;
ClutterGstVideoSinkPrivate *priv = gst_source->sink->priv;
@@ -510,60 +492,56 @@ clutter_gst_source_dispatch (GSource *source,
g_mutex_lock (&gst_source->buffer_lock);
- if (G_UNLIKELY (gst_source->has_new_caps))
- {
- GstCaps *caps = gst_pad_get_current_caps(
- GST_BASE_SINK_PAD((GST_BASE_SINK(gst_source->sink))));
+ if (G_UNLIKELY (gst_source->has_new_caps)) {
+ GstCaps *caps =
+ gst_pad_get_current_caps (GST_BASE_SINK_PAD ((GST_BASE_SINK
+ (gst_source->sink))));
- if (priv->renderer)
- priv->renderer->deinit (gst_source->sink);
+ if (priv->renderer)
+ priv->renderer->deinit (gst_source->sink);
+ clutter_gst_parse_caps (caps, gst_source->sink, TRUE);
+ gst_source->has_new_caps = FALSE;
+
+ if (!priv->texture) {
+ ClutterActor *stage = clutter_stage_get_default ();
+ ClutterActor *actor = g_object_new (CLUTTER_TYPE_TEXTURE,
+ "disable-slicing", TRUE,
+ NULL);
+
+ clutter_gst_video_sink_set_texture (gst_source->sink,
+ CLUTTER_TEXTURE (actor));
+ clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
+ clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
+ clutter_stage_set_no_clear_hint (CLUTTER_STAGE (stage), TRUE);
+
+ g_signal_connect (stage, "delete-event",
+ G_CALLBACK (on_stage_destroyed), gst_source);
+ g_signal_connect (stage, "allocation-changed",
+ G_CALLBACK (on_stage_allocation_changed), gst_source);
+
+ clutter_gst_parse_caps (caps, gst_source->sink, TRUE);
+ clutter_actor_set_size (stage, priv->width, priv->height);
+ clutter_actor_show (stage);
+ } else {
clutter_gst_parse_caps (caps, gst_source->sink, TRUE);
- gst_source->has_new_caps = FALSE;
-
- if (!priv->texture)
- {
- ClutterActor *stage = clutter_stage_get_default ();
- ClutterActor *actor = g_object_new (CLUTTER_TYPE_TEXTURE,
- "disable-slicing", TRUE,
- NULL);
-
- clutter_gst_video_sink_set_texture (gst_source->sink,
- CLUTTER_TEXTURE (actor));
- clutter_stage_set_user_resizable (CLUTTER_STAGE (stage), TRUE);
- clutter_container_add_actor (CLUTTER_CONTAINER (stage), actor);
- clutter_stage_set_no_clear_hint (CLUTTER_STAGE (stage), TRUE);
-
- g_signal_connect (stage, "delete-event",
- G_CALLBACK (on_stage_destroyed), gst_source);
- g_signal_connect (stage, "allocation-changed",
- G_CALLBACK (on_stage_allocation_changed), gst_source);
-
- clutter_gst_parse_caps (caps, gst_source->sink, TRUE);
- clutter_actor_set_size (stage, priv->width, priv->height);
- clutter_actor_show (stage);
- }
- else
- {
- clutter_gst_parse_caps (caps, gst_source->sink, TRUE);
- }
-
- priv->renderer->init (gst_source->sink);
- gst_source->has_new_caps = FALSE;
-
- ensure_texture_pixel_aspect_ratio (gst_source->sink);
}
+ priv->renderer->init (gst_source->sink);
+ gst_source->has_new_caps = FALSE;
+
+ ensure_texture_pixel_aspect_ratio (gst_source->sink);
+ }
+
buffer = gst_source->buffer;
gst_source->buffer = NULL;
g_mutex_unlock (&gst_source->buffer_lock);
- if (buffer)
- {
- priv->renderer->upload (gst_source->sink, buffer);
- gst_buffer_unref (buffer);
- }
+ if (buffer) {
+ priv->renderer->upload (gst_source->sink, buffer);
+ gst_buffer_unref (buffer);
+ }
return TRUE;
}
@@ -576,8 +554,7 @@ static GSourceFuncs gst_source_funcs = {
};
static void
-clutter_gst_video_sink_set_priority (ClutterGstVideoSink *sink,
- int priority)
+clutter_gst_video_sink_set_priority (ClutterGstVideoSink * sink, int priority)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
@@ -593,15 +570,14 @@ clutter_gst_video_sink_set_priority (ClutterGstVideoSink *sink,
#ifdef CLUTTER_COGL_HAS_GL
static void
-_string_array_to_char_array (char *dst,
- const char *src[])
+_string_array_to_char_array (char *dst, const char *src[])
{
int i, n;
for (i = 0; src[i]; i++) {
- n = strlen (src[i]);
- memcpy (dst, src[i], n);
- dst += n;
+ n = strlen (src[i]);
+ memcpy (dst, src[i], n);
+ dst += n;
}
*dst = '\0';
}
@@ -660,10 +636,8 @@ _create_cogl_program (const char *source)
}
static void
-_create_template_material (ClutterGstVideoSink *sink,
- const char *source,
- gboolean set_uniforms,
- int n_layers)
+_create_template_material (ClutterGstVideoSink * sink,
+ const char *source, gboolean set_uniforms, int n_layers)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglMaterial *template;
@@ -674,36 +648,32 @@ _create_template_material (ClutterGstVideoSink *sink,
template = cogl_material_new ();
- if (source)
- {
- CoglHandle program = _create_cogl_program (source);
-
- if (set_uniforms)
- {
- unsigned int location;
-
- cogl_program_use (program);
-
- location = cogl_program_get_uniform_location (program, "ytex");
- cogl_program_set_uniform_1i (program, location, 0);
- if (n_layers > 1)
- {
- location = cogl_program_get_uniform_location (program, "utex");
- cogl_program_set_uniform_1i (program, location, 1);
- }
- if (n_layers > 2)
- {
- location = cogl_program_get_uniform_location (program, "vtex");
- cogl_program_set_uniform_1i (program, location, 2);
- }
-
- cogl_program_use (COGL_INVALID_HANDLE);
- }
-
- cogl_material_set_user_program (template, program);
- cogl_handle_unref (program);
+ if (source) {
+ CoglHandle program = _create_cogl_program (source);
+
+ if (set_uniforms) {
+ unsigned int location;
+
+ cogl_program_use (program);
+
+ location = cogl_program_get_uniform_location (program, "ytex");
+ cogl_program_set_uniform_1i (program, location, 0);
+ if (n_layers > 1) {
+ location = cogl_program_get_uniform_location (program, "utex");
+ cogl_program_set_uniform_1i (program, location, 1);
+ }
+ if (n_layers > 2) {
+ location = cogl_program_get_uniform_location (program, "vtex");
+ cogl_program_set_uniform_1i (program, location, 2);
+ }
+
+ cogl_program_use (COGL_INVALID_HANDLE);
}
+ cogl_material_set_user_program (template, program);
+ cogl_handle_unref (program);
+ }
+
for (i = 0; i < n_layers; i++)
cogl_material_set_layer (template, i, COGL_INVALID_HANDLE);
@@ -711,41 +681,36 @@ _create_template_material (ClutterGstVideoSink *sink,
}
static void
-_create_paint_material (ClutterGstVideoSink *sink,
- CoglHandle tex0,
- CoglHandle tex1,
- CoglHandle tex2)
+_create_paint_material (ClutterGstVideoSink * sink,
+ CoglHandle tex0, CoglHandle tex1, CoglHandle tex2)
{
- ClutterGstVideoSinkPrivate *priv= sink->priv;
+ ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglMaterial *material = cogl_material_copy (priv->material_template);
- if (tex0 != COGL_INVALID_HANDLE)
- {
- cogl_material_set_layer (material, 0, tex0);
- cogl_handle_unref (tex0);
- }
- if (tex1 != COGL_INVALID_HANDLE)
- {
- cogl_material_set_layer (material, 1, tex1);
- cogl_handle_unref (tex1);
- }
- if (tex2 != COGL_INVALID_HANDLE)
- {
- cogl_material_set_layer (material, 2, tex2);
- cogl_handle_unref (tex2);
- }
+ if (tex0 != COGL_INVALID_HANDLE) {
+ cogl_material_set_layer (material, 0, tex0);
+ cogl_handle_unref (tex0);
+ }
+ if (tex1 != COGL_INVALID_HANDLE) {
+ cogl_material_set_layer (material, 1, tex1);
+ cogl_handle_unref (tex1);
+ }
+ if (tex2 != COGL_INVALID_HANDLE) {
+ cogl_material_set_layer (material, 2, tex2);
+ cogl_handle_unref (tex2);
+ }
clutter_texture_set_cogl_material (priv->texture, material);
cogl_object_unref (material);
}
static void
-clutter_gst_dummy_deinit (ClutterGstVideoSink *sink)
+clutter_gst_dummy_deinit (ClutterGstVideoSink * sink)
{
}
static void
-clutter_gst_rgb_init (ClutterGstVideoSink *sink)
+clutter_gst_rgb_init (ClutterGstVideoSink * sink)
{
_create_template_material (sink, NULL, FALSE, 1);
}
@@ -757,8 +722,7 @@ clutter_gst_rgb_init (ClutterGstVideoSink *sink)
*/
static void
-clutter_gst_rgb24_upload (ClutterGstVideoSink *sink,
- GstBuffer *buffer)
+clutter_gst_rgb24_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglPixelFormat format;
@@ -773,27 +737,20 @@ clutter_gst_rgb24_upload (ClutterGstVideoSink *sink,
gst_buffer_map (buffer, &info, GST_MAP_READ);
tex = cogl_texture_new_from_data (priv->width,
- priv->height,
- CLUTTER_GST_TEXTURE_FLAGS,
- format,
- format,
- GST_ROUND_UP_4 (3 * priv->width),
- info.data);
+ priv->height,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ format, format, GST_ROUND_UP_4 (3 * priv->width), info.data);
gst_buffer_unmap (buffer, &info);
- _create_paint_material (sink,
- tex,
- COGL_INVALID_HANDLE,
- COGL_INVALID_HANDLE);
+ _create_paint_material (sink, tex, COGL_INVALID_HANDLE, COGL_INVALID_HANDLE);
}
-static ClutterGstRenderer rgb24_renderer =
-{
+static ClutterGstRenderer rgb24_renderer = {
"RGB 24",
CLUTTER_GST_RGB24,
0,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE("{ RGB, BGR }")),
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGB, BGR }")),
clutter_gst_rgb_init,
clutter_gst_dummy_deinit,
clutter_gst_rgb24_upload,
@@ -804,8 +761,7 @@ static ClutterGstRenderer rgb24_renderer =
*/
static void
-clutter_gst_rgb32_upload (ClutterGstVideoSink *sink,
- GstBuffer *buffer)
+clutter_gst_rgb32_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglPixelFormat format;
@@ -820,27 +776,20 @@ clutter_gst_rgb32_upload (ClutterGstVideoSink *sink,
format = COGL_PIXEL_FORMAT_RGBA_8888;
tex = cogl_texture_new_from_data (priv->width,
- priv->height,
- CLUTTER_GST_TEXTURE_FLAGS,
- format,
- format,
- GST_ROUND_UP_4 (4 * priv->width),
- info.data);
+ priv->height,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ format, format, GST_ROUND_UP_4 (4 * priv->width), info.data);
gst_buffer_unmap (buffer, &info);
- _create_paint_material (sink,
- tex,
- COGL_INVALID_HANDLE,
- COGL_INVALID_HANDLE);
+ _create_paint_material (sink, tex, COGL_INVALID_HANDLE, COGL_INVALID_HANDLE);
}
-static ClutterGstRenderer rgb32_renderer =
-{
+static ClutterGstRenderer rgb32_renderer = {
"RGB 32",
CLUTTER_GST_RGB32,
0,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE("{ RGBA, BGRA }")),
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ RGBA, BGRA }")),
clutter_gst_rgb_init,
clutter_gst_dummy_deinit,
clutter_gst_rgb32_upload,
@@ -853,11 +802,10 @@ static ClutterGstRenderer rgb32_renderer =
*/
static void
-clutter_gst_yv12_upload (ClutterGstVideoSink *sink,
- GstBuffer *buffer)
+clutter_gst_yv12_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
- gint y_row_stride = GST_ROUND_UP_4 (priv->width);
+ gint y_row_stride = GST_ROUND_UP_4 (priv->width);
gint uv_row_stride = GST_ROUND_UP_4 (priv->width / 2);
CoglHandle y_tex, u_tex, v_tex;
GstMapInfo info;
@@ -865,31 +813,24 @@ clutter_gst_yv12_upload (ClutterGstVideoSink *sink,
gst_buffer_map (buffer, &info, GST_MAP_READ);
y_tex = cogl_texture_new_from_data (priv->width,
- priv->height,
- CLUTTER_GST_TEXTURE_FLAGS,
- COGL_PIXEL_FORMAT_G_8,
- COGL_PIXEL_FORMAT_G_8,
- y_row_stride,
- info.data);
+ priv->height,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ COGL_PIXEL_FORMAT_G_8, COGL_PIXEL_FORMAT_G_8, y_row_stride, info.data);
u_tex = cogl_texture_new_from_data (priv->width / 2,
- priv->height / 2,
- CLUTTER_GST_TEXTURE_FLAGS,
- COGL_PIXEL_FORMAT_G_8,
- COGL_PIXEL_FORMAT_G_8,
- uv_row_stride,
- info.data +
- (y_row_stride * priv->height));
+ priv->height / 2,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ COGL_PIXEL_FORMAT_G_8,
+ COGL_PIXEL_FORMAT_G_8,
+ uv_row_stride, info.data + (y_row_stride * priv->height));
v_tex = cogl_texture_new_from_data (priv->width / 2,
- priv->height / 2,
- CLUTTER_GST_TEXTURE_FLAGS,
- COGL_PIXEL_FORMAT_G_8,
- COGL_PIXEL_FORMAT_G_8,
- uv_row_stride,
- info.data
- + (y_row_stride * priv->height)
- + (uv_row_stride * priv->height / 2));
+ priv->height / 2,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ COGL_PIXEL_FORMAT_G_8,
+ COGL_PIXEL_FORMAT_G_8,
+ uv_row_stride, info.data + (y_row_stride * priv->height)
+ + (uv_row_stride * priv->height / 2));
gst_buffer_unmap (buffer, &info);
@@ -897,14 +838,13 @@ clutter_gst_yv12_upload (ClutterGstVideoSink *sink,
}
static void
-clutter_gst_yv12_glsl_init (ClutterGstVideoSink *sink)
+clutter_gst_yv12_glsl_init (ClutterGstVideoSink * sink)
{
_create_template_material (sink, yv12_to_rgba_shader, TRUE, 3);
}
-static ClutterGstRenderer yv12_glsl_renderer =
-{
+static ClutterGstRenderer yv12_glsl_renderer = {
"YV12 glsl",
CLUTTER_GST_YV12,
CLUTTER_GST_GLSL | CLUTTER_GST_MULTI_TEXTURE,
@@ -922,7 +862,7 @@ static ClutterGstRenderer yv12_glsl_renderer =
#ifdef CLUTTER_COGL_HAS_GL
static void
-clutter_gst_yv12_fp_init (ClutterGstVideoSink *sink)
+clutter_gst_yv12_fp_init (ClutterGstVideoSink * sink)
{
char *shader = g_malloc (YV12_FP_SZ + 1);
_string_array_to_char_array (shader, YV12_fp);
@@ -932,8 +872,7 @@ clutter_gst_yv12_fp_init (ClutterGstVideoSink *sink)
g_free (shader);
}
-static ClutterGstRenderer yv12_fp_renderer =
-{
+static ClutterGstRenderer yv12_fp_renderer = {
"YV12 fp",
CLUTTER_GST_YV12,
CLUTTER_GST_FP | CLUTTER_GST_MULTI_TEXTURE,
@@ -952,13 +891,12 @@ static ClutterGstRenderer yv12_fp_renderer =
*/
static void
-clutter_gst_i420_glsl_init (ClutterGstVideoSink *sink)
+clutter_gst_i420_glsl_init (ClutterGstVideoSink * sink)
{
_create_template_material (sink, yv12_to_rgba_shader, TRUE, 3);
}
-static ClutterGstRenderer i420_glsl_renderer =
-{
+static ClutterGstRenderer i420_glsl_renderer = {
"I420 glsl",
CLUTTER_GST_I420,
CLUTTER_GST_GLSL | CLUTTER_GST_MULTI_TEXTURE,
@@ -977,9 +915,9 @@ static ClutterGstRenderer i420_glsl_renderer =
#ifdef CLUTTER_COGL_HAS_GL
static void
-clutter_gst_i420_fp_init (ClutterGstVideoSink *sink)
+clutter_gst_i420_fp_init (ClutterGstVideoSink * sink)
{
- char *shader = g_malloc(I420_FP_SZ + 1);
+ char *shader = g_malloc (I420_FP_SZ + 1);
_string_array_to_char_array (shader, I420_fp);
_create_template_material (sink, shader, FALSE, 3);
@@ -987,8 +925,7 @@ clutter_gst_i420_fp_init (ClutterGstVideoSink *sink)
g_free (shader);
}
-static ClutterGstRenderer i420_fp_renderer =
-{
+static ClutterGstRenderer i420_fp_renderer = {
"I420 fp",
CLUTTER_GST_I420,
CLUTTER_GST_FP | CLUTTER_GST_MULTI_TEXTURE,
@@ -1008,14 +945,13 @@ static ClutterGstRenderer i420_fp_renderer =
*/
static void
-clutter_gst_ayuv_glsl_init(ClutterGstVideoSink *sink)
+clutter_gst_ayuv_glsl_init (ClutterGstVideoSink * sink)
{
_create_template_material (sink, ayuv_to_rgba_shader, TRUE, 1);
}
static void
-clutter_gst_ayuv_upload (ClutterGstVideoSink *sink,
- GstBuffer *buffer)
+clutter_gst_ayuv_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglHandle tex;
@@ -1024,24 +960,18 @@ clutter_gst_ayuv_upload (ClutterGstVideoSink *sink,
gst_buffer_map (buffer, &info, GST_MAP_READ);
tex =
- cogl_texture_new_from_data (priv->width,
- priv->height,
- CLUTTER_GST_TEXTURE_FLAGS,
- COGL_PIXEL_FORMAT_RGBA_8888,
- COGL_PIXEL_FORMAT_RGBA_8888,
- GST_ROUND_UP_4 (4 * priv->width),
- info.data);
+ cogl_texture_new_from_data (priv->width,
+ priv->height,
+ CLUTTER_GST_TEXTURE_FLAGS,
+ COGL_PIXEL_FORMAT_RGBA_8888,
+ COGL_PIXEL_FORMAT_RGBA_8888, GST_ROUND_UP_4 (4 * priv->width), info.data);
gst_buffer_unmap (buffer, &info);
- _create_paint_material (sink,
- tex,
- COGL_INVALID_HANDLE,
- COGL_INVALID_HANDLE);
+ _create_paint_material (sink, tex, COGL_INVALID_HANDLE, COGL_INVALID_HANDLE);
}
-static ClutterGstRenderer ayuv_glsl_renderer =
-{
+static ClutterGstRenderer ayuv_glsl_renderer = {
"AYUV glsl",
CLUTTER_GST_AYUV,
CLUTTER_GST_GLSL,
@@ -1057,7 +987,7 @@ static ClutterGstRenderer ayuv_glsl_renderer =
#ifdef HAVE_HW_DECODER_SUPPORT
static void
-clutter_gst_hw_init (ClutterGstVideoSink *sink)
+clutter_gst_hw_init (ClutterGstVideoSink * sink)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
CoglHandle tex;
@@ -1065,8 +995,7 @@ clutter_gst_hw_init (ClutterGstVideoSink *sink)
/* Default texture is 1x1, let's replace it with one big enough. */
tex = cogl_texture_new_with_size (priv->width, priv->height,
- CLUTTER_GST_TEXTURE_FLAGS,
- COGL_PIXEL_FORMAT_BGRA_8888);
+ CLUTTER_GST_TEXTURE_FLAGS, COGL_PIXEL_FORMAT_BGRA_8888);
material = cogl_material_new ();
cogl_material_set_layer (material, 0, tex);
@@ -1077,7 +1006,7 @@ clutter_gst_hw_init (ClutterGstVideoSink *sink)
}
static void
-clutter_gst_hw_deinit (ClutterGstVideoSink *sink)
+clutter_gst_hw_deinit (ClutterGstVideoSink * sink)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
@@ -1087,8 +1016,7 @@ clutter_gst_hw_deinit (ClutterGstVideoSink *sink)
}
static void
-clutter_gst_hw_upload (ClutterGstVideoSink *sink,
- GstBuffer *buffer)
+clutter_gst_hw_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
{
ClutterGstVideoSinkPrivate *priv = sink->priv;
GstSurfaceMeta *surface = gst_buffer_get_surface_meta (buffer);
@@ -1099,7 +1027,7 @@ clutter_gst_hw_upload (ClutterGstVideoSink *sink,
CoglHandle tex;
GLuint gl_texture;
GLenum gl_target;
- GValue value = {0};
+ GValue value = { 0 };
tex = clutter_texture_get_cogl_texture (priv->texture);
cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
@@ -1108,7 +1036,8 @@ clutter_gst_hw_upload (ClutterGstVideoSink *sink,
g_value_init (&value, G_TYPE_UINT);
g_value_set_uint (&value, gl_texture);
- priv->converter = gst_surface_meta_create_converter (surface, "opengl", &value);
+ priv->converter =
+ gst_surface_meta_create_converter (surface, "opengl", &value);
g_return_if_fail (priv->converter);
}
@@ -1118,8 +1047,7 @@ clutter_gst_hw_upload (ClutterGstVideoSink *sink,
clutter_actor_queue_redraw (CLUTTER_ACTOR (priv->texture));
}
-static ClutterGstRenderer hw_renderer =
-{
+static ClutterGstRenderer hw_renderer = {
"HW surface",
CLUTTER_GST_SURFACE,
0,
@@ -1133,31 +1061,30 @@ static ClutterGstRenderer hw_renderer =
static GSList *
clutter_gst_build_renderers_list (void)
{
- GSList *list = NULL;
- gint nb_texture_units = 0;
- gint features = 0, i;
+ GSList *list = NULL;
+ gint nb_texture_units = 0;
+ gint features = 0, i;
/* The order of the list of renderers is important. They will be prepended
* to a GSList and we'll iterate over that list to choose the first matching
* renderer. Thus if you want to use the fp renderer over the glsl one, the
* fp renderer has to be put after the glsl one in this array */
- ClutterGstRenderer *renderers[] =
- {
- &rgb24_renderer,
- &rgb32_renderer,
- &yv12_glsl_renderer,
- &i420_glsl_renderer,
+ ClutterGstRenderer *renderers[] = {
+ &rgb24_renderer,
+ &rgb32_renderer,
+ &yv12_glsl_renderer,
+ &i420_glsl_renderer,
#ifdef CLUTTER_COGL_HAS_GL
- &yv12_fp_renderer,
- &i420_fp_renderer,
+ &yv12_fp_renderer,
+ &i420_fp_renderer,
#endif
- &ayuv_glsl_renderer,
+ &ayuv_glsl_renderer,
#ifdef HAVE_HW_DECODER_SUPPORT
- &hw_renderer,
+ &hw_renderer,
#endif
- NULL
- };
+ NULL
+ };
- nb_texture_units = get_n_fragment_texture_units();
+ nb_texture_units = get_n_fragment_texture_units ();
if (nb_texture_units >= 3)
features |= CLUTTER_GST_MULTI_TEXTURE;
@@ -1172,13 +1099,12 @@ clutter_gst_build_renderers_list (void)
GST_INFO ("GL features: 0x%08x", features);
- for (i = 0; renderers[i]; i++)
- {
- gint needed = renderers[i]->flags;
+ for (i = 0; renderers[i]; i++) {
+ gint needed = renderers[i]->flags;
- if ((needed & features) == needed)
- list = g_slist_prepend (list, renderers[i]);
- }
+ if ((needed & features) == needed)
+ list = g_slist_prepend (list, renderers[i]);
+ }
return list;
}
@@ -1186,17 +1112,17 @@ clutter_gst_build_renderers_list (void)
static void
append_cap (gpointer data, gpointer user_data)
{
- ClutterGstRenderer *renderer = (ClutterGstRenderer *)data;
- GstCaps *caps = (GstCaps *)user_data;
+ ClutterGstRenderer *renderer = (ClutterGstRenderer *) data;
+ GstCaps *caps = (GstCaps *) user_data;
GstCaps *writable_caps;
writable_caps =
- gst_caps_make_writable (gst_static_caps_get (&renderer->caps));
+ gst_caps_make_writable (gst_static_caps_get (&renderer->caps));
gst_caps_append (caps, writable_caps);
}
static GstCaps *
-clutter_gst_build_caps (GSList *renderers)
+clutter_gst_build_caps (GSList * renderers)
{
GstCaps *caps;
@@ -1209,76 +1135,70 @@ clutter_gst_build_caps (GSList *renderers)
static gboolean
-navigation_event (ClutterActor *actor,
- ClutterEvent *event,
- ClutterGstVideoSink *sink)
-{
- if (event->type == CLUTTER_MOTION)
- {
- ClutterMotionEvent *mevent = (ClutterMotionEvent *) event;
-
- GST_DEBUG ("Received mouse move event to %d,%d", mevent->x, mevent->y);
- gst_navigation_send_mouse_event (GST_NAVIGATION (sink),
- "mouse-move", 0, mevent->x, mevent->y);
- }
- else if (event->type == CLUTTER_BUTTON_PRESS ||
- event->type == CLUTTER_BUTTON_RELEASE)
- {
- ClutterButtonEvent *bevent = (ClutterButtonEvent *) event;
- const char *type;
-
- GST_DEBUG ("Received button %s event at %d,%d",
- (event->type == CLUTTER_BUTTON_PRESS) ? "press" : "release",
- bevent->x, bevent->y);
- type = (event->type == CLUTTER_BUTTON_PRESS) ? "mouse-button-press" : "mouse-button-release";
- gst_navigation_send_mouse_event (GST_NAVIGATION (sink),
- type, bevent->button, bevent->x, bevent->y);
+navigation_event (ClutterActor * actor,
+ ClutterEvent * event, ClutterGstVideoSink * sink)
+{
+ if (event->type == CLUTTER_MOTION) {
+ ClutterMotionEvent *mevent = (ClutterMotionEvent *) event;
+
+ GST_DEBUG ("Received mouse move event to %d,%d", mevent->x, mevent->y);
+ gst_navigation_send_mouse_event (GST_NAVIGATION (sink),
+ "mouse-move", 0, mevent->x, mevent->y);
+ } else if (event->type == CLUTTER_BUTTON_PRESS ||
+ event->type == CLUTTER_BUTTON_RELEASE) {
+ ClutterButtonEvent *bevent = (ClutterButtonEvent *) event;
+ const char *type;
+
+ GST_DEBUG ("Received button %s event at %d,%d",
+ (event->type == CLUTTER_BUTTON_PRESS) ? "press" : "release",
+ bevent->x, bevent->y);
+ type =
+ (event->type ==
+ CLUTTER_BUTTON_PRESS) ? "mouse-button-press" : "mouse-button-release";
+ gst_navigation_send_mouse_event (GST_NAVIGATION (sink), type,
+ bevent->button, bevent->x, bevent->y);
+ } else if (event->type == CLUTTER_KEY_PRESS) {
+ ClutterKeyEvent *kevent = (ClutterKeyEvent *) event;
+ GstNavigationCommand command;
+
+ switch (kevent->keyval) {
+ case CLUTTER_KEY_Up:
+ command = GST_NAVIGATION_COMMAND_UP;
+ break;
+ case CLUTTER_KEY_Down:
+ command = GST_NAVIGATION_COMMAND_DOWN;
+ break;
+ case CLUTTER_KEY_Left:
+ command = GST_NAVIGATION_COMMAND_LEFT;
+ break;
+ case CLUTTER_KEY_Right:
+ command = GST_NAVIGATION_COMMAND_RIGHT;
+ break;
+ case CLUTTER_KEY_Return:
+ command = GST_NAVIGATION_COMMAND_ACTIVATE;
+ break;
+ default:
+ command = GST_NAVIGATION_COMMAND_INVALID;
}
- else if (event->type == CLUTTER_KEY_PRESS)
- {
- ClutterKeyEvent *kevent = (ClutterKeyEvent *) event;
- GstNavigationCommand command;
-
- switch (kevent->keyval)
- {
- case CLUTTER_KEY_Up:
- command = GST_NAVIGATION_COMMAND_UP;
- break;
- case CLUTTER_KEY_Down:
- command = GST_NAVIGATION_COMMAND_DOWN;
- break;
- case CLUTTER_KEY_Left:
- command = GST_NAVIGATION_COMMAND_LEFT;
- break;
- case CLUTTER_KEY_Right:
- command = GST_NAVIGATION_COMMAND_RIGHT;
- break;
- case CLUTTER_KEY_Return:
- command = GST_NAVIGATION_COMMAND_ACTIVATE;
- break;
- default:
- command = GST_NAVIGATION_COMMAND_INVALID;
- }
-
- if (command != GST_NAVIGATION_COMMAND_INVALID)
- {
- gst_navigation_send_command (GST_NAVIGATION (sink), command);
-
- return TRUE;
- }
+
+ if (command != GST_NAVIGATION_COMMAND_INVALID) {
+ gst_navigation_send_command (GST_NAVIGATION (sink), command);
+
+ return TRUE;
}
+ }
return FALSE;
}
static void
-clutter_gst_video_sink_init (ClutterGstVideoSink *sink)
+clutter_gst_video_sink_init (ClutterGstVideoSink * sink)
{
ClutterGstVideoSinkPrivate *priv;
sink->priv = priv =
- G_TYPE_INSTANCE_GET_PRIVATE (sink, CLUTTER_GST_TYPE_VIDEO_SINK,
- ClutterGstVideoSinkPrivate);
+ G_TYPE_INSTANCE_GET_PRIVATE (sink, CLUTTER_GST_TYPE_VIDEO_SINK,
+ ClutterGstVideoSinkPrivate);
/* We are saving the GMainContext of the caller thread (which has to be
* the clutter thread) */
@@ -1292,8 +1212,7 @@ clutter_gst_video_sink_init (ClutterGstVideoSink *sink)
}
static GstFlowReturn
-clutter_gst_video_sink_render (GstBaseSink *bsink,
- GstBuffer *buffer)
+clutter_gst_video_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
{
ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (bsink);
ClutterGstVideoSinkPrivate *priv = sink->priv;
@@ -1302,14 +1221,12 @@ clutter_gst_video_sink_render (GstBaseSink *bsink,
g_mutex_lock (&gst_source->buffer_lock);
- if (gst_source->stage_lost)
- {
- GST_ELEMENT_ERROR (bsink, RESOURCE, CLOSE,
- ("The window has been closed."),
- ("The window has been closed."));
- g_mutex_unlock (&gst_source->buffer_lock);
- return GST_FLOW_ERROR;
- }
+ if (gst_source->stage_lost) {
+ GST_ELEMENT_ERROR (bsink, RESOURCE, CLOSE,
+ ("The window has been closed."), ("The window has been closed."));
+ g_mutex_unlock (&gst_source->buffer_lock);
+ return GST_FLOW_ERROR;
+ }
if (gst_source->buffer)
gst_buffer_unref (gst_source->buffer);
@@ -1323,7 +1240,7 @@ clutter_gst_video_sink_render (GstBaseSink *bsink,
}
static GstCaps *
-clutter_gst_video_sink_get_caps (GstBaseSink *bsink, GstCaps *filter)
+clutter_gst_video_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
{
ClutterGstVideoSink *sink;
@@ -1332,13 +1249,12 @@ clutter_gst_video_sink_get_caps (GstBaseSink *bsink, GstCaps *filter)
}
static gboolean
-clutter_gst_video_sink_set_caps (GstBaseSink *bsink,
- GstCaps *caps)
+clutter_gst_video_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
{
- ClutterGstVideoSink *sink;
+ ClutterGstVideoSink *sink;
ClutterGstVideoSinkPrivate *priv;
- sink = CLUTTER_GST_VIDEO_SINK(bsink);
+ sink = CLUTTER_GST_VIDEO_SINK (bsink);
priv = sink->priv;
if (!clutter_gst_parse_caps (caps, sink, FALSE))
@@ -1353,7 +1269,7 @@ clutter_gst_video_sink_set_caps (GstBaseSink *bsink,
static void
-clutter_gst_video_sink_dispose (GObject *object)
+clutter_gst_video_sink_dispose (GObject * object)
{
ClutterGstVideoSink *self;
ClutterGstVideoSinkPrivate *priv;
@@ -1361,26 +1277,24 @@ clutter_gst_video_sink_dispose (GObject *object)
self = CLUTTER_GST_VIDEO_SINK (object);
priv = self->priv;
- if (priv->renderer)
- {
- priv->renderer->deinit (self);
- priv->renderer = NULL;
- }
+ if (priv->renderer) {
+ priv->renderer->deinit (self);
+ priv->renderer = NULL;
+ }
if (priv->texture)
clutter_gst_video_sink_set_texture (self, NULL);
- if (priv->caps)
- {
- gst_caps_unref (priv->caps);
- priv->caps = NULL;
- }
+ if (priv->caps) {
+ gst_caps_unref (priv->caps);
+ priv->caps = NULL;
+ }
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void
-clutter_gst_video_sink_finalize (GObject *object)
+clutter_gst_video_sink_finalize (GObject * object)
{
ClutterGstVideoSink *self;
ClutterGstVideoSinkPrivate *priv;
@@ -1396,8 +1310,8 @@ clutter_gst_video_sink_finalize (GObject *object)
}
static void
-clutter_gst_video_sink_set_texture (ClutterGstVideoSink *sink,
- ClutterTexture *texture)
+clutter_gst_video_sink_set_texture (ClutterGstVideoSink * sink,
+ ClutterTexture * texture)
{
const char const *events[] = {
"key-press-event",
@@ -1409,42 +1323,37 @@ clutter_gst_video_sink_set_texture (ClutterGstVideoSink *sink,
ClutterGstVideoSinkPrivate *priv = sink->priv;
guint i;
- if (priv->texture)
- {
- for (i = 0; i < priv->signal_handler_ids->len; i++)
- {
- gulong id = g_array_index (priv->signal_handler_ids, gulong, i);
- g_signal_handler_disconnect (priv->texture, id);
- }
- g_array_set_size (priv->signal_handler_ids, 0);
+ if (priv->texture) {
+ for (i = 0; i < priv->signal_handler_ids->len; i++) {
+ gulong id = g_array_index (priv->signal_handler_ids, gulong, i);
+ g_signal_handler_disconnect (priv->texture, id);
}
+ g_array_set_size (priv->signal_handler_ids, 0);
+ }
priv->texture = texture;
if (priv->texture == NULL)
return;
clutter_actor_set_reactive (CLUTTER_ACTOR (priv->texture), TRUE);
- g_object_add_weak_pointer (G_OBJECT (priv->texture), (gpointer *) &(priv->texture));
-
- for (i = 0; i < G_N_ELEMENTS (events); i++)
- {
- gulong id;
- id = g_signal_connect (priv->texture, events[i],
- G_CALLBACK (navigation_event), sink);
- g_array_append_val (priv->signal_handler_ids, id);
- }
+ g_object_add_weak_pointer (G_OBJECT (priv->texture),
+ (gpointer *) & (priv->texture));
+
+ for (i = 0; i < G_N_ELEMENTS (events); i++) {
+ gulong id;
+ id = g_signal_connect (priv->texture, events[i],
+ G_CALLBACK (navigation_event), sink);
+ g_array_append_val (priv->signal_handler_ids, id);
+ }
}
static void
-clutter_gst_video_sink_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+clutter_gst_video_sink_set_property (GObject * object,
+ guint prop_id, const GValue * value, GParamSpec * pspec)
{
ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_TEXTURE:
clutter_gst_video_sink_set_texture (sink, g_value_get_object (value));
break;
@@ -1454,20 +1363,17 @@ clutter_gst_video_sink_set_property (GObject *object,
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
- }
+ }
}
static void
-clutter_gst_video_sink_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+clutter_gst_video_sink_get_property (GObject * object,
+ guint prop_id, GValue * value, GParamSpec * pspec)
{
ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (object);
ClutterGstVideoSinkPrivate *priv = sink->priv;
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_TEXTURE:
g_value_set_object (value, priv->texture);
break;
@@ -1481,9 +1387,9 @@ clutter_gst_video_sink_get_property (GObject *object,
}
static gboolean
-clutter_gst_video_sink_start (GstBaseSink *base_sink)
+clutter_gst_video_sink_start (GstBaseSink * base_sink)
{
- ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (base_sink);
+ ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (base_sink);
ClutterGstVideoSinkPrivate *priv = sink->priv;
priv->source = clutter_gst_source_new (sink);
@@ -1493,25 +1399,24 @@ clutter_gst_video_sink_start (GstBaseSink *base_sink)
}
static gboolean
-clutter_gst_video_sink_stop (GstBaseSink *base_sink)
+clutter_gst_video_sink_stop (GstBaseSink * base_sink)
{
- ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (base_sink);
+ ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (base_sink);
ClutterGstVideoSinkPrivate *priv = sink->priv;
- if (priv->source)
- {
- GSource *source = (GSource *) priv->source;
+ if (priv->source) {
+ GSource *source = (GSource *) priv->source;
- g_source_destroy (source);
- g_source_unref (source);
- priv->source = NULL;
- }
+ g_source_destroy (source);
+ g_source_unref (source);
+ priv->source = NULL;
+ }
return TRUE;
}
static void
-clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
+clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass * klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
@@ -1519,9 +1424,7 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
GParamSpec *pspec;
GST_DEBUG_CATEGORY_INIT (clutter_gst_video_sink_debug,
- "cluttersink",
- 0,
- "clutter video sink");
+ "cluttersink", 0, "clutter video sink");
g_type_class_add_private (klass, sizeof (ClutterGstVideoSinkPrivate));
@@ -1532,15 +1435,14 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
gobject_class->finalize = clutter_gst_video_sink_finalize;
gst_element_class_add_pad_template (gstelement_class,
- gst_static_pad_template_get (&sinktemplate_all));
+ gst_static_pad_template_get (&sinktemplate_all));
gst_element_class_set_details_simple (gstelement_class,
"Clutter video sink",
"Sink/Video",
"Sends video data from a GStreamer pipeline to a Clutter texture",
"Jonathan Matthew <jonathan kaolin wh9 net>, "
- "Matthew Allum <mallum o-hand com, "
- "Chris Lord <chris o-hand com>");
+ "Matthew Allum <mallum o-hand com, " "Chris Lord <chris o-hand com>");
gstbase_sink_class->render = clutter_gst_video_sink_render;
gstbase_sink_class->preroll = clutter_gst_video_sink_render;
@@ -1558,10 +1460,9 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
* interface.
*/
pspec = g_param_spec_object ("texture",
- "Texture",
- "Texture the video will be decoded into",
- CLUTTER_TYPE_TEXTURE,
- CLUTTER_GST_PARAM_READWRITE);
+ "Texture",
+ "Texture the video will be decoded into",
+ CLUTTER_TYPE_TEXTURE, CLUTTER_GST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_TEXTURE, pspec);
/**
@@ -1574,17 +1475,16 @@ clutter_gst_video_sink_class_init (ClutterGstVideoSinkClass *klass)
* Since 1.0
*/
pspec = g_param_spec_int ("update-priority",
- "Update Priority",
- "Priority of video updates in the Clutter thread",
- -G_MAXINT, G_MAXINT,
- CLUTTER_GST_DEFAULT_PRIORITY,
- CLUTTER_GST_PARAM_READWRITE);
+ "Update Priority",
+ "Priority of video updates in the Clutter thread",
+ -G_MAXINT, G_MAXINT,
+ CLUTTER_GST_DEFAULT_PRIORITY, CLUTTER_GST_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_UPDATE_PRIORITY, pspec);
}
static void
-clutter_gst_navigation_send_event (GstNavigation *navigation,
- GstStructure *structure)
+clutter_gst_navigation_send_event (GstNavigation * navigation,
+ GstStructure * structure)
{
ClutterGstVideoSink *sink = CLUTTER_GST_VIDEO_SINK (navigation);
ClutterGstVideoSinkPrivate *priv = sink->priv;
@@ -1596,53 +1496,50 @@ clutter_gst_navigation_send_event (GstNavigation *navigation,
/* Converting pointer coordinates to the non scaled geometry
* if the structure contains pointer coordinates */
if (gst_structure_get_double (structure, "pointer_x", &x) &&
- gst_structure_get_double (structure, "pointer_y", &y))
- {
- if (clutter_actor_transform_stage_point (CLUTTER_ACTOR (priv->texture), x, y, &x_out, &y_out) == FALSE)
- {
- g_warning ("Failed to convert non-scaled coordinates for video-sink");
- return;
- }
-
- x = x_out * priv->width / clutter_actor_get_width (CLUTTER_ACTOR (priv->texture));
- y = y_out * priv->height / clutter_actor_get_height (CLUTTER_ACTOR (priv->texture));
-
- gst_structure_set (structure,
- "pointer_x", G_TYPE_DOUBLE, (gdouble) x,
- "pointer_y", G_TYPE_DOUBLE, (gdouble) y,
- NULL);
+ gst_structure_get_double (structure, "pointer_y", &y)) {
+ if (clutter_actor_transform_stage_point (CLUTTER_ACTOR (priv->texture), x,
+ y, &x_out, &y_out) == FALSE) {
+ g_warning ("Failed to convert non-scaled coordinates for video-sink");
+ return;
}
+ x = x_out * priv->width /
+ clutter_actor_get_width (CLUTTER_ACTOR (priv->texture));
+ y = y_out * priv->height /
+ clutter_actor_get_height (CLUTTER_ACTOR (priv->texture));
+
+ gst_structure_set (structure,
+ "pointer_x", G_TYPE_DOUBLE, (gdouble) x,
+ "pointer_y", G_TYPE_DOUBLE, (gdouble) y, NULL);
+ }
+
event = gst_event_new_navigation (structure);
pad = gst_pad_get_peer (GST_VIDEO_SINK_PAD (sink));
- if (GST_IS_PAD (pad) && GST_IS_EVENT (event))
- {
- gst_pad_send_event (pad, event);
+ if (GST_IS_PAD (pad) && GST_IS_EVENT (event)) {
+ gst_pad_send_event (pad, event);
- gst_object_unref (pad);
- }
+ gst_object_unref (pad);
+ }
}
static void
-clutter_gst_navigation_interface_init (GstNavigationInterface *iface)
+clutter_gst_navigation_interface_init (GstNavigationInterface * iface)
{
iface->send_event = clutter_gst_navigation_send_event;
}
gboolean
-_internal_plugin_init (GstPlugin *plugin)
+_internal_plugin_init (GstPlugin * plugin)
{
gboolean ret = gst_element_register (plugin,
- "cluttersink",
- GST_RANK_PRIMARY,
- CLUTTER_GST_TYPE_VIDEO_SINK);
+ "cluttersink",
+ GST_RANK_PRIMARY,
+ CLUTTER_GST_TYPE_VIDEO_SINK);
GST_DEBUG_CATEGORY_INIT (clutter_gst_video_sink_debug,
- "cluttersink",
- 0,
- "clutter video sink");
+ "cluttersink", 0, "clutter video sink");
return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
