summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2016-01-09 14:21:23 +0000
committerLionel Landwerlin <llandwerlin@gmail.com>2016-02-12 21:53:33 +0000
commitc168be897c9e7f0db12db470334b5898084d5b0b (patch)
tree17558be0b5ca4042c4f9ca502e7937cc34da76dd
parent96772bb01e9b90bb14246787ae96a9124ab35e07 (diff)
downloadclutter-gst-c168be897c9e7f0db12db470334b5898084d5b0b.tar.gz
video-sink: use GST_.*_OBJECT whenever possible
-rw-r--r--clutter-gst/clutter-gst-video-sink.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 19c16e2..e08aa46 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -1319,13 +1319,16 @@ clutter_gst_rgb32_upload_gl (ClutterGstVideoSink *sink,
upload_meta = gst_buffer_get_video_gl_texture_upload_meta (buffer);
if (!upload_meta) {
- GST_WARNING ("Buffer does not support GLTextureUploadMeta API");
+ GST_WARNING_OBJECT (sink,
+ "Buffer does not support GLTextureUploadMeta API");
return FALSE;
}
if (upload_meta->n_textures != priv->renderer->n_layers ||
upload_meta->texture_type[0] != GST_VIDEO_GL_TEXTURE_TYPE_RGBA) {
- GST_WARNING ("clutter-gst-video-sink only supports gl upload in a single RGBA texture");
+ GST_WARNING_OBJECT (sink,
+ "clutter-gst-video-sink only supports gl upload in a"
+ " single RGBA texture");
return FALSE;
}
@@ -1338,7 +1341,7 @@ clutter_gst_rgb32_upload_gl (ClutterGstVideoSink *sink,
cogl_texture_set_components (priv->frame[i], COGL_TEXTURE_COMPONENTS_RGBA);
if (!cogl_texture_allocate (priv->frame[i], NULL)) {
- GST_WARNING ("Couldn't allocate cogl texture");
+ GST_WARNING_OBJECT (sink, "Couldn't allocate cogl texture");
return FALSE;
}
}
@@ -1360,12 +1363,12 @@ clutter_gst_rgb32_upload_gl (ClutterGstVideoSink *sink,
if (!cogl_texture_get_gl_texture (priv->frame[0], &gl_handle[0], NULL)) {
- GST_WARNING ("Couldn't get gl texture");
+ GST_WARNING_OBJECT (sink, "Couldn't get gl texture");
return FALSE;
}
if (!gst_video_gl_texture_upload_meta_upload (upload_meta, gl_handle)) {
- GST_WARNING ("GL texture upload failed");
+ GST_WARNING_OBJECT (sink, "GL texture upload failed");
return FALSE;
}
@@ -2336,7 +2339,7 @@ clutter_gst_video_sink_event (GstBaseSink * basesink, GstEvent * event)
case GST_EVENT_FLUSH_START:
g_mutex_lock (&gst_source->buffer_lock);
if (gst_source->buffer) {
- GST_DEBUG ("Freeing existing buffer %p", gst_source->buffer);
+ GST_DEBUG_OBJECT (sink, "Freeing existing buffer %p", gst_source->buffer);
gst_buffer_unref (gst_source->buffer);
gst_source->buffer = NULL;
}