[768/906] gltestsrc: Fix usage of FBO API

This commit is contained in:
Sebastian Dröge 2013-07-16 16:17:11 +02:00 committed by Matthew Waters
parent d64c1aab28
commit abdcb4a51b

View file

@ -88,8 +88,7 @@ static gboolean gst_gl_test_src_stop (GstBaseSrc * basesrc);
static gboolean gst_gl_test_src_decide_allocation (GstBaseSrc * basesrc, static gboolean gst_gl_test_src_decide_allocation (GstBaseSrc * basesrc,
GstQuery * query); GstQuery * query);
static void gst_gl_test_src_callback (gint width, gint height, guint texture, static void gst_gl_test_src_callback (gpointer stuff);
gpointer stuff);
#define GST_TYPE_GL_TEST_SRC_PATTERN (gst_gl_test_src_pattern_get_type ()) #define GST_TYPE_GL_TEST_SRC_PATTERN (gst_gl_test_src_pattern_get_type ())
static GType static GType
@ -489,9 +488,8 @@ gst_gl_test_src_fill (GstPushSrc * psrc, GstBuffer * buffer)
gst_buffer_replace (&src->buffer, buffer); gst_buffer_replace (&src->buffer, buffer);
//blocking call, generate a FBO //blocking call, generate a FBO
if (!gst_gl_display_use_fbo (src->display, width, height, src->fbo, if (!gst_gl_display_use_fbo_v2 (src->display, width, height, src->fbo,
src->depthbuffer, out_tex, gst_gl_test_src_callback, src->depthbuffer, out_tex, gst_gl_test_src_callback,
0, 0, 0, 0, width, 0, height, GST_GL_DISPLAY_PROJECTION_ORTHO2D,
(gpointer) src)) { (gpointer) src)) {
goto not_negotiated; goto not_negotiated;
} }
@ -646,8 +644,7 @@ gst_gl_test_src_decide_allocation (GstBaseSrc * basesrc, GstQuery * query)
//opengl scene //opengl scene
static void static void
gst_gl_test_src_callback (gint width, gint height, guint texture, gst_gl_test_src_callback (gpointer stuff)
gpointer stuff)
{ {
GstGLTestSrc *src = GST_GL_TEST_SRC (stuff); GstGLTestSrc *src = GST_GL_TEST_SRC (stuff);