diff options
Diffstat (limited to 'WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp')
| -rw-r--r-- | WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp index 436841c..f049998 100644 --- a/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp +++ b/WebCore/platform/graphics/gtk/VideoSinkGStreamer.cpp @@ -40,10 +40,10 @@ GST_DEBUG_CATEGORY_STATIC(webkit_video_sink_debug); #define GST_CAT_DEFAULT webkit_video_sink_debug static GstElementDetails webkit_video_sink_details = - GST_ELEMENT_DETAILS((gchar*) "WebKit video sink", - (gchar*) "Sink/Video", - (gchar*) "Sends video data from a GStreamer pipeline to a Cairo surface", - (gchar*) "Alp Toker <alp@atoker.com>"); + GST_ELEMENT_DETAILS((gchar*) "WebKit video sink", + (gchar*) "Sink/Video", + (gchar*) "Sends video data from a GStreamer pipeline to a Cairo surface", + (gchar*) "Alp Toker <alp@atoker.com>"); enum { REPAINT_REQUESTED, @@ -70,10 +70,10 @@ struct _WebKitVideoSinkPrivate { }; #define _do_init(bla) \ - GST_DEBUG_CATEGORY_INIT (webkit_video_sink_debug, \ - "webkitsink", \ - 0, \ - "webkit video sink") + GST_DEBUG_CATEGORY_INIT(webkit_video_sink_debug, \ + "webkitsink", \ + 0, \ + "webkit video sink") GST_BOILERPLATE_FULL(WebKitVideoSink, webkit_video_sink, @@ -110,11 +110,11 @@ webkit_video_sink_idle_func(gpointer data) return FALSE; buffer = (GstBuffer*)g_async_queue_try_pop(priv->async_queue); - if (buffer == NULL || G_UNLIKELY(!GST_IS_BUFFER(buffer))) + if (!buffer || G_UNLIKELY(!GST_IS_BUFFER(buffer))) return FALSE; // TODO: consider priv->rgb_ordering? - cairo_surface_t* src = cairo_image_surface_create_for_data(GST_BUFFER_DATA(buffer), CAIRO_FORMAT_RGB24, priv->width, priv->height, (4 * priv->width + 3) & ~ 3); + cairo_surface_t* src = cairo_image_surface_create_for_data(GST_BUFFER_DATA(buffer), CAIRO_FORMAT_RGB24, priv->width, priv->height, (4 * priv->width + 3) & ~3); // TODO: We copy the data twice right now. This could be easily improved. cairo_t* cr = cairo_create(priv->surface); @@ -139,7 +139,7 @@ webkit_video_sink_render(GstBaseSink* bsink, GstBuffer* buffer) WebKitVideoSinkPrivate* priv = sink->priv; g_async_queue_push(priv->async_queue, gst_buffer_ref(buffer)); - g_idle_add_full(G_PRIORITY_HIGH_IDLE, webkit_video_sink_idle_func, sink, NULL); + g_idle_add_full(G_PRIORITY_HIGH_IDLE, webkit_video_sink_idle_func, sink, 0); return GST_FLOW_OK; } @@ -168,7 +168,7 @@ webkit_video_sink_set_caps(GstBaseSink* bsink, GstCaps* caps) ret = gst_structure_get_int(structure, "width", &width); ret &= gst_structure_get_int(structure, "height", &height); fps = gst_structure_get_value(structure, "framerate"); - ret &= (fps != NULL); + ret &= (fps != 0); par = gst_structure_get_value(structure, "pixel-aspect-ratio"); @@ -202,12 +202,12 @@ webkit_video_sink_dispose(GObject* object) if (priv->surface) { cairo_surface_destroy(priv->surface); - priv->surface = NULL; + priv->surface = 0; } if (priv->async_queue) { g_async_queue_unref(priv->async_queue); - priv->async_queue = NULL; + priv->async_queue = 0; } G_OBJECT_CLASS(parent_class)->dispose(object); @@ -260,7 +260,7 @@ webkit_video_sink_stop(GstBaseSink* base_sink) g_async_queue_lock(priv->async_queue); /* Remove all remaining objects from the queue */ - while(GstBuffer* buffer = (GstBuffer*)g_async_queue_try_pop_unlocked(priv->async_queue)) + while (GstBuffer* buffer = (GstBuffer*)g_async_queue_try_pop_unlocked(priv->async_queue)) gst_buffer_unref(buffer); g_async_queue_unlock(priv->async_queue); @@ -291,8 +291,8 @@ webkit_video_sink_class_init(WebKitVideoSinkClass* klass) G_TYPE_FROM_CLASS(klass), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), 0, - NULL, - NULL, + 0, + 0, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -314,7 +314,7 @@ webkit_video_sink_class_init(WebKitVideoSinkClass* klass) GstElement* webkit_video_sink_new(cairo_surface_t* surface) { - return (GstElement*)g_object_new(WEBKIT_TYPE_VIDEO_SINK, "surface", surface, NULL); + return (GstElement*)g_object_new(WEBKIT_TYPE_VIDEO_SINK, "surface", surface, 0); } void |