diff options
| author | Julien Isorce <julien.isorce@gmail.com> | 2009-11-17 23:47:24 +0100 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-03-15 18:36:38 +0100 |
| commit | a6a5ee2839c4d004dba37ff08b9f8161a54d89b2 (patch) | |
| tree | 5a08b14ffc6410d5c91407c2146acd22691fea62 /tests | |
| parent | dec44e571b673287f1a97c91b5ddd3ea052ab2ed (diff) | |
| download | gstreamer-plugins-bad-a6a5ee2839c4d004dba37ff08b9f8161a54d89b2.tar.gz | |
[405/906] glfilter: add external-opengl-context property
It repairs the cluttershare and sdlshare example
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/examples/clutter/cluttershare.c | 10 | ||||
| -rw-r--r-- | tests/examples/sdl/sdlshare.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/examples/clutter/cluttershare.c b/tests/examples/clutter/cluttershare.c index e17b06737..7c73542de 100644 --- a/tests/examples/clutter/cluttershare.c +++ b/tests/examples/clutter/cluttershare.c @@ -224,7 +224,7 @@ main (int argc, char *argv[]) #endif GstPipeline *pipeline = NULL; GstBus *bus = NULL; - GstElement *glupload = NULL; + GstElement *glfilter = NULL; GstState state = 0; ClutterActor *stage = NULL; ClutterActor *clutter_texture = NULL; @@ -287,10 +287,10 @@ main (int argc, char *argv[]) /* clutter_gl_context is an external OpenGL context with which gst-plugins-gl want to share textures */ - glupload = gst_bin_get_by_name (GST_BIN (pipeline), "glupload0"); - g_object_set (G_OBJECT (glupload), "external-opengl-context", + glfilter = gst_bin_get_by_name (GST_BIN (pipeline), "glfilter0"); + g_object_set (G_OBJECT (glfilter), "external-opengl-context", clutter_gl_context, NULL); - g_object_unref (glupload); + g_object_unref (glfilter); /* NULL to PAUSED state pipeline to make sure the gst opengl context is created and * shared with the clutter one */ @@ -359,7 +359,7 @@ main (int argc, char *argv[]) gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL); g_object_unref (pipeline); - /* make sure there is no pending gst gl buffer in the communication queues + /* make sure there is no pending gst gl buffer in the communication queues * between clutter and gst-gl */ diff --git a/tests/examples/sdl/sdlshare.c b/tests/examples/sdl/sdlshare.c index 7e85dea72..8f3064f2e 100644 --- a/tests/examples/sdl/sdlshare.c +++ b/tests/examples/sdl/sdlshare.c @@ -248,7 +248,7 @@ main (int argc, char **argv) GMainLoop *loop = NULL; GstPipeline *pipeline = NULL; GstBus *bus = NULL; - GstElement *glupload = NULL; + GstElement *glfilter = NULL; GstElement *fakesink = NULL; GstState state; GAsyncQueue *queue_input_buf = NULL; @@ -304,10 +304,10 @@ main (int argc, char **argv) gst_object_unref (bus); /* sdl_gl_context is an external OpenGL context with which gst-plugins-gl want to share textures */ - glupload = gst_bin_get_by_name (GST_BIN (pipeline), "glupload0"); - g_object_set (G_OBJECT (glupload), "external-opengl-context", + glfilter = gst_bin_get_by_name (GST_BIN (pipeline), "gleffects0"); + g_object_set (G_OBJECT (glfilter), "external-opengl-context", sdl_gl_context, NULL); - g_object_unref (glupload); + g_object_unref (glfilter); /* NULL to PAUSED state pipeline to make sure the gst opengl context is created and * shared with the sdl one */ |