diff options
author | David Schleef <ds@schleef.org> | 2007-12-27 00:52:23 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2007-12-27 00:52:23 +0000 |
commit | 3b15f24af01272a011b9e8d9df500a7c62eb496d (patch) | |
tree | 91291cff718e109a715332794c0f575786555121 /sys/glsink/gstgltestsrc.c | |
parent | 28eec0700150e32a4f257985a53c22ab22cf562f (diff) | |
download | gst-plugins-bad-3b15f24af01272a011b9e8d9df500a7c62eb496d.tar.gz gst-plugins-bad-3b15f24af01272a011b9e8d9df500a7c62eb496d.tar.bz2 gst-plugins-bad-3b15f24af01272a011b9e8d9df500a7c62eb496d.zip |
sys/glsink/: Remove code that handles non-texture buffers. Add a
Original commit message from CVS:
* sys/glsink/BUGS:
* sys/glsink/Makefile.am:
* sys/glsink/gstglbuffer.c:
* sys/glsink/gstglbuffer.h:
* sys/glsink/gstglconvert.c:
* sys/glsink/gstgldisplay.c:
* sys/glsink/gstglfilter.c:
* sys/glsink/gstglfilter.h:
* sys/glsink/gstglfilterexample.c:
* sys/glsink/gstgltestsrc.c:
* sys/glsink/gstglupload.c:
* sys/glsink/gstopengl.c:
Remove code that handles non-texture buffers. Add a
GstGLBufferFormat type that corresponds to how to use the
texture, not the original video format. Convert gstflfilter.c
into a base class, add glfilterexample and glconvert elements.
* sys/glsink/color_matrix.c:
Minor ramblings about color conversion matrices.
Diffstat (limited to 'sys/glsink/gstgltestsrc.c')
-rw-r--r-- | sys/glsink/gstgltestsrc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/glsink/gstgltestsrc.c b/sys/glsink/gstgltestsrc.c index 66d32f60..a5e544a6 100644 --- a/sys/glsink/gstgltestsrc.c +++ b/sys/glsink/gstgltestsrc.c @@ -522,19 +522,13 @@ 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_VIDEO_FORMAT_RGBx, + outbuf = gst_gl_buffer_new (src->display, GST_GL_BUFFER_FORMAT_RGB, src->width, src->height); gst_buffer_set_caps (GST_BUFFER (outbuf), GST_PAD_CAPS (GST_BASE_SRC_PAD (psrc))); gst_gl_display_lock (outbuf->display); - /* FIXME: This should be part of buffer creation */ - glGenTextures (1, &outbuf->texture); - glBindTexture (GL_TEXTURE_RECTANGLE_ARB, outbuf->texture); - glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, - outbuf->width, outbuf->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); - glGenFramebuffersEXT (1, &fbo); glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, fbo); |