fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-27 18:48:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

vl: Do some subpicture validation.

Browse source
This commit is contained in:
Younes Manton 2010-04-18 12:16:40 -04:00
parent 99218cd2b3
commit 5eb822cb6a
3 changed files with 122 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gallium/state_trackers/xorg/xvmc/context.c
View file

@ -40,7 +40,9 @@
static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
unsigned int width, unsigned int height, int flags,
bool *found_port, int *screen, int *chroma_format,
int *mc_type, int *surface_flags)
int *mc_type, int *surface_flags,
unsigned short *subpic_max_w,
unsigned short *subpic_max_h)
{
bool found_surface = false;
XvAdaptorInfo *adaptor_info;
@ -55,6 +57,8 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
assert(chroma_format);
assert(mc_type);
assert(surface_flags);
assert(subpic_max_w);
assert(subpic_max_h);
*found_port = false;
@ -88,16 +92,20 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
*chroma_format = surface_info[l].chroma_format;
*mc_type = surface_info[l].mc_type;
*surface_flags = surface_info[l].flags;
*subpic_max_w = surface_info[l].subpicture_max_width;
*subpic_max_h = surface_info[l].subpicture_max_height;
*screen = i;
XVMC_MSG(XVMC_TRACE, "[XvMC] Found suitable context surface format.\n" \
XVMC_MSG(XVMC_TRACE, "[XvMC] Found requested context surface format.\n" \
"[XvMC] screen=%u, port=%u\n" \
"[XvMC] id: 0x%08X\n" \
"[XvMC] id=0x%08X\n" \
"[XvMC] max width=%u, max height=%u\n" \
"[XvMC] chroma format=0x%08X\n" \
"[XvMC] acceleration level=0x%08X\n" \
"[XvMC] flags=0x%08X\n",
i, port, surface_type_id, max_width, max_height, *chroma_format, *mc_type, *surface_flags);
"[XvMC] flags=0x%08X\n" \
"[XvMC] subpicture max width=%u, max height=%u\n",
i, port, surface_type_id, max_width, max_height, *chroma_format,
*mc_type, *surface_flags, *subpic_max_w, *subpic_max_h);
}
XFree(surface_info);
@ -172,6 +180,8 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
int chroma_format;
int mc_type;
int surface_flags;
unsigned short subpic_max_w;
unsigned short subpic_max_h;
Status ret;
struct vl_screen *vscreen;
struct vl_context *vctx;
@ -186,7 +196,8 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
return XvMCBadContext;
ret = Validate(dpy, port, surface_type_id, width, height, flags,
&found_port, &scrn, &chroma_format, &mc_type, &surface_flags);
&found_port, &scrn, &chroma_format, &mc_type, &surface_flags,
&subpic_max_w, &subpic_max_h);
/* Success and XvBadPort have the same value */
if (ret != Success || !found_port)
@ -239,6 +250,8 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
vctx->vpipe->set_csc_matrix(vctx->vpipe, csc);
context_priv->vctx = vctx;
context_priv->subpicture_max_width = subpic_max_w;
context_priv->subpicture_max_height = subpic_max_h;
context->context_id = XAllocID(dpy);
context->surface_type_id = surface_type_id;

118
src/gallium/state_trackers/xorg/xvmc/subpicture.c
View file

