mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/examples: update gtk examples for glupload

Browse source
This commit is contained in:
Matthew Waters 2015-05-31 15:42:48 +10:00
parent 21cbf763b0
commit 5f0c006a82
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/examples/gl/gtk/filternovideooverlay/main.cpp
View file

@ -130,7 +130,7 @@ gint main (gint argc, gchar *argv[])
gtk_widget_show (window_control); gtk_widget_show (window_control);
GstElement* videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc"); GstElement* videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc");
GstElement* glfilterlaplacian = gst_element_factory_make ("glfilterblur", "glfilterblur"); GstElement* upload = gst_element_factory_make ("glupload", "glupload");
GstElement* glfiltercube = gst_element_factory_make ("glfiltercube", "glfiltercube"); GstElement* glfiltercube = gst_element_factory_make ("glfiltercube", "glfiltercube");
GstElement* videosink = gst_element_factory_make ("glimagesink", "glimagesink"); GstElement* videosink = gst_element_factory_make ("glimagesink", "glimagesink");
@ -138,12 +138,12 @@ gint main (gint argc, gchar *argv[])
"width", G_TYPE_INT, 640, "width", G_TYPE_INT, 640,
"height", G_TYPE_INT, 480, "height", G_TYPE_INT, 480,
"framerate", GST_TYPE_FRACTION, 25, 1, "framerate", GST_TYPE_FRACTION, 25, 1,
"format", G_TYPE_STRING, "YV12", "format", G_TYPE_STRING, "RGBA",
NULL) ; NULL) ;
gst_bin_add_many (GST_BIN (pipeline), videosrc, glfiltercube, glfilterlaplacian, videosink, NULL); gst_bin_add_many (GST_BIN (pipeline), videosrc, upload, glfiltercube, videosink, NULL);
gboolean link_ok = gst_element_link_filtered(videosrc, glfiltercube, caps) ; gboolean link_ok = gst_element_link_filtered(videosrc, upload, caps) ;
gst_caps_unref(caps) ; gst_caps_unref(caps) ;
if(!link_ok) if(!link_ok)
{ {
@ -151,7 +151,7 @@ gint main (gint argc, gchar *argv[])
return -1; return -1;
} }
if(!gst_element_link_many(glfiltercube, glfilterlaplacian, videosink, NULL)) if(!gst_element_link_many(upload, glfiltercube, videosink, NULL))
{ {
g_warning("Failed to link glfiltercube to videosink!\n") ; g_warning("Failed to link glfiltercube to videosink!\n") ;
return -1; return -1;

10
tests/examples/gl/gtk/filtervideooverlay/main.cpp
View file

@ -220,20 +220,20 @@ gint main (gint argc, gchar *argv[])
g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(destroy_cb), pipeline); g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(destroy_cb), pipeline);
GstElement* videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc"); GstElement* videosrc = gst_element_factory_make ("videotestsrc", "videotestsrc");
GstElement* upload = gst_element_factory_make ("glupload", "glupload");
GstElement* glfiltercube = gst_element_factory_make ("glfiltercube", "glfiltercube"); GstElement* glfiltercube = gst_element_factory_make ("glfiltercube", "glfiltercube");
GstElement* glfilterlaplacian = gst_element_factory_make ("glfilterlaplacian", "glfilterlaplacian");
GstElement* videosink = gst_element_factory_make ("glimagesink", "glimagesink"); GstElement* videosink = gst_element_factory_make ("glimagesink", "glimagesink");
GstCaps *caps = gst_caps_new_simple("video/x-raw", GstCaps *caps = gst_caps_new_simple("video/x-raw",
"width", G_TYPE_INT, 640, "width", G_TYPE_INT, 640,
"height", G_TYPE_INT, 480, "height", G_TYPE_INT, 480,
"framerate", GST_TYPE_FRACTION, 25, 1, "framerate", GST_TYPE_FRACTION, 25, 1,
"format", G_TYPE_STRING, "AYUV", "format", G_TYPE_STRING, "RGBA",
NULL) ; NULL) ;
gst_bin_add_many (GST_BIN (pipeline), videosrc, glfiltercube, glfilterlaplacian, videosink, NULL); gst_bin_add_many (GST_BIN (pipeline), videosrc, upload, glfiltercube, videosink, NULL);
gboolean link_ok = gst_element_link_filtered(videosrc, glfiltercube, caps) ; gboolean link_ok = gst_element_link_filtered(videosrc, upload, caps) ;
gst_caps_unref(caps) ; gst_caps_unref(caps) ;
if(!link_ok) if(!link_ok)
{ {
@ -241,7 +241,7 @@ gint main (gint argc, gchar *argv[])
return -1; return -1;
} }
if(!gst_element_link_many(glfiltercube, glfilterlaplacian, videosink, NULL)) if(!gst_element_link_many(upload, glfiltercube, videosink, NULL))
{ {
g_warning("Failed to link glfiltercube to videosink!\n") ; g_warning("Failed to link glfiltercube to videosink!\n") ;
return -1; return -1;