fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vdpau: fix formating and idention of surface.c

Browse source
This commit is contained in:
Christian König 2011-03-18 21:12:08 +01:00
parent d1655b60b0
commit cbb3ad3d5a
1 changed files with 98 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

211
src/gallium/state_trackers/vdpau/surface.c
View file

@ -32,162 +32,147 @@
#include <util/u_format.h> #include <util/u_format.h>
VdpStatus VdpStatus
vlVdpVideoSurfaceCreate(VdpDevice device, vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type,
VdpChromaType chroma_type, uint32_t width, uint32_t height,
uint32_t width, VdpVideoSurface *surface)
uint32_t height,
VdpVideoSurface *surface)
{ {
printf("[VDPAU] Creating a surface\n"); printf("[VDPAU] Creating a surface\n");
vlVdpSurface *p_surf; vlVdpSurface *p_surf;
VdpStatus ret; VdpStatus ret;
if (!(width && height)) if (!(width && height)) {
{ ret = VDP_STATUS_INVALID_SIZE;
ret = VDP_STATUS_INVALID_SIZE; goto inv_size;
goto inv_size; }
}
if (!vlCreateHTAB()) {
ret = VDP_STATUS_RESOURCES;
goto no_htab;
}
if (!vlCreateHTAB()) { p_surf = CALLOC(1, sizeof(p_surf));
ret = VDP_STATUS_RESOURCES; if (!p_surf) {
goto no_htab; ret = VDP_STATUS_RESOURCES;
} goto no_res;
}
p_surf = CALLOC(1, sizeof(p_surf)); vlVdpDevice *dev = vlGetDataHTAB(device);
if (!p_surf) { if (!dev) {
ret = VDP_STATUS_RESOURCES; ret = VDP_STATUS_INVALID_HANDLE;
goto no_res; goto inv_device;
} }
vlVdpDevice *dev = vlGetDataHTAB(device); p_surf->chroma_format = TypeToPipe(chroma_type);
if (!dev) { p_surf->device = dev;
ret = VDP_STATUS_INVALID_HANDLE; p_surf->width = width;
goto inv_device; p_surf->height = height;
}
p_surf->chroma_format = TypeToPipe(chroma_type); *surface = vlAddDataHTAB(p_surf);
p_surf->device = dev; if (*surface == 0) {
p_surf->width = width; ret = VDP_STATUS_ERROR;
p_surf->height = height; goto no_handle;
}
*surface = vlAddDataHTAB(p_surf); return VDP_STATUS_OK;
if (*surface == 0) {
ret = VDP_STATUS_ERROR;
goto no_handle;
}
return VDP_STATUS_OK;
no_handle: no_handle:
FREE(p_surf->psurface); FREE(p_surf->psurface);
inv_device: inv_device:
no_surf: no_surf:
FREE(p_surf); FREE(p_surf);
no_res: no_res:
// vlDestroyHTAB(); XXX: Do not destroy this tab, I think. // vlDestroyHTAB(); XXX: Do not destroy this tab, I think.
no_htab: no_htab:
inv_size: inv_size:
return ret; return ret;
} }
VdpStatus VdpStatus
vlVdpVideoSurfaceDestroy ( VdpVideoSurface surface ) vlVdpVideoSurfaceDestroy(VdpVideoSurface surface)
{ {
vlVdpSurface *p_surf; vlVdpSurface *p_surf;
p_surf = (vlVdpSurface *)vlGetDataHTAB((vlHandle)surface); p_surf = (vlVdpSurface *)vlGetDataHTAB((vlHandle)surface);
if (!p_surf) if (!p_surf)
return VDP_STATUS_INVALID_HANDLE; return VDP_STATUS_INVALID_HANDLE;
if (p_surf->psurface) { if (p_surf->psurface) {
if (p_surf->psurface->texture) { if (p_surf->psurface->texture) {
if (p_surf->psurface->texture->screen) if (p_surf->psurface->texture->screen)
p_surf->psurface->context->surface_destroy(p_surf->psurface->context, p_surf->psurface); p_surf->psurface->context->surface_destroy(p_surf->psurface->context, p_surf->psurface);
} }
} }
FREE(p_surf); FREE(p_surf);
return VDP_STATUS_OK; return VDP_STATUS_OK;
} }
VdpStatus VdpStatus
vlVdpVideoSurfaceGetParameters ( VdpVideoSurface surface, vlVdpVideoSurfaceGetParameters(VdpVideoSurface surface,
VdpChromaType *chroma_type, VdpChromaType *chroma_type,
uint32_t *width, uint32_t *width, uint32_t *height)
uint32_t *height
)
{ {
if (!(width && height && chroma_type)) if (!(width && height && chroma_type))
return VDP_STATUS_INVALID_POINTER; return VDP_STATUS_INVALID_POINTER;
vlVdpSurface *p_surf = vlGetDataHTAB(surface);
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
vlVdpSurface *p_surf = vlGetDataHTAB(surface); if (!(p_surf->chroma_format > 0 && p_surf->chroma_format < 3))
if (!p_surf) return VDP_STATUS_INVALID_CHROMA_TYPE;
return VDP_STATUS_INVALID_HANDLE;
*width = p_surf->width;
*height = p_surf->height;
*chroma_type = PipeToType(p_surf->chroma_format);
if (!(p_surf->chroma_format > 0 && p_surf->chroma_format < 3)) return VDP_STATUS_OK;
return VDP_STATUS_INVALID_CHROMA_TYPE;
*width = p_surf->width;
*height = p_surf->height;
*chroma_type = PipeToType(p_surf->chroma_format);
return VDP_STATUS_OK;
} }
VdpStatus VdpStatus
vlVdpVideoSurfaceGetBitsYCbCr ( VdpVideoSurface surface, vlVdpVideoSurfaceGetBitsYCbCr(VdpVideoSurface surface,
VdpYCbCrFormat destination_ycbcr_format, VdpYCbCrFormat destination_ycbcr_format,
void *const *destination_data, void *const *destination_data,
uint32_t const *destination_pitches uint32_t const *destination_pitches)
)
{ {
if (!vlCreateHTAB()) if (!vlCreateHTAB())
return VDP_STATUS_RESOURCES; return VDP_STATUS_RESOURCES;
vlVdpSurface *p_surf = vlGetDataHTAB(surface);
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
vlVdpSurface *p_surf = vlGetDataHTAB(surface); if (!p_surf->psurface)
if (!p_surf) return VDP_STATUS_RESOURCES;
return VDP_STATUS_INVALID_HANDLE;
if (!p_surf->psurface) return VDP_STATUS_OK;
return VDP_STATUS_RESOURCES;
return VDP_STATUS_OK;
} }
VdpStatus VdpStatus
vlVdpVideoSurfacePutBitsYCbCr ( VdpVideoSurface surface, vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,
VdpYCbCrFormat source_ycbcr_format, VdpYCbCrFormat source_ycbcr_format,
void const *const *source_data, void const *const *source_data,
uint32_t const *source_pitches uint32_t const *source_pitches)
)
{ {
uint32_t size_surface_bytes; uint32_t size_surface_bytes;
const struct util_format_description *format_desc; const struct util_format_description *format_desc;
enum pipe_format pformat = FormatToPipe(source_ycbcr_format); enum pipe_format pformat = FormatToPipe(source_ycbcr_format);
if (!vlCreateHTAB()) if (!vlCreateHTAB())
return VDP_STATUS_RESOURCES; return VDP_STATUS_RESOURCES;
vlVdpSurface *p_surf = vlGetDataHTAB(surface);
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
vlVdpSurface *p_surf = vlGetDataHTAB(surface); //size_surface_bytes = ( source_pitches[0] * p_surf->height util_format_get_blockheight(pformat) );
if (!p_surf) /*util_format_translate(enum pipe_format dst_format,
return VDP_STATUS_INVALID_HANDLE; void *dst, unsigned dst_stride,
unsigned dst_x, unsigned dst_y,
enum pipe_format src_format,
//size_surface_bytes = ( source_pitches[0] * p_surf->height util_format_get_blockheight(pformat) ); const void *src, unsigned src_stride,
/*util_format_translate(enum pipe_format dst_format, unsigned src_x, unsigned src_y,
void *dst, unsigned dst_stride, unsigned width, unsigned height);*/
unsigned dst_x, unsigned dst_y,
enum pipe_format src_format,
const void *src, unsigned src_stride,
unsigned src_x, unsigned src_y,
unsigned width, unsigned height);*/
return VDP_STATUS_NO_IMPLEMENTATION;
return VDP_STATUS_NO_IMPLEMENTATION;
} }