@ -28,6 +28,7 @@
#include <assert.h>
#include <X11/Xlibint.h>
#include <X11/extensions/XvMClib.h>
#include <xorg/fourcc.h>
#include <vl_winsys.h>
#include <pipe/p_screen.h>
#include <pipe/p_video_context.h>
@ -38,6 +39,93 @@
#define FOURCC_RGB 0x0000003
static enum pipe_format XvIDToPipe(int xvimage_id)
{
switch (xvimage_id) {
case FOURCC_RGB:
return PIPE_FORMAT_B8G8R8X8_UNORM;
default:
XVMC_MSG(XVMC_ERR, "[XvMC] Unrecognized Xv image ID 0x%08X.\n", xvimage_id);
return PIPE_FORMAT_NONE;
}
}
static int PipeToComponentOrder(enum pipe_format format, char *component_order)
{
assert(component_order);
switch (format) {
case PIPE_FORMAT_B8G8R8X8_UNORM:
return 0;
default:
XVMC_MSG(XVMC_ERR, "[XvMC] Unrecognized PIPE_FORMAT 0x%08X.\n", format);
component_order[0] = 0;
component_order[1] = 0;
component_order[2] = 0;
component_order[3] = 0;
}
return 0;
}
static Status Validate(Display *dpy, XvPortID port, int surface_type_id, int xvimage_id)
{
XvImageFormatValues *subpictures;
int num_subpics;
unsigned int i;
subpictures = XvMCListSubpictureTypes(dpy, port, surface_type_id, &num_subpics);
if (num_subpics < 1) {
if (subpictures)
XFree(subpictures);
return BadMatch;
}
if (!subpictures)
return BadAlloc;
for (i = 0; i < num_subpics; ++i) {
if (subpictures[i].id == xvimage_id) {
XVMC_MSG(XVMC_TRACE, "[XvMC] Found requested subpicture format.\n" \
"[XvMC] port=%u\n" \
"[XvMC] surface id=0x%08X\n" \
"[XvMC] image id=0x%08X\n" \
"[XvMC] type=%08X\n" \
"[XvMC] byte order=%08X\n" \
"[XvMC] bits per pixel=%u\n" \
"[XvMC] format=%08X\n" \
"[XvMC] num planes=%d\n",
port, surface_type_id, xvimage_id, subpictures[i].type, subpictures[i].byte_order,
subpictures[i].bits_per_pixel, subpictures[i].format, subpictures[i].num_planes);
if (subpictures[i].type == XvRGB) {
XVMC_MSG(XVMC_TRACE, "[XvMC] depth=%d\n" \
"[XvMC] red mask=0x%08X\n" \
"[XvMC] green mask=0x%08X\n" \
"[XvMC] blue mask=0x%08X\n",
subpictures[i].depth, subpictures[i].red_mask, subpictures[i].green_mask, subpictures[i].blue_mask);
}
else if (subpictures[i].type == XvYUV) {
XVMC_MSG(XVMC_TRACE, "[XvMC] y sample bits=0x%08X\n" \
"[XvMC] u sample bits=0x%08X\n" \
"[XvMC] v sample bits=0x%08X\n" \
"[XvMC] horz y period=%u\n" \
"[XvMC] horz u period=%u\n" \
"[XvMC] horz v period=%u\n" \
"[XvMC] vert y period=%u\n" \
"[XvMC] vert u period=%u\n" \
"[XvMC] vert v period=%u\n",
subpictures[i].y_sample_bits, subpictures[i].u_sample_bits, subpictures[i].v_sample_bits,
subpictures[i].horz_y_period, subpictures[i].horz_u_period, subpictures[i].horz_v_period,
subpictures[i].vert_y_period, subpictures[i].vert_u_period, subpictures[i].vert_v_period);
}
break;
}
}
XFree(subpictures);
return i < num_subpics ? Success : BadMatch;
}
Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *subpicture,
unsigned short width, unsigned short height, int xvimage_id)
{
@ -46,6 +134,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
struct pipe_video_context *vpipe;
struct pipe_texture template;
struct pipe_texture *tex;
Status ret;
XVMC_MSG(XVMC_TRACE, "[XvMC] Creating subpicture %p.\n", subpicture);
@ -60,12 +149,13 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
if (!subpicture)
return XvMCBadSubpicture;
/* TODO: Check against surface max width, height */
if (width > 2048 || height > 2048)
if (width > context_priv->subpicture_max_width ||
height > context_priv->subpicture_max_height)
return BadValue;
if (xvimage_id != FOURCC_RGB)
return BadMatch;
ret = Validate(dpy, context->port, context->surface_type_id, xvimage_id);
if (ret != Success)
return ret;
subpicture_priv = CALLOC(1, sizeof(XvMCSubpicturePrivate));
if (!subpicture_priv)
@ -73,9 +163,9 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
memset(&template, 0, sizeof(struct pipe_texture));
template.target = PIPE_TEXTURE_2D;
template.format = PIPE_FORMAT_X8R8G8B8_UNORM;
template.format = XvIDToPipe(xvimage_id);
template.last_level = 0;
if (vpipe->screen->get_param(vpipe->screen, PIPE_CAP_NPOT_TEXTURES)) {
if (vpipe->get_param(vpipe, PIPE_CAP_NPOT_TEXTURES)) {
template.width0 = width;
template.height0 = height;
}
@ -92,8 +182,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
PIPE_BUFFER_USAGE_CPU_WRITE |
PIPE_BUFFER_USAGE_GPU_READ);
pipe_texture_reference(&tex, NULL);
if (!subpicture_priv->sfc)
{
if (!subpicture_priv->sfc) {
FREE(subpicture_priv);
return BadAlloc;
}
@ -104,11 +193,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
subpicture->width = width;
subpicture->height = height;
subpicture->num_palette_entries = 0;
subpicture->entry_bytes = 0;
subpicture->component_order[0] = 0;
subpicture->component_order[1] = 0;
subpicture->component_order[2] = 0;
subpicture->component_order[3] = 0;
subpicture->entry_bytes = PipeToComponentOrder(template.format, subpicture->component_order);
subpicture->privData = subpicture_priv;
SyncHandle();
@ -184,10 +269,9 @@ Status XvMCCompositeSubpicture(Display *dpy, XvMCSubpicture *subpicture, XvImage
return BadAlloc;
}
switch (image->id)
{
switch (image->id) {
case FOURCC_RGB:
assert(subpicture_priv->sfc->format == PIPE_FORMAT_X8R8G8B8_UNORM);
assert(subpicture_priv->sfc->format == XvIDToPipe(image->id));
for (y = 0; y < height; ++y) {
for (x = 0; x < width; ++x, src += 3, dst += 4) {
/* TODO: Confirm or fix */
@ -198,7 +282,7 @@ Status XvMCCompositeSubpicture(Display *dpy, XvMCSubpicture *subpicture, XvImage
}
break;
default:
assert(false);
XVMC_MSG(XVMC_ERR, "[XvMC] Unrecognized Xv image ID 0x%08X.\n", image->id);
}
screen->transfer_unmap(screen, xfer);

2
src/gallium/state_trackers/xorg/xvmc/xvmc_private.h
View file

@ -43,6 +43,8 @@ typedef struct
{
struct vl_context *vctx;
struct pipe_surface *backbuffer;
unsigned short subpicture_max_width;
unsigned short subpicture_max_height;
} XvMCContextPrivate;
typedef struct