diff options
| author | David Schleef <ds@schleef.org> | 2007-12-15 06:33:37 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2007-12-15 06:33:37 +0000 |
| commit | 1a1691eb0251dfd7925c1f3922d983e5c74414ab (patch) | |
| tree | f5de8d2dbfdbf563d5f7d3b64acfe39c81ca07e7 /sys/glsink/glvideo.c | |
| parent | b2a023be7baa09662fc63cf177a1adc79b0b3cf2 (diff) | |
| download | gst-plugins-bad-1a1691eb0251dfd7925c1f3922d983e5c74414ab.tar.gz gst-plugins-bad-1a1691eb0251dfd7925c1f3922d983e5c74414ab.tar.bz2 gst-plugins-bad-1a1691eb0251dfd7925c1f3922d983e5c74414ab.zip | |
sys/glsink/gstvideo-common.*: Pull together some common raw video functions into one location.
Original commit message from CVS:
* sys/glsink/gstvideo-common.c:
* sys/glsink/gstvideo-common.h:
Pull together some common raw video functions into one location.
This should eventually move to -base.
* sys/glsink/Makefile.am:
* sys/glsink/glimagesink.c:
* sys/glsink/glimagesink.h:
* sys/glsink/glvideo.c:
* sys/glsink/glvideo.h:
* sys/glsink/gstopengl.c:
Use the new video-common.h stuff. Readd support for RGB video.
Diffstat (limited to 'sys/glsink/glvideo.c')
| -rw-r--r-- | sys/glsink/glvideo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/glsink/glvideo.c b/sys/glsink/glvideo.c index 93a239db..169f41c6 100644 --- a/sys/glsink/glvideo.c +++ b/sys/glsink/glvideo.c @@ -328,13 +328,13 @@ glv_drawable_draw_image (GLVideoDrawable * drawable, GLVideoImageType type, glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); switch (type) { - case GLVIDEO_IMAGE_TYPE_RGBA: + case GLVIDEO_IMAGE_TYPE_RGBx: glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); glTexSubImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, data); break; - case GLVIDEO_IMAGE_TYPE_BGRA: + case GLVIDEO_IMAGE_TYPE_BGRx: glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); glTexSubImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, width, height, @@ -351,6 +351,7 @@ glv_drawable_draw_image (GLVideoDrawable * drawable, GLVideoImageType type, 0, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_REV_MESA, NULL); glTexSubImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, 0, 0, width, height, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_MESA, data); + break; default: g_assert_not_reached (); } |