From 86cdbad63ce21034f550e15a010d5074de2a2946 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 25 Sep 2012 19:26:17 +1000 Subject: [PATCH] [598/906] examples: fix compilation of cluttershare --- tests/examples/clutter/cluttershare.c | 34 ++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tests/examples/clutter/cluttershare.c b/tests/examples/clutter/cluttershare.c index 650f61d48e..da77a0ff30 100644 --- a/tests/examples/clutter/cluttershare.c +++ b/tests/examples/clutter/cluttershare.c @@ -33,7 +33,8 @@ #include #include -#include +#include +#include /* This example shows how to use textures that come from a * gst-plugins-gl pipeline, into the clutter framework @@ -110,23 +111,44 @@ update_texture_actor (gpointer data) ClutterActor *stage = g_object_get_data (G_OBJECT (texture_actor), "stage"); CoglHandle cogl_texture = 0; GstVideoMeta *v_meta; - GstGLMeta *gl_meta; + GstVideoInfo info; + GstVideoFrame frame; + guint tex_id; v_meta = gst_buffer_get_video_meta (inbuf); - gl_meta = gst_buffer_get_gl_meta (inbuf); - if (!v_meta || !gl_meta) + if (!v_meta) { g_warning ("Required Meta was not found on buffers"); + return FALSE; + } + + gst_video_info_set_format (&info, v_meta->format, v_meta->width, + v_meta->height); + + if (!gst_video_frame_map (&frame, &info, inbuf, GST_MAP_READ | GST_MAP_GL)) { + g_warning ("Failed to map video frame"); + return FALSE; + } + + if (!gst_is_gl_memory (frame.map[0].memory)) { + g_warning ("Input buffer does not have GLMemory"); + gst_video_frame_unmap (&frame); + return FALSE; + } + + tex_id = *(guint *) frame.data[0]; /* Create a cogl texture from the gst gl texture */ glEnable (GL_TEXTURE_RECTANGLE_ARB); - glBindTexture (GL_TEXTURE_RECTANGLE_ARB, gl_meta->memory->tex_id); + glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex_id); if (glGetError () != GL_NO_ERROR) g_debug ("failed to bind texture that comes from gst-gl\n"); - cogl_texture = cogl_texture_new_from_foreign (gl_meta->memory->tex_id, + cogl_texture = cogl_texture_new_from_foreign (tex_id, GL_TEXTURE_RECTANGLE_ARB, v_meta->width, v_meta->height, 0, 0, COGL_PIXEL_FORMAT_RGBA_8888); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, 0); + gst_video_frame_unmap (&frame); + /* Previous cogl texture is replaced and so its ref counter discreases to 0. * According to the source code, glDeleteTexture is not called when the previous * ref counter of the previous cogl texture is reaching 0 because is_foreign is TRUE */