diff options
author | David Schleef <ds@schleef.org> | 2007-12-29 00:37:41 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2007-12-29 00:37:41 +0000 |
commit | 9c52a9cd0993b34d0cf02a8fea4fd39b4e8609c0 (patch) | |
tree | c0c10a8f3bc5e6b2287a3b01944dfdc029b603fb /sys/glsink/gstgltestsrc.c | |
parent | 07e3e6e2bd4c69380aeab3a0517ed0a0175d1964 (diff) | |
download | gst-plugins-bad-9c52a9cd0993b34d0cf02a8fea4fd39b4e8609c0.tar.gz gst-plugins-bad-9c52a9cd0993b34d0cf02a8fea4fd39b4e8609c0.tar.bz2 gst-plugins-bad-9c52a9cd0993b34d0cf02a8fea4fd39b4e8609c0.zip |
Major cleanup of code. Convert glupload to BaseTransform.
Original commit message from CVS:
* configure.ac:
* sys/glsink/glextensions.c:
* sys/glsink/glextensions.h:
* sys/glsink/glimagesink.c:
* sys/glsink/glimagesink.h:
* sys/glsink/gstglbuffer.c:
* sys/glsink/gstglbuffer.h:
* sys/glsink/gstglconvert.c:
* sys/glsink/gstgldisplay.c:
* sys/glsink/gstgldisplay.h:
* sys/glsink/gstgldownload.c:
* sys/glsink/gstglfilter.c:
* sys/glsink/gstglfilter.h:
* sys/glsink/gstglfilterexample.c:
* sys/glsink/gstgltestsrc.c:
* sys/glsink/gstglupload.c:
Major cleanup of code. Convert glupload to BaseTransform.
Handle caps negotiation mostly correctly. Reenable in build.
Diffstat (limited to 'sys/glsink/gstgltestsrc.c')
-rw-r--r-- | sys/glsink/gstgltestsrc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/glsink/gstgltestsrc.c b/sys/glsink/gstgltestsrc.c index 563f3c5f..0a9149b4 100644 --- a/sys/glsink/gstgltestsrc.c +++ b/sys/glsink/gstgltestsrc.c @@ -520,8 +520,7 @@ gst_gl_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer) GST_LOG_OBJECT (src, "creating buffer %dx%d image for frame %d", src->width, src->height, (gint) src->n_frames); - outbuf = gst_gl_buffer_new (src->display, GST_GL_BUFFER_FORMAT_RGB, - src->width, src->height); + outbuf = gst_gl_buffer_new (src->display, src->width, src->height); gst_buffer_set_caps (GST_BUFFER (outbuf), GST_PAD_CAPS (GST_BASE_SRC_PAD (psrc))); @@ -540,6 +539,7 @@ gst_gl_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer) GL_FRAMEBUFFER_COMPLETE_EXT); glViewport (0, 0, outbuf->width, outbuf->height); + gst_gl_display_check_error (outbuf->display, __LINE__); #if 0 glClearColor (0.3, 0.3, 0.3, 1.0); @@ -556,8 +556,10 @@ gst_gl_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer) } glFlush (); + gst_gl_display_check_error (outbuf->display, __LINE__); glDeleteFramebuffersEXT (1, &fbo); + gst_gl_display_check_error (outbuf->display, __LINE__); gst_gl_display_unlock (outbuf->display); |