brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-gst: More pedantic style fixes

Browse Source 
• Fixes some overly long lines, hugging asterisks in the pointer type
  declarations and indentation issues.

• Tidies up the GLSL source so that it will look nicer in the
  debug output.

• Removes the backwards ‘parent_class’ define which hacks the
  implementation of the G_DEFINE_TYPE macro and just uses the full
  type name instead.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 3ffe8979da4d4dc7deb221e5653b6f24f41b412c)
This commit is contained in:
Neil Roberts 2013-03-19 19:37:19 +00:00 committed by Lionel Landwerlin
parent 30001939ad
commit 7acdf0114e
3 changed files with 90 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cogl-gst/cogl-gst-plugin.c
View File

@ -43,20 +43,20 @@
#define VERSION "0.0" #define VERSION "0.0"
static CoglBool static CoglBool
_plugin_init (GstPlugin * coglgstvideosink) _plugin_init (GstPlugin *coglgstvideosink)
{ {
return gst_element_register (coglgstvideosink, "coglsink", GST_RANK_PRIMARY, return gst_element_register (coglgstvideosink,
COGL_GST_TYPE_VIDEO_SINK); "coglsink",
GST_RANK_PRIMARY,
COGL_GST_TYPE_VIDEO_SINK);
} }
GST_PLUGIN_DEFINE ( GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MAJOR, GST_VERSION_MINOR,
GST_VERSION_MINOR, cogl,
cogl, "Sends video data from GStreamer to a Cogl pipeline",
"Sends video data from GStreamer to a Cogl pipeline", _plugin_init,
_plugin_init, VERSION,
VERSION, "LGPL",
"LGPL", "CoglGst",
"CoglGst", "http://gstreamer.net/")
"http://gstreamer.net/"
)

20
cogl-gst/cogl-gst-shader.c
View File

@ -38,13 +38,17 @@
const char const char
_cogl_gst_shader_rgba_to_rgba_decl[] = _cogl_gst_shader_rgba_to_rgba_decl[] =
"vec4 cogl_gst_sample_video (vec2 UV) {\n" "vec4\n"
"cogl_gst_sample_video (vec2 UV)\n"
"{\n"
" return texture2D (cogl_sampler0, UV);\n" " return texture2D (cogl_sampler0, UV);\n"
"}"; "}\n";
const char const char
_cogl_gst_shader_yv12_to_rgba_decl[] = _cogl_gst_shader_yv12_to_rgba_decl[] =
"vec4 cogl_gst_sample_video (vec2 UV) {\n" "vec4\n"
"cogl_gst_sample_video (vec2 UV)\n"
"{\n"
" float y = 1.1640625 * (texture2D (cogl_sampler0, UV).g - 0.0625);\n" " float y = 1.1640625 * (texture2D (cogl_sampler0, UV).g - 0.0625);\n"
" float u = texture2D (cogl_sampler1, UV).g - 0.5;\n" " float u = texture2D (cogl_sampler1, UV).g - 0.5;\n"
" float v = texture2D (cogl_sampler2, UV).g - 0.5;\n" " float v = texture2D (cogl_sampler2, UV).g - 0.5;\n"
@ -54,11 +58,13 @@ _cogl_gst_shader_yv12_to_rgba_decl[] =
" color.b = y + 2.015625 * u;\n" " color.b = y + 2.015625 * u;\n"
" color.a = 1.0;\n" " color.a = 1.0;\n"
" return color;\n" " return color;\n"
"}"; "}\n";
const char const char
_cogl_gst_shader_ayuv_to_rgba_decl[] = _cogl_gst_shader_ayuv_to_rgba_decl[] =
"vec4 cogl_gst_sample_video (vec2 UV) {\n" "vec4\n"
"cogl_gst_sample_video (vec2 UV)\n"
"{\n"
" vec4 color = texture2D (cogl_sampler0, UV);\n" " vec4 color = texture2D (cogl_sampler0, UV);\n"
" float y = 1.1640625 * (color.g - 0.0625);\n" " float y = 1.1640625 * (color.g - 0.0625);\n"
" float u = color.b - 0.5;\n" " float u = color.b - 0.5;\n"
@ -68,8 +74,8 @@ _cogl_gst_shader_ayuv_to_rgba_decl[] =
" color.g = y - 0.390625 * u - 0.8125 * v;\n" " color.g = y - 0.390625 * u - 0.8125 * v;\n"
" color.b = y + 2.015625 * u;\n" " color.b = y + 2.015625 * u;\n"
" return color;\n" " return color;\n"
"}"; "}\n";
const char const char
_cogl_gst_shader_default_sample[] = _cogl_gst_shader_default_sample[] =
"cogl_layer = cogl_gst_sample_video (cogl_tex_coord0_in.st);"; " cogl_layer = cogl_gst_sample_video (cogl_tex_coord0_in.st);\n";

