[Bug 722670] New: add GRAY8/GRAY16_LE/GRAY16_BE support to glupload
GStreamer (bugzilla.gnome.org)
bugzilla at gnome.org
Mon Jan 20 19:27:17 PST 2014
https://bugzilla.gnome.org/show_bug.cgi?id=722670
GStreamer | gst-plugins-gl | 1.2.2
Summary: add GRAY8/GRAY16_LE/GRAY16_BE support to glupload
Classification: Platform
Product: GStreamer
Version: 1.2.2
OS/Version: Linux
Status: UNCONFIRMED
Severity: normal
Priority: Normal
Component: gst-plugins-gl
AssignedTo: gstreamer-bugs at lists.freedesktop.org
ReportedBy: comicfans44 at gmail.com
QAContact: gstreamer-bugs at lists.freedesktop.org
GNOME version: ---
Created an attachment (id=266835)
View: https://bugzilla.gnome.org/attachment.cgi?id=266835
Review: https://bugzilla.gnome.org/review?bug=722670&attachment=266835
the patch file
this patch implements GRAY format upload to glupload .
>From 6837cb52a4edcd9319fe619f1c01b18c9149f56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Wang=20Xin-yu=20(=E7=8E=8B=E6=98=95=E5=AE=87)"?=
<comicfans44 at gmail.com>
Date: Fri, 17 Jan 2014 08:46:02 +0800
Subject: [PATCH] add GRAY8/GRAY16LE/BE upload support to glimagesink
the 16bit data is uploaded as LUMINANCE_ALPHA, then expanded, composed
in shader. value weight is a little complicate, high byte weight is
255*256/65535 (denormalize to [0~255] ,shift to high byte,then normalize
to [0~1]), low byte weight is 255/65535(similar)
---
gst-libs/gst/gl/gstglupload.c | 80 +++++++++++++++++++++++++++++++++++++++++
gst-libs/gst/gl/gstglupload.h | 3 +-
2 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
index 3dac6fe..d9c69b4 100644
--- a/gst-libs/gst/gl/gstglupload.c
+++ b/gst-libs/gst/gl/gstglupload.c
@@ -143,6 +143,25 @@ static const char *frag_REORDER_opengl = {
"}"
};
+#define COMPOSE_WEIGHT \
+ "const vec2 compose_weight = vec2(0.996109, 0.003891);\n"
+
+/* Compose LUMINANCE/ALPHA as 8bit-8bit value */
+static const char *frag_COMPOSE_opengl = {
+ "uniform sampler2D tex;\n"
+ "uniform vec2 tex_scale0;\n"
+ "uniform vec2 tex_scale1;\n"
+ "uniform vec2 tex_scale2;\n"
+ COMPOSE_WEIGHT
+ "void main(void)\n"
+ "{\n"
+ " vec4 t = texture2D(tex, gl_TexCoord[0].xy);\n"
+ " float value = dot(t.%c%c, compose_weight);"
+ " gl_FragColor = vec4(value, value, value, 1.0);\n"
+ "}"
+
+};
+
/* Direct fragments copy with stride-scaling */
static const char *frag_COPY_opengl = {
"uniform sampler2D tex;\n"
@@ -196,6 +215,23 @@ static const char *frag_REORDER_gles2 = {
"}"
};
+/* Compose LUMINANCE/ALPHA as 8bit-8bit value */
+static const char *frag_COMPOSE_gles2 = {
+ "precision mediump float;\n"
+ "varying vec2 v_texcoord;\n"
+ "uniform sampler2D tex;\n"
+ "uniform vec2 tex_scale0;\n"
+ "uniform vec2 tex_scale1;\n"
+ "uniform vec2 tex_scale2;\n"
+ COMPOSE_WEIGHT
+ "void main(void)\n"
+ "{\n"
+ " vec4 t = texture2D(tex, v_texcoord);\n"
+ " float value = dot(t.%c%c, compose_weight);"
+ " gl_FragColor = vec4(value, value, value, 1.0);\n"
+ "}"
+
+};
static const char *frag_AYUV_gles2 = {
"precision mediump float;\n"
"varying vec2 v_texcoord;\n"
@@ -322,6 +358,7 @@ struct _GstGLUploadPrivate
const gchar *NV12_NV21;
const gchar *REORDER;
const gchar *COPY;
+ const gchar *COMPOSE;
const gchar *vert_shader;
gboolean (*draw) (GstGLContext * context, GstGLUpload * download);
@@ -398,6 +435,7 @@ gst_gl_upload_new (GstGLContext * context)
priv->PLANAR_YUV = frag_PLANAR_YUV_opengl;
priv->AYUV = frag_AYUV_opengl;
priv->REORDER = frag_REORDER_opengl;
+ priv->COMPOSE = frag_COMPOSE_opengl;
priv->COPY = frag_COPY_opengl;
priv->NV12_NV21 = frag_NV12_NV21_opengl;
priv->vert_shader = text_vertex_shader_opengl;
@@ -410,6 +448,7 @@ gst_gl_upload_new (GstGLContext * context)
priv->PLANAR_YUV = frag_PLANAR_YUV_gles2;
priv->AYUV = frag_AYUV_gles2;
priv->REORDER = frag_REORDER_gles2;
+ priv->COMPOSE = frag_COMPOSE_gles2;
priv->COPY = frag_COPY_gles2;
priv->NV12_NV21 = frag_NV12_NV21_gles2;
priv->vert_shader = text_vertex_shader_gles2;
@@ -1017,6 +1056,17 @@ _init_upload (GstGLContext * context, GstGLUpload *
upload)
free_frag_prog = TRUE;
upload->priv->n_textures = 1;
break;
+ case GST_VIDEO_FORMAT_GRAY16_BE:
+ frag_prog = g_strdup_printf (upload->priv->COMPOSE, 'r', 'a');
+ free_frag_prog = TRUE;
+ upload->priv->n_textures = 1;
+ break;
+ case GST_VIDEO_FORMAT_GRAY16_LE:
+ frag_prog = g_strdup_printf (upload->priv->COMPOSE, 'a', 'r');
+ free_frag_prog = TRUE;
+ upload->priv->n_textures = 1;
+ break;
+ case GST_VIDEO_FORMAT_GRAY8:
case GST_VIDEO_FORMAT_RGB:
case GST_VIDEO_FORMAT_RGBx:
case GST_VIDEO_FORMAT_RGBA:
@@ -1230,6 +1280,21 @@ _do_upload_make (GstGLContext * context, GstGLUpload *
upload)
tex[0].width = in_width;
tex[0].height = in_height;
break;
+ case GST_VIDEO_FORMAT_GRAY8:
+ tex[0].internal_format = GL_LUMINANCE;
+ tex[0].format = GL_LUMINANCE;
+ tex[0].type = GL_UNSIGNED_BYTE;
+ tex[0].width = in_width;
+ tex[0].height = in_height;
+ break;
+ case GST_VIDEO_FORMAT_GRAY16_BE:
+ case GST_VIDEO_FORMAT_GRAY16_LE:
+ tex[0].internal_format = GL_LUMINANCE_ALPHA;
+ tex[0].format = GL_LUMINANCE_ALPHA;
+ tex[0].type = GL_UNSIGNED_BYTE;
+ tex[0].width = in_width;
+ tex[0].height = in_height;
+ break;
case GST_VIDEO_FORMAT_YUY2:
tex[0].internal_format = GL_LUMINANCE_ALPHA;
tex[0].format = GL_LUMINANCE_ALPHA;
@@ -1372,6 +1437,15 @@ _do_upload_fill (GstGLContext * context, GstGLUpload *
upload)
gl->BindTexture (GL_TEXTURE_2D, upload->in_texture[0]);
switch (v_format) {
+ case GST_VIDEO_FORMAT_GRAY8:
+ gl->TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, in_width, in_height,
+ GL_LUMINANCE, GL_UNSIGNED_BYTE, upload->data[0]);
+ break;
+ case GST_VIDEO_FORMAT_GRAY16_BE:
+ case GST_VIDEO_FORMAT_GRAY16_LE:
+ gl->TexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, in_width, in_height,
+ GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, upload->data[0]);
+ break;
case GST_VIDEO_FORMAT_RGB:
case GST_VIDEO_FORMAT_BGR:
gl->TexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, in_width, in_height,
@@ -1570,6 +1644,9 @@ _do_upload_draw_opengl (GstGLContext * context,
GstGLUpload * upload)
gl->Clear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
switch (v_format) {
+ case GST_VIDEO_FORMAT_GRAY8:
+ case GST_VIDEO_FORMAT_GRAY16_BE:
+ case GST_VIDEO_FORMAT_GRAY16_LE:
case GST_VIDEO_FORMAT_RGBx:
case GST_VIDEO_FORMAT_BGRx:
case GST_VIDEO_FORMAT_xRGB:
@@ -1717,6 +1794,9 @@ _do_upload_draw_gles2 (GstGLContext * context,
GstGLUpload * upload)
gl->Clear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
switch (v_format) {
+ case GST_VIDEO_FORMAT_GRAY8:
+ case GST_VIDEO_FORMAT_GRAY16_BE:
+ case GST_VIDEO_FORMAT_GRAY16_LE:
case GST_VIDEO_FORMAT_RGBx:
case GST_VIDEO_FORMAT_BGRx:
case GST_VIDEO_FORMAT_xRGB:
diff --git a/gst-libs/gst/gl/gstglupload.h b/gst-libs/gst/gl/gstglupload.h
index a56759f..c8dcb57 100644
--- a/gst-libs/gst/gl/gstglupload.h
+++ b/gst-libs/gst/gl/gstglupload.h
@@ -90,7 +90,8 @@ struct _GstGLUploadClass
*/
#define GST_GL_UPLOAD_FORMATS "{ RGB, RGBx, RGBA, BGR, BGRx, BGRA, xRGB, " \
"xBGR, ARGB, ABGR, Y444, I420, YV12, Y42B, " \
- "Y41B, NV12, NV21, YUY2, UYVY, AYUV }"
+ "Y41B, NV12, NV21, YUY2, UYVY, AYUV, " \
+ "GRAY8, GRAY16_LE, GRAY16_BE }"
/**
* GST_GL_UPLOAD_VIDEO_CAPS:
--
1.7.9.5
--
Configure bugmail: https://bugzilla.gnome.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug.
You are the assignee for the bug.
More information about the gstreamer-bugs
mailing list