frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: xv: add rgba32 format 

This commit adds RGBA32 format to XVideo along with shader for handling it.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Yuriy Vasilev <uuvasiliev@yandex.ru>
This commit is contained in:
Yuriy Vasilev 2021-09-09 18:14:02 +03:00 committed by Konstantin
parent 832b392f70
commit 15412e78c8
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
glamor/glamor_xv.c
View File

@ -161,6 +161,23 @@ static const glamor_facet glamor_facet_xv_uyvy = {
), ),
}; };
static const glamor_facet glamor_facet_xv_rgb_raw = {
.name = "xv_rgb",
.source_name = "v_texcoord0",
.vs_vars = ("in vec2 position;\n"
"in vec2 v_texcoord0;\n"
"out vec2 tcs;\n"),
.vs_exec = (GLAMOR_POS(gl_Position, position)
" tcs = v_texcoord0;\n"),
.fs_vars = ("uniform sampler2D sampler;\n"
"in vec2 tcs;\n"),
.fs_exec = (
" frag_color = texture2D(sampler, tcs);\n"
),
};
#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE) #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
XvAttributeRec glamor_xv_attributes[] = { XvAttributeRec glamor_xv_attributes[] = {
@ -181,6 +198,7 @@ XvImageRec glamor_xv_images[] = {
XVIMAGE_I420, XVIMAGE_I420,
XVIMAGE_NV12, XVIMAGE_NV12,
XVIMAGE_UYVY, XVIMAGE_UYVY,
XVIMAGE_RGB32,
}; };
int glamor_xv_num_images = ARRAY_SIZE(glamor_xv_images); int glamor_xv_num_images = ARRAY_SIZE(glamor_xv_images);
@ -201,6 +219,9 @@ glamor_init_xv_shader(ScreenPtr screen, glamor_port_private *port_priv, int id)
case FOURCC_UYVY: case FOURCC_UYVY:
glamor_facet_xv_planar = &glamor_facet_xv_uyvy; glamor_facet_xv_planar = &glamor_facet_xv_uyvy;
break; break;
case FOURCC_RGBA32:
glamor_facet_xv_planar = &glamor_facet_xv_rgb_raw;
break;
default: default:
break; break;
} }
@ -228,6 +249,7 @@ glamor_init_xv_shader(ScreenPtr screen, glamor_port_private *port_priv, int id)
glUniform1i(sampler_loc, 1); glUniform1i(sampler_loc, 1);
break; break;
case FOURCC_UYVY: case FOURCC_UYVY:
case FOURCC_RGBA32:
sampler_loc = glGetUniformLocation(port_priv->xv_prog.prog, "sampler"); sampler_loc = glGetUniformLocation(port_priv->xv_prog.prog, "sampler");
glUniform1i(sampler_loc, 0); glUniform1i(sampler_loc, 0);
break; break;
@ -346,6 +368,14 @@ glamor_xv_query_image_attributes(int id,
tmp *= (*h >> 1); tmp *= (*h >> 1);
size += tmp; size += tmp;
break; break;
case FOURCC_RGBA32:
size = *w * 4;
if(pitches)
pitches[0] = size;
if(offsets)
offsets[0] = 0;
size *= *h;
break;
case FOURCC_UYVY: case FOURCC_UYVY:
/* UYVU is single-plane really, all tranformation is processed inside a shader */ /* UYVU is single-plane really, all tranformation is processed inside a shader */
size = *w * 2; size = *w * 2;
@ -485,6 +515,14 @@ glamor_xv_render(glamor_port_private *port_priv, int id)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
break; break;
case FOURCC_RGBA32:
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, src_pixmap_priv[0]->fbo->tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
break;
default: default:
break; break;
} }
@ -647,6 +685,13 @@ glamor_xv_put_image(glamor_port_private *port_priv,
if (!port_priv->src_pix[1]) if (!port_priv->src_pix[1])
return BadAlloc; return BadAlloc;
break; break;
case FOURCC_RGBA32:
port_priv->src_pix[0] =
glamor_create_pixmap(pScreen, width, height, 32,
GLAMOR_CREATE_FBO_NO_FBO);
port_priv->src_pix[1] = NULL;
port_priv->src_pix[2] = NULL;
break;
case FOURCC_UYVY: case FOURCC_UYVY:
port_priv->src_pix[0] = port_priv->src_pix[0] =
glamor_create_pixmap(pScreen, width, height, 32, glamor_create_pixmap(pScreen, width, height, 32,
@ -739,6 +784,16 @@ glamor_xv_put_image(glamor_port_private *port_priv,
0, 0, 0, 0, 0, 0, 0, 0,
buf, srcPitch); buf, srcPitch);
break; break;
case FOURCC_RGBA32:
srcPitch = width * 4;
full_box.x1 = 0;
full_box.y1 = 0;
full_box.x2 = width;
full_box.y2 = height;
glamor_upload_boxes(&port_priv->src_pix[0]->drawable, &full_box, 1,
0, 0, 0, 0,
buf, srcPitch);
break;
default: default:
return BadMatch; return BadMatch;
} }

19
include/fourcc.h
View File

@ -176,4 +176,23 @@
XvTopToBottom \ XvTopToBottom \
} }
#define FOURCC_RGBA32 0x34325241
#define XVIMAGE_RGB32 \
{ \
FOURCC_RGBA32, \
XvRGB, \
LSBFirst, \
{'R','A','2','4', \
0x00, 0x00, 0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
32, \
XvPacked, \
1, \
32, 0xff0000, 0xff00, 0xff, \
0, 0, 0, \
0, 0, 0, \
0, 0, 0, \
{0,0,0,0, \
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
0 \
}
#endif /* _XF86_FOURCC_H_ */ #endif /* _XF86_FOURCC_H_ */