120
cogl-gst/cogl-gst-video-sink.c
View File

@ -47,7 +47,7 @@
#define COGL_GST_TEXTURE_FLAGS \ #define COGL_GST_TEXTURE_FLAGS \
(COGL_TEXTURE_NO_SLICING | COGL_TEXTURE_NO_ATLAS) (COGL_TEXTURE_NO_SLICING | COGL_TEXTURE_NO_ATLAS)
#define COGL_GST_DEFAULT_PRIORITY (G_PRIORITY_HIGH_IDLE) #define COGL_GST_DEFAULT_PRIORITY G_PRIORITY_HIGH_IDLE
#define BASE_SINK_CAPS "{ AYUV," \ #define BASE_SINK_CAPS "{ AYUV," \
"YV12," \ "YV12," \
@ -57,15 +57,14 @@
"RGB," \ "RGB," \
"BGR }" "BGR }"
#define SINK_CAPS GST_VIDEO_CAPS_MAKE (BASE_SINK_CAPS)
#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));
#define cogl_gst_video_sink_parent_class parent_class
G_DEFINE_TYPE (CoglGstVideoSink, cogl_gst_video_sink, GST_TYPE_BASE_SINK); G_DEFINE_TYPE (CoglGstVideoSink, cogl_gst_video_sink, GST_TYPE_BASE_SINK);
enum enum
@ -93,7 +92,7 @@ typedef enum
COGL_GST_YV12, COGL_GST_YV12,
COGL_GST_SURFACE, COGL_GST_SURFACE,
COGL_GST_I420 COGL_GST_I420
}CoglGstVideoFormat; } CoglGstVideoFormat;
typedef enum typedef enum
{ {
@ -107,10 +106,10 @@ typedef struct _CoglGstSource
GMutex buffer_lock; GMutex buffer_lock;
GstBuffer *buffer; GstBuffer *buffer;
CoglBool has_new_caps; CoglBool has_new_caps;
}CoglGstSource; } CoglGstSource;
typedef void (CoglGstRendererPaint) (CoglGstVideoSink*); typedef void (CoglGstRendererPaint) (CoglGstVideoSink *);
typedef void (CoglGstRendererPostPaint) (CoglGstVideoSink*); typedef void (CoglGstRendererPostPaint) (CoglGstVideoSink *);
typedef struct _CoglGstRenderer typedef struct _CoglGstRenderer
{ {
@ -118,11 +117,11 @@ typedef struct _CoglGstRenderer
CoglGstVideoFormat format; CoglGstVideoFormat format;
int flags; int flags;
GstStaticCaps caps; GstStaticCaps caps;
void (*init) (CoglGstVideoSink *sink); void (*init) (CoglGstVideoSink *sink);
void (*deinit) (CoglGstVideoSink *sink); void (*deinit) (CoglGstVideoSink *sink);
CoglBool (*upload) (CoglGstVideoSink *sink, CoglBool (*upload) (CoglGstVideoSink *sink,
GstBuffer *buffer); GstBuffer *buffer);
}CoglGstRenderer; } CoglGstRenderer;
struct _CoglGstVideoSinkPrivate struct _CoglGstVideoSinkPrivate
{ {
@ -144,7 +143,7 @@ struct _CoglGstVideoSinkPrivate
static void static void
cogl_gst_source_finalize (GSource *source) cogl_gst_source_finalize (GSource *source)
{ {
CoglGstSource *gst_source = (CoglGstSource*) source; CoglGstSource *gst_source = (CoglGstSource *) source;
g_mutex_lock (&gst_source->buffer_lock); g_mutex_lock (&gst_source->buffer_lock);
if (gst_source->buffer) if (gst_source->buffer)
@ -155,7 +154,7 @@ cogl_gst_source_finalize (GSource *source)
} }
int int
cogl_gst_video_sink_get_free_layer (CoglGstVideoSink* sink) cogl_gst_video_sink_get_free_layer (CoglGstVideoSink *sink)
{ {
return sink->priv->free_layer; return sink->priv->free_layer;
} }
@ -178,7 +177,7 @@ static CoglBool
cogl_gst_source_prepare (GSource *source, cogl_gst_source_prepare (GSource *source,
int *timeout) int *timeout)
{ {
CoglGstSource *gst_source = (CoglGstSource*) source; CoglGstSource *gst_source = (CoglGstSource *) source;
*timeout = -1; *timeout = -1;
@ -188,7 +187,7 @@ cogl_gst_source_prepare (GSource *source,
static CoglBool static CoglBool
cogl_gst_source_check (GSource *source) cogl_gst_source_check (GSource *source)
{ {
CoglGstSource *gst_source = (CoglGstSource*) source; CoglGstSource *gst_source = (CoglGstSource *) source;
return gst_source->buffer != NULL; return gst_source->buffer != NULL;
} }
@ -198,7 +197,7 @@ cogl_gst_video_sink_set_priority (CoglGstVideoSink *sink,
int priority) int priority)
{ {
if (sink->priv->source) if (sink->priv->source)
g_source_set_priority ((GSource*) sink->priv->source, priority); g_source_set_priority ((GSource *) sink->priv->source, priority);
} }
/* We want to cache the snippets instead of recreating a new one every /* We want to cache the snippets instead of recreating a new one every
@ -268,7 +267,7 @@ create_template_pipeline (CoglGstVideoSink *sink,
g_signal_emit (sink, video_sink_signals[PIPELINE_READY_SIGNAL], 0, NULL); g_signal_emit (sink, video_sink_signals[PIPELINE_READY_SIGNAL], 0, NULL);
} }
CoglPipeline* CoglPipeline *
cogl_gst_video_sink_get_pipeline (CoglGstVideoSink *vt) cogl_gst_video_sink_get_pipeline (CoglGstVideoSink *vt)
{ {
CoglGstVideoSinkPrivate *priv = vt->priv; CoglGstVideoSinkPrivate *priv = vt->priv;
@ -365,7 +364,6 @@ map_fail:
} }
} }
static CoglGstRenderer rgb24_renderer = static CoglGstRenderer rgb24_renderer =
{ {
"RGB 24", "RGB 24",
@ -592,15 +590,15 @@ static void
append_cap (gpointer data, append_cap (gpointer data,
gpointer user_data) gpointer user_data)
{ {
CoglGstRenderer *renderer = (CoglGstRenderer*) data; CoglGstRenderer *renderer = (CoglGstRenderer *) data;
GstCaps *caps = (GstCaps*) user_data; GstCaps *caps = (GstCaps *) user_data;
GstCaps *writable_caps; GstCaps *writable_caps;
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); gst_caps_append (caps, writable_caps);
} }
static GstCaps* static GstCaps *
cogl_gst_build_caps (GSList *renderers) cogl_gst_build_caps (GSList *renderers)
{ {
GstCaps *caps; GstCaps *caps;
@ -613,7 +611,8 @@ cogl_gst_build_caps (GSList *renderers)
} }
void void
cogl_gst_video_sink_set_context (CoglGstVideoSink *vt, CoglContext *ctx) cogl_gst_video_sink_set_context (CoglGstVideoSink *vt,
CoglContext *ctx)
{ {
CoglGstVideoSinkPrivate *priv = vt->priv; CoglGstVideoSinkPrivate *priv = vt->priv;
@ -640,7 +639,7 @@ cogl_gst_video_sink_set_context (CoglGstVideoSink *vt, CoglContext *ctx)
} }
} }
static CoglGstRenderer* static CoglGstRenderer *
cogl_gst_find_renderer_by_format (CoglGstVideoSink *sink, cogl_gst_find_renderer_by_format (CoglGstVideoSink *sink,
CoglGstVideoFormat format) CoglGstVideoFormat format)
{ {
@ -650,7 +649,7 @@ cogl_gst_find_renderer_by_format (CoglGstVideoSink *sink,
for (element = priv->renderers; element; element = g_slist_next (element)) for (element = priv->renderers; element; element = g_slist_next (element))
{ {
CoglGstRenderer *candidate = (CoglGstRenderer*) element->data; CoglGstRenderer *candidate = (CoglGstRenderer *) element->data;
if (candidate->format == format) if (candidate->format == format)
{ {
renderer = candidate; renderer = candidate;
@ -661,7 +660,7 @@ cogl_gst_find_renderer_by_format (CoglGstVideoSink *sink,
return renderer; return renderer;
} }
static GstCaps* static GstCaps *
cogl_gst_video_sink_get_caps (GstBaseSink *bsink, cogl_gst_video_sink_get_caps (GstBaseSink *bsink,
GstCaps *filter) GstCaps *filter)
{ {
@ -680,7 +679,7 @@ cogl_gst_video_sink_parse_caps (GstCaps *caps,
GstVideoInfo vinfo; GstVideoInfo vinfo;
CoglGstVideoFormat format; CoglGstVideoFormat format;
CoglBool bgr = FALSE; CoglBool bgr = FALSE;
CoglGstRenderer* renderer; CoglGstRenderer *renderer;
intersection = gst_caps_intersect (priv->caps, caps); intersection = gst_caps_intersect (priv->caps, caps);
if (gst_caps_is_empty (intersection)) if (gst_caps_is_empty (intersection))
@ -691,7 +690,8 @@ cogl_gst_video_sink_parse_caps (GstCaps *caps,
if (!gst_video_info_from_caps (&vinfo, caps)) if (!gst_video_info_from_caps (&vinfo, caps))
goto unknown_format; goto unknown_format;
switch (vinfo.finfo->format) { switch (vinfo.finfo->format)
{
case GST_VIDEO_FORMAT_YV12: case GST_VIDEO_FORMAT_YV12:
format = COGL_GST_YV12; format = COGL_GST_YV12;
break; break;
@ -720,7 +720,7 @@ cogl_gst_video_sink_parse_caps (GstCaps *caps,
break; break;
default: default:
goto unhandled_format; goto unhandled_format;
} }
renderer = cogl_gst_find_renderer_by_format (sink, format); renderer = cogl_gst_find_renderer_by_format (sink, format);
@ -729,14 +729,15 @@ cogl_gst_video_sink_parse_caps (GstCaps *caps,
GST_INFO_OBJECT (sink, "found the %s renderer", renderer->name); GST_INFO_OBJECT (sink, "found the %s renderer", renderer->name);
if (save) { if (save)
priv->info = vinfo; {
priv->info = vinfo;
priv->format = format; priv->format = format;
priv->bgr = bgr; priv->bgr = bgr;
priv->renderer = renderer; priv->renderer = renderer;
} }
return TRUE; return TRUE;
@ -790,7 +791,7 @@ cogl_gst_video_sink_set_caps (GstBaseSink *bsink,
static CoglBool static CoglBool
cogl_gst_source_dispatch (GSource *source, cogl_gst_source_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
void* user_data) void *user_data)
{ {
CoglGstSource *gst_source= (CoglGstSource*) source; CoglGstSource *gst_source= (CoglGstSource*) source;
CoglGstVideoSinkPrivate *priv = gst_source->sink->priv; CoglGstVideoSinkPrivate *priv = gst_source->sink->priv;
@ -862,14 +863,14 @@ static GSourceFuncs gst_source_funcs =
cogl_gst_source_finalize cogl_gst_source_finalize
}; };
static CoglGstSource* static CoglGstSource *
cogl_gst_source_new (CoglGstVideoSink *sink) cogl_gst_source_new (CoglGstVideoSink *sink)
{ {
GSource *source; GSource *source;
CoglGstSource *gst_source; CoglGstSource *gst_source;
source = g_source_new (&gst_source_funcs, sizeof (CoglGstSource)); source = g_source_new (&gst_source_funcs, sizeof (CoglGstSource));
gst_source = (CoglGstSource*) source; gst_source = (CoglGstSource *) source;
g_source_set_can_recurse (source, TRUE); g_source_set_can_recurse (source, TRUE);
g_source_set_priority (source, COGL_GST_DEFAULT_PRIORITY); g_source_set_priority (source, COGL_GST_DEFAULT_PRIORITY);
@ -884,7 +885,7 @@ cogl_gst_source_new (CoglGstVideoSink *sink)
static void static void
cogl_gst_video_sink_init (CoglGstVideoSink *sink) cogl_gst_video_sink_init (CoglGstVideoSink *sink)
{ {
CoglGstVideoSinkPrivate* priv; CoglGstVideoSinkPrivate *priv;
sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (sink, sink->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (sink,
COGL_GST_TYPE_VIDEO_SINK, COGL_GST_TYPE_VIDEO_SINK,
@ -950,7 +951,7 @@ cogl_gst_video_sink_dispose (GObject *object)
priv->caps = NULL; priv->caps = NULL;
} }
G_OBJECT_CLASS(parent_class)->dispose (object); G_OBJECT_CLASS (cogl_gst_video_sink_parent_class)->dispose (object);
} }
static void static void
@ -960,7 +961,7 @@ cogl_gst_video_sink_finalize (GObject *object)
cogl_gst_video_sink_set_context (self, NULL); cogl_gst_video_sink_set_context (self, NULL);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (cogl_gst_video_sink_parent_class)->finalize (object);
} }
static CoglBool static CoglBool
@ -970,7 +971,7 @@ cogl_gst_video_sink_start (GstBaseSink *base_sink)
CoglGstVideoSinkPrivate *priv = sink->priv; CoglGstVideoSinkPrivate *priv = sink->priv;
priv->source = cogl_gst_source_new (sink); priv->source = cogl_gst_source_new (sink);
g_source_attach ((GSource*) priv->source, NULL); g_source_attach ((GSource *) priv->source, NULL);
priv->flow_return = GST_FLOW_OK; priv->flow_return = GST_FLOW_OK;
return TRUE; return TRUE;
} }
@ -1006,7 +1007,7 @@ cogl_gst_video_sink_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_UPDATE_PRIORITY: case PROP_UPDATE_PRIORITY:
g_value_set_int (value, g_source_get_priority ((GSource*) priv->source)); g_value_set_int (value, g_source_get_priority ((GSource *) priv->source));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -1022,7 +1023,7 @@ cogl_gst_video_sink_stop (GstBaseSink *base_sink)
if (priv->source) if (priv->source)
{ {
GSource *source = (GSource*) priv->source; GSource *source = (GSource *) priv->source;
g_source_destroy (source); g_source_destroy (source);
g_source_unref (source); g_source_unref (source);
priv->source = NULL; priv->source = NULL;
@ -1037,6 +1038,7 @@ cogl_gst_video_sink_class_init (CoglGstVideoSinkClass *klass)
GObjectClass *go_class = G_OBJECT_CLASS (klass); GObjectClass *go_class = G_OBJECT_CLASS (klass);
GstBaseSinkClass *gb_class = GST_BASE_SINK_CLASS (klass); GstBaseSinkClass *gb_class = GST_BASE_SINK_CLASS (klass);
GstElementClass *ge_class = GST_ELEMENT_CLASS (klass); GstElementClass *ge_class = GST_ELEMENT_CLASS (klass);
GstPadTemplate *pad_template;
GParamSpec *pspec; GParamSpec *pspec;
g_type_class_add_private (klass, sizeof (CoglGstVideoSinkPrivate)); g_type_class_add_private (klass, sizeof (CoglGstVideoSinkPrivate));
@ -1045,14 +1047,18 @@ cogl_gst_video_sink_class_init (CoglGstVideoSinkClass *klass)
go_class->dispose = cogl_gst_video_sink_dispose; go_class->dispose = cogl_gst_video_sink_dispose;
go_class->finalize = cogl_gst_video_sink_finalize; go_class->finalize = cogl_gst_video_sink_finalize;
gst_element_class_add_pad_template (ge_class, pad_template = gst_static_pad_template_get (&sinktemplate_all);
gst_static_pad_template_get (&sinktemplate_all)); gst_element_class_add_pad_template (ge_class, pad_template);
gst_element_class_set_metadata (ge_class, "Cogl video sink", "Sink/Video",
"Sends video data from GStreamer to a Cogl pipeline", gst_element_class_set_metadata (ge_class,
"Jonathan Matthew <jonathan@kaolin.wh9.net>, " "Cogl video sink", "Sink/Video",
"Matthew Allum <mallum@o-hand.com, " "Sends video data from GStreamer to a "
"Chris Lord <chris@o-hand.com>, " "Cogl pipeline",
"Plamena Manolova <plamena.n.manolova@intel.com>"); "Jonathan Matthew <jonathan@kaolin.wh9.net>, "
"Matthew Allum <mallum@o-hand.com, "
"Chris Lord <chris@o-hand.com>, "
"Plamena Manolova "
"<plamena.n.manolova@intel.com>");
gb_class->render = _cogl_gst_video_sink_render; gb_class->render = _cogl_gst_video_sink_render;
gb_class->preroll = _cogl_gst_video_sink_render; gb_class->preroll = _cogl_gst_video_sink_render;
@ -1093,10 +1099,10 @@ cogl_gst_video_sink_class_init (CoglGstVideoSinkClass *klass)
0 /* n_params */); 0 /* n_params */);
} }
CoglGstVideoSink* CoglGstVideoSink *
cogl_gst_video_sink_new (CoglContext *ctx) cogl_gst_video_sink_new (CoglContext *ctx)
{ {
CoglGstVideoSink* sink = g_object_new (COGL_GST_TYPE_VIDEO_SINK, NULL); CoglGstVideoSink *sink = g_object_new (COGL_GST_TYPE_VIDEO_SINK, NULL);
cogl_gst_video_sink_set_context (sink, ctx); cogl_gst_video_sink_set_context (sink, ctx);
return sink; return sink;