jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-06 09:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

libva: apply all patches included in source package and do not prividem they twice

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-07-10 14:32:07 +02:00
parent c101b45cce
commit b970fc6a8f
31 changed files with 3 additions and 36473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/multimedia/libva/build
View File

@ -11,6 +11,9 @@ $SCRIPTS/build Mesa
cd $PKG_BUILD
# apply patches provide with the source package
cat debian/patches/*.patch | patch -p1
$AUTORECONF
./configure --host=$TARGET_NAME \

7
packages/multimedia/libva/patches/000_README
View File

@ -1,7 +0,0 @@
SDS patches organisation
------------------------
0xx - Patches from upstream sources
1xx - Patches that are trivial or fix bugs brought by upstream
2xx - Patches that relate to build system and driver detection
3xx - Patches that provide API extensions to upstream

28016
packages/multimedia/libva/patches/030_g45_h264_decoder.diff
View File

File diff suppressed because it is too large Load Diff

125
packages/multimedia/libva/patches/031_g45_h264_decoder_check_disable.diff
View File

@ -1,125 +0,0 @@
commit 8ca9ac4f628ea3d01c570293b6fa904ce0bb607e
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Apr 28 18:43:04 2010 +0200
[G45] Fix build without proper libdrm updates.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 369ebdf..a482848 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -134,9 +134,11 @@ i965_QueryConfigProfiles(VADriverContextP ctx,
profile_list[i++] = VAProfileMPEG2Simple;
profile_list[i++] = VAProfileMPEG2Main;
+#ifndef DISABLE_H264_DECODER
profile_list[i++] = VAProfileH264Baseline;
profile_list[i++] = VAProfileH264Main;
profile_list[i++] = VAProfileH264High;
+#endif
/* If the assert fails then I965_MAX_PROFILES needs to be bigger */
assert(i <= I965_MAX_PROFILES);
@@ -160,12 +162,14 @@ i965_QueryConfigEntrypoints(VADriverContextP ctx,
entrypoint_list[0] = VAEntrypointVLD;
break;
+#ifndef DISABLE_H264_DECODER
case VAProfileH264Baseline:
case VAProfileH264Main:
case VAProfileH264High:
*num_entrypoints = 1;
entrypoint_list[0] = VAEntrypointVLD;
break;
+#endif
default:
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
@@ -262,6 +266,7 @@ i965_CreateConfig(VADriverContextP ctx,
}
break;
+#ifndef DISABLE_H264_DECODER
case VAProfileH264Baseline:
case VAProfileH264Main:
case VAProfileH264High:
@@ -270,8 +275,8 @@ i965_CreateConfig(VADriverContextP ctx,
} else {
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT;
}
-
break;
+#endif
default:
vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
@@ -983,11 +988,13 @@ i965_BeginPicture(VADriverContextP ctx,
vaStatus = VA_STATUS_SUCCESS;
break;
+#ifndef DISABLE_H264_DECODER
case VAProfileH264Baseline:
case VAProfileH264Main:
case VAProfileH264High:
vaStatus = VA_STATUS_SUCCESS;
break;
+#endif
default:
assert(0);
@@ -1156,12 +1163,13 @@ i965_EndPicture(VADriverContextP ctx, VAContextID context)
assert(obj_config);
switch (obj_config->profile) {
+#ifndef DISABLE_H264_DECODER
case VAProfileH264Baseline:
case VAProfileH264Main:
case VAProfileH264High:
render_state->interleaved_uv = 1;
break;
-
+#endif
default:
render_state->interleaved_uv = 0;
}
diff --git a/i965_drv_video/intel_batchbuffer.c b/i965_drv_video/intel_batchbuffer.c
index 4c622d6..455c6a1 100644
--- a/i965_drv_video/intel_batchbuffer.c
+++ b/i965_drv_video/intel_batchbuffer.c
@@ -33,6 +33,16 @@
#include "intel_batchbuffer.h"
+#ifdef DISABLE_H264_DECODER
+#define drm_intel_bo_mrb_exec local_drm_intel_bo_mrb_exec
+static int drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
+ drm_clip_rect_t * cliprects, int num_cliprects,
+ int DR4, int ring_flag)
+{
+ return drm_intel_bo_exec(bo, used, cliprects, num_cliprects, DR4);
+}
+#endif
+
static void
intel_batchbuffer_reset(struct intel_batchbuffer *batch)
{
diff --git a/i965_drv_video/intel_driver.h b/i965_drv_video/intel_driver.h
index e7cbaaa..8a3ce93 100644
--- a/i965_drv_video/intel_driver.h
+++ b/i965_drv_video/intel_driver.h
@@ -17,6 +17,15 @@
#define INLINE
#endif
+#ifndef ON_RENDER_RING
+#define ON_RENDER_RING (1 << 0)
+#define DISABLE_H264_DECODER
+#endif
+#ifndef ON_BSD_RING
+#define ON_BSD_RING (1 << 1)
+#define DISABLE_H264_DECODER
+#endif
+
#define BATCH_SIZE 0x100000
#define BATCH_RESERVED 0x10

19
packages/multimedia/libva/patches/032_g45_fix_subpic_formats.diff
View File

@ -1,19 +0,0 @@
commit d6e726b80766c669dffe846fcd31fcfe5dc89847
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 12:13:41 2009 +0000
[G45] Fix subpictures formats array terminator.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 6a60ecc..e476ca2 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -76,7 +76,7 @@ static const i965_subpic_format_map_t *
get_subpic_format(const VAImageFormat *va_format)
{
unsigned int i;
- for (i = 0; i < sizeof(i965_subpic_formats_map)/sizeof(i965_subpic_formats_map[0]); i++) {
+ for (i = 0; i965_subpic_formats_map[i].type != 0; i++) {
const i965_subpic_format_map_t * const m = &i965_subpic_formats_map[i];
if (m->va_format.fourcc == va_format->fourcc &&
(m->type == I965_SURFACETYPE_RGBA ?

103
packages/multimedia/libva/patches/033_g45_add_rgba_subpic.diff
View File

@ -1,103 +0,0 @@
commit 98edda85a2d734763a5f40478a063d3e289e1389
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 10:56:54 2009 +0000
[G45] Add RGBA subpictures.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index e476ca2..637e304 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -70,6 +70,14 @@ i965_subpic_formats_map[I965_MAX_SUBPIC_FORMATS + 1] = {
{ I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_A4P4_UNORM,
{ VA_FOURCC('A','I','4','4'), VA_MSB_FIRST, 8, },
0 },
+ { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_B8G8R8A8_UNORM,
+ { VA_FOURCC('B','G','R','A'), VA_LSB_FIRST, 32,
+ 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 },
+ 0 },
+ { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_R8G8B8A8_UNORM,
+ { VA_FOURCC('R','G','B','A'), VA_LSB_FIRST, 32,
+ 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 },
+ 0 },
};
static const i965_subpic_format_map_t *
@@ -467,6 +475,7 @@ i965_CreateSubpicture(VADriverContextP ctx,
obj_subpic->format = m->format;
obj_subpic->width = obj_image->image.width;
obj_subpic->height = obj_image->image.height;
+ obj_subpic->pitch = obj_image->image.pitches[0];
obj_subpic->bo = obj_image->bo;
return VA_STATUS_SUCCESS;
}
@@ -1218,6 +1227,15 @@ i965_CreateImage(VADriverContextP ctx,
image->component_order[1] = 'G';
image->component_order[2] = 'B';
break;
+ case VA_FOURCC('A','R','G','B'):
+ case VA_FOURCC('A','B','G','R'):
+ case VA_FOURCC('B','G','R','A'):
+ case VA_FOURCC('R','G','B','A'):
+ image->num_planes = 1;
+ image->pitches[0] = width * 4;
+ image->offsets[0] = 0;
+ image->data_size = image->offsets[0] + image->pitches[0] * height;
+ break;
default:
goto error;
}
diff --git a/i965_drv_video/i965_drv_video.h b/i965_drv_video/i965_drv_video.h
index fa09869..2f538c2 100644
--- a/i965_drv_video/i965_drv_video.h
+++ b/i965_drv_video/i965_drv_video.h
@@ -44,7 +44,7 @@
#define I965_MAX_ENTRYPOINTS 5
#define I965_MAX_CONFIG_ATTRIBUTES 10
#define I965_MAX_IMAGE_FORMATS 10
-#define I965_MAX_SUBPIC_FORMATS 2
+#define I965_MAX_SUBPIC_FORMATS 4
#define I965_MAX_DISPLAY_ATTRIBUTES 4
#define I965_STR_VENDOR "i965 Driver 0.1"
@@ -126,6 +126,7 @@ struct object_subpic
unsigned int format;
int width;
int height;
+ int pitch;
dri_bo *bo;
};
diff --git a/i965_drv_video/i965_render.c b/i965_drv_video/i965_render.c
index 4a4f041..c738d22 100644
--- a/i965_drv_video/i965_render.c
+++ b/i965_drv_video/i965_render.c
@@ -587,7 +587,7 @@ i965_subpic_render_src_surface_state(VADriverContextP ctx,
int index,
dri_bo *region,
unsigned long offset,
- int w, int h, int format)
+ int w, int h, int p, int format)
{
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct i965_render_state *render_state = &i965->render_state;
@@ -621,7 +621,7 @@ i965_subpic_render_src_surface_state(VADriverContextP ctx,
ss->ss2.mip_count = 0;
ss->ss2.render_target_rotation = 0;
- ss->ss3.pitch = w - 1;
+ ss->ss3.pitch = p - 1;
dri_bo_emit_reloc(ss_bo,
I915_GEM_DOMAIN_SAMPLER, 0,
@@ -679,8 +679,8 @@ i965_subpic_render_src_surfaces_state(VADriverContextP ctx,
region = obj_surface->bo;
subpic_region = obj_image->bo;
/*subpicture surface*/
- i965_subpic_render_src_surface_state(ctx, 1, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->format);
- i965_subpic_render_src_surface_state(ctx, 2, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->format);
+ i965_subpic_render_src_surface_state(ctx, 1, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->pitch, obj_subpic->format);
+ i965_subpic_render_src_surface_state(ctx, 2, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->pitch, obj_subpic->format);
}
static void

77
packages/multimedia/libva/patches/034_g45_fix_return_for_unimpl.diff
View File

@ -1,77 +0,0 @@
commit ff263433c32aac08574b58b26f3f4be7abe05bdf
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 13:23:40 2009 +0000
[G45] Don't return VA_STATUS_SUCCESS for unimplemented functions.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 637e304..9e8502a 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -496,7 +496,8 @@ i965_SetSubpictureImage(VADriverContextP ctx,
VASubpictureID subpicture,
VAImageID image)
{
- return VA_STATUS_SUCCESS;
+ /* TODO */
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus
@@ -506,7 +507,8 @@ i965_SetSubpictureChromakey(VADriverContextP ctx,
unsigned int chromakey_max,
unsigned int chromakey_mask)
{
- return VA_STATUS_SUCCESS;
+ /* TODO */
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus
@@ -514,7 +516,8 @@ i965_SetSubpictureGlobalAlpha(VADriverContextP ctx,
VASubpictureID subpicture,
float global_alpha)
{
- return VA_STATUS_SUCCESS;
+ /* TODO */
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus
@@ -1103,7 +1106,7 @@ i965_GetDisplayAttributes(VADriverContextP ctx,
int num_attributes)
{
/* TODO */
- return VA_STATUS_ERROR_UNKNOWN;
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
/*
@@ -1118,7 +1121,7 @@ i965_SetDisplayAttributes(VADriverContextP ctx,
int num_attributes)
{
/* TODO */
- return VA_STATUS_ERROR_UNKNOWN;
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
VAStatus
@@ -1128,7 +1131,7 @@ i965_DbgCopySurfaceToBuffer(VADriverContextP ctx,
unsigned int *stride) /* out */
{
/* TODO */
- return VA_STATUS_ERROR_UNKNOWN;
+ return VA_STATUS_ERROR_UNIMPLEMENTED;
}
static VAStatus
@@ -1270,7 +1273,8 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
VASurfaceID surface,
VAImage *image) /* out */
{
- return VA_STATUS_SUCCESS;
+ /* TODO */
+ return VA_STATUS_ERROR_OPERATION_FAILED;
}
static void

95
packages/multimedia/libva/patches/035_g45_add_yv12_image_format.diff
View File

@ -1,95 +0,0 @@
commit c5cb995d6cd49f5f2988b1721cb6b5da8a9b2c09
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 13:01:44 2009 +0000
[G45] Add YV12 image format.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 9e8502a..6488570 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -54,6 +54,36 @@ enum {
I965_SURFACETYPE_INDEXED
};
+/* List of supported image formats */
+typedef struct {
+ unsigned int type;
+ VAImageFormat va_format;
+} i965_image_format_map_t;
+
+static const i965_image_format_map_t
+i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
+ { I965_SURFACETYPE_YUV,
+ { VA_FOURCC('Y','V','1','2'), VA_LSB_FIRST, 12, } },
+};
+
+static const i965_image_format_map_t *
+get_image_format(const VAImageFormat *va_format)
+{
+ unsigned int i;
+ for (i = 0; i965_image_formats_map[i].type != 0; i++) {
+ const i965_image_format_map_t * const m = &i965_image_formats_map[i];
+ if (m->va_format.fourcc == va_format->fourcc &&
+ (m->type == I965_SURFACETYPE_RGBA ?
+ (m->va_format.byte_order == va_format->byte_order &&
+ m->va_format.red_mask == va_format->red_mask &&
+ m->va_format.green_mask == va_format->green_mask &&
+ m->va_format.blue_mask == va_format->blue_mask &&
+ m->va_format.alpha_mask == va_format->alpha_mask) : 1))
+ return m;
+ }
+ return NULL;
+}
+
/* List of supported subpicture formats */
typedef struct {
unsigned int type;
@@ -398,8 +428,16 @@ i965_QueryImageFormats(VADriverContextP ctx,
VAImageFormat *format_list, /* out */
int *num_formats) /* out */
{
+ int n;
+
+ for (n = 0; i965_image_formats_map[n].va_format.fourcc != 0; n++) {
+ const i965_image_format_map_t * const m = &i965_image_formats_map[n];
+ if (format_list)
+ format_list[n] = m->va_format;
+ }
+
if (num_formats)
- *num_formats = 0;
+ *num_formats = n;
return VA_STATUS_SUCCESS;
}
@@ -1239,6 +1277,16 @@ i965_CreateImage(VADriverContextP ctx,
image->offsets[0] = 0;
image->data_size = image->offsets[0] + image->pitches[0] * height;
break;
+ case VA_FOURCC('Y','V','1','2'):
+ image->num_planes = 3;
+ image->pitches[0] = width;
+ image->offsets[0] = 0;
+ image->pitches[1] = width2;
+ image->offsets[1] = size + size2;
+ image->pitches[2] = width2;
+ image->offsets[2] = size;
+ image->data_size = size + 2 * size2;
+ break;
default:
goto error;
}
diff --git a/i965_drv_video/i965_drv_video.h b/i965_drv_video/i965_drv_video.h
index 2f538c2..be253ed 100644
--- a/i965_drv_video/i965_drv_video.h
+++ b/i965_drv_video/i965_drv_video.h
@@ -43,7 +43,7 @@
#define I965_MAX_PROFILES 11
#define I965_MAX_ENTRYPOINTS 5
#define I965_MAX_CONFIG_ATTRIBUTES 10
-#define I965_MAX_IMAGE_FORMATS 10
+#define I965_MAX_IMAGE_FORMATS 1
#define I965_MAX_SUBPIC_FORMATS 4
#define I965_MAX_DISPLAY_ATTRIBUTES 4
#define I965_STR_VENDOR "i965 Driver 0.1"

66
packages/multimedia/libva/patches/036_g45_add_vaGetImage.diff
View File

@ -1,66 +0,0 @@
commit 446cd618ec79c55e0044c7bdd565a66a768d0e6e
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 13:16:34 2009 +0000
[G45] Implement vaGetImage() for full-sized surface readback.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index ad51b6c..80c61ca 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1481,7 +1481,54 @@ i965_GetImage(VADriverContextP ctx,
unsigned int height,
VAImageID image)
{
- return VA_STATUS_SUCCESS;
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct i965_render_state *render_state = &i965->render_state;
+
+ struct object_surface *obj_surface = SURFACE(surface);
+ if (!obj_surface)
+ return VA_STATUS_ERROR_INVALID_SURFACE;
+
+ struct object_image *obj_image = IMAGE(image);
+ if (!obj_image)
+ return VA_STATUS_ERROR_INVALID_IMAGE;
+
+ /* XXX: we only support full-size surface readback */
+ if (x != 0 ||
+ y != 0 ||
+ width != obj_surface->width ||
+ height != obj_surface->height)
+ return VA_STATUS_ERROR_INVALID_PARAMETER;
+
+ /* XXX: we only support 1:1 image copies */
+ if (width != obj_image->image.width ||
+ height != obj_image->image.height)
+ return VA_STATUS_ERROR_INVALID_PARAMETER;
+
+ VAStatus va_status;
+ void *image_data = NULL;
+
+ va_status = i965_MapBuffer(ctx, obj_image->image.buf, &image_data);
+ if (va_status != VA_STATUS_SUCCESS)
+ return va_status;
+
+ dri_bo_map(obj_surface->bo, 0);
+
+ switch (obj_image->image.format.fourcc) {
+ case VA_FOURCC('Y','V','1','2'): /* YV12 is native format here */
+ if (render_state->interleaved_uv)
+ goto operation_failed;
+ memcpy(image_data, obj_surface->bo->virtual, obj_surface->bo->size);
+ break;
+ default:
+ operation_failed:
+ va_status = VA_STATUS_ERROR_OPERATION_FAILED;
+ break;
+ }
+
+ dri_bo_unmap(obj_surface->bo);
+
+ i965_UnmapBuffer(ctx, obj_image->image.buf);
+ return va_status;
}
VAStatus

106
packages/multimedia/libva/patches/037_g45_add_vaPutImage.diff
View File

@ -1,106 +0,0 @@
commit 3de13e8bda7efadbdb681299d0d161f383b7cb5b
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 13:36:39 2009 +0000
[G45] Implement vaPutImage() for full-sized surface uploads.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 80c61ca..da2fbd6 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -472,22 +472,6 @@ i965_QueryImageFormats(VADriverContextP ctx,
}
VAStatus
-i965_PutImage(VADriverContextP ctx,
- VASurfaceID surface,
- VAImageID image,
- int src_x,
- int src_y,
- unsigned int src_width,
- unsigned int src_height,
- int dest_x,
- int dest_y,
- unsigned int dest_width,
- unsigned int dest_height)
-{
- return VA_STATUS_SUCCESS;
-}
-
-VAStatus
i965_QuerySubpictureFormats(VADriverContextP ctx,
VAImageFormat *format_list, /* out */
unsigned int *flags, /* out */
@@ -1532,6 +1516,72 @@ i965_GetImage(VADriverContextP ctx,
}
VAStatus
+i965_PutImage(VADriverContextP ctx,
+ VASurfaceID surface,
+ VAImageID image,
+ int src_x,
+ int src_y,
+ unsigned int src_width,
+ unsigned int src_height,
+ int dest_x,
+ int dest_y,
+ unsigned int dest_width,
+ unsigned int dest_height)
+{
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct i965_render_state *render_state = &i965->render_state;
+
+ struct object_surface *obj_surface = SURFACE(surface);
+ if (!obj_surface)
+ return VA_STATUS_ERROR_INVALID_SURFACE;
+
+ struct object_image *obj_image = IMAGE(image);
+ if (!obj_image)
+ return VA_STATUS_ERROR_INVALID_IMAGE;
+
+ /* XXX: we don't support partial video surface updates */
+ if (src_x != 0 ||
+ src_y != 0 ||
+ src_width != obj_image->image.width ||
+ src_height != obj_image->image.height)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+ if (dest_x != 0 ||
+ dest_y != 0 ||
+ dest_width != obj_surface->width ||
+ dest_height != obj_surface->height)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+ if (src_width != dest_width ||
+ src_height != dest_height)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+
+ VAStatus va_status;
+ void *image_data = NULL;
+
+ va_status = i965_MapBuffer(ctx, obj_image->image.buf, &image_data);
+ if (va_status != VA_STATUS_SUCCESS)
+ return va_status;
+
+ dri_bo_map(obj_surface->bo, 1);
+
+ switch (obj_image->image.format.fourcc) {
+ case VA_FOURCC('Y','V','1','2'): /* YV12 is native format here */
+ if (render_state->interleaved_uv)
+ goto operation_failed;
+ memcpy(obj_surface->bo->virtual, image_data, obj_surface->bo->size);
+ break;
+ default:
+ operation_failed:
+ va_status = VA_STATUS_ERROR_OPERATION_FAILED;
+ break;
+ }
+
+ dri_bo_unmap(obj_surface->bo);
+
+ i965_UnmapBuffer(ctx, obj_image->image.buf);
+ return va_status;
+}
+
+VAStatus
i965_PutSurface(VADriverContextP ctx,
VASurfaceID surface,
Drawable draw, /* X Drawable */

525
packages/multimedia/libva/patches/038_g45_vaPutSurface_cliprects.diff
View File

@ -1,525 +0,0 @@
commit c31ffe80157a4e0604d2070f6014cab9f2c8309b
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Nov 4 17:34:53 2009 +0000
[G45] Handle cliprects in vaPutSurface().
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index da2fbd6..8669a4e 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1604,13 +1604,23 @@ i965_PutSurface(VADriverContextP ctx,
union dri_buffer *buffer;
struct intel_region *dest_region;
struct object_surface *obj_surface;
- int ret;
+ int ret;
uint32_t name;
+ VARectangle src_rect, dst_rect;
Bool new_region = False;
+
/* Currently don't support DRI1 */
if (dri_state->driConnectedFlag != VA_DRI2)
return VA_STATUS_ERROR_UNKNOWN;
+ /* XXX: we currently only support up to 64 cliprects */
+ if (number_cliprects > MAX_CLIP_RECTS)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+
+ obj_surface = SURFACE(surface);
+ if (!obj_surface)
+ return VA_STATUS_ERROR_INVALID_SURFACE;
+
dri_drawable = dri_get_drawable(ctx, draw);
assert(dri_drawable);
@@ -1649,17 +1659,24 @@ i965_PutSurface(VADriverContextP ctx,
assert(ret == 0);
}
- i965_render_put_surface(ctx, surface,
- srcx, srcy, srcw, srch,
- destx, desty, destw, desth);
- obj_surface = SURFACE(surface);
- if(obj_surface->subpic != VA_INVALID_ID) {
- i965_render_put_subpic(ctx, surface,
- srcx, srcy, srcw, srch,
- destx, desty, destw, desth);
- }
- dri_swap_buffer(ctx, dri_drawable);
+ src_rect.x = srcx;
+ src_rect.y = srcy;
+ src_rect.width = srcw;
+ src_rect.height = srch;
+
+ dst_rect.x = destx;
+ dst_rect.y = desty;
+ dst_rect.width = destw;
+ dst_rect.height = desth;
+ i965_render_put_surface(ctx, surface, &src_rect, &dst_rect,
+ cliprects, number_cliprects);
+
+ if (obj_surface->subpic != VA_INVALID_ID)
+ i965_render_put_subpic(ctx, surface, &src_rect, &dst_rect,
+ cliprects, number_cliprects);
+
+ dri_swap_buffer(ctx, dri_drawable);
return VA_STATUS_SUCCESS;
}
diff --git a/i965_drv_video/i965_render.c b/i965_drv_video/i965_render.c
index 1ae6483..163bff6 100644
--- a/i965_drv_video/i965_render.c
+++ b/i965_drv_video/i965_render.c
@@ -796,13 +796,81 @@ i965_render_binding_table(VADriverContextP ctx)
dri_bo_unmap(render_state->wm.binding_table);
}
-static void
+static unsigned int
+i965_render_do_upload_vertex(VADriverContextP ctx,
+ unsigned int width,
+ unsigned int height,
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
+{
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct i965_render_state *render_state = &i965->render_state;
+ struct intel_region *dest_region = render_state->draw_region;
+ float *vb, tx1, tx2, ty1, ty2;
+ int x1, x2, y1, y2;
+ unsigned int i, n;
+
+ if (!cliprects || num_cliprects == 0) {
+ cliprects = dst_rect;
+ num_cliprects = 1;
+ }
+
+ dri_bo_map(render_state->vb.vertex_buffer, 1);
+ assert(render_state->vb.vertex_buffer->virtual);
+ vb = render_state->vb.vertex_buffer->virtual;
+
+ for (n = 0, i = 0; i < num_cliprects; i++) {
+ x1 = dest_region->x + cliprects[i].x;
+ y1 = dest_region->y + cliprects[i].y;
+ x2 = x1 + cliprects[i].width;
+ y2 = y1 + cliprects[i].height;
+ x1 = MAX(x1, dst_rect->x);
+ y1 = MAX(y1, dst_rect->y);
+ x2 = MIN(x2, dst_rect->x + dst_rect->width);
+ y2 = MIN(y2, dst_rect->y + dst_rect->height);
+
+ if (x2 <= x1 || y2 <= y1)
+ continue;
+
+ const float sx1 = (float)(x1 - dst_rect->x) / (float)dst_rect->width;
+ const float sy1 = (float)(y1 - dst_rect->y) / (float)dst_rect->height;
+ const float sx2 = (float)(x2 - dst_rect->x) / (float)dst_rect->width;
+ const float sy2 = (float)(y2 - dst_rect->y) / (float)dst_rect->height;
+ tx1 = ((float)src_rect->x + sx1 * (float)src_rect->width) / width;
+ ty1 = ((float)src_rect->y + sy1 * (float)src_rect->height) / height;
+ tx2 = ((float)src_rect->x + sx2 * (float)src_rect->width) / width;
+ ty2 = ((float)src_rect->y + sy2 * (float)src_rect->height) / height;
+
+ vb[n++] = tx2;
+ vb[n++] = ty2;
+ vb[n++] = x2;
+ vb[n++] = y2;
+
+ vb[n++] = tx1;
+ vb[n++] = ty2;
+ vb[n++] = x1;
+ vb[n++] = y2;
+
+ vb[n++] = tx1;
+ vb[n++] = ty1;
+ vb[n++] = x1;
+ vb[n++] = y1;
+ }
+
+ dri_bo_unmap(render_state->vb.vertex_buffer);
+ return n / 12;
+}
+
+static unsigned int
i965_subpic_render_upload_vertex(VADriverContextP ctx,
VASurfaceID surface,
- const VARectangle *output_rect)
-{
+ const VARectangle *output_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
+{
struct i965_driver_data *i965 = i965_driver_data(ctx);
- struct i965_render_state *render_state = &i965->render_state;
struct object_surface *obj_surface = SURFACE(surface);
struct object_subpic *obj_subpic = SUBPIC(obj_surface->subpic);
@@ -812,8 +880,6 @@ i965_subpic_render_upload_vertex(VADriverContextP ctx,
const float ssy = (float)output_rect->height / (float)obj_surface->height;
const float sx = psx * ssx;
const float sy = psy * ssy;
- float *vb, tx1, tx2, ty1, ty2, x1, x2, y1, y2;
- int i = 0;
VARectangle dst_rect;
dst_rect.x = output_rect->x + sx * (float)obj_subpic->dst_rect.x;
@@ -821,93 +887,29 @@ i965_subpic_render_upload_vertex(VADriverContextP ctx,
dst_rect.width = sx * (float)obj_subpic->dst_rect.width;
dst_rect.height = sy * (float)obj_subpic->dst_rect.height;
- dri_bo_map(render_state->vb.vertex_buffer, 1);
- assert(render_state->vb.vertex_buffer->virtual);
- vb = render_state->vb.vertex_buffer->virtual;
-
- tx1 = (float)obj_subpic->src_rect.x / (float)obj_subpic->width;
- ty1 = (float)obj_subpic->src_rect.y / (float)obj_subpic->height;
- tx2 = (float)(obj_subpic->src_rect.x + obj_subpic->src_rect.width) / (float)obj_subpic->width;
- ty2 = (float)(obj_subpic->src_rect.y + obj_subpic->src_rect.height) / (float)obj_subpic->height;
-
- x1 = (float)dst_rect.x;
- y1 = (float)dst_rect.y;
- x2 = (float)(dst_rect.x + dst_rect.width);
- y2 = (float)(dst_rect.y + dst_rect.height);
-
- vb[i++] = tx2;
- vb[i++] = ty2;
- vb[i++] = x2;
- vb[i++] = y2;
-
- vb[i++] = tx1;
- vb[i++] = ty2;
- vb[i++] = x1;
- vb[i++] = y2;
-
- vb[i++] = tx1;
- vb[i++] = ty1;
- vb[i++] = x1;
- vb[i++] = y1;
- dri_bo_unmap(render_state->vb.vertex_buffer);
+ return i965_render_do_upload_vertex(ctx,
+ obj_subpic->width, obj_subpic->height,
+ &obj_subpic->src_rect, &dst_rect,
+ cliprects, num_cliprects);
}
-static void
+static unsigned int
i965_render_upload_vertex(VADriverContextP ctx,
VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth)
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
{
struct i965_driver_data *i965 = i965_driver_data(ctx);
- struct i965_render_state *render_state = &i965->render_state;
- struct intel_region *dest_region = render_state->draw_region;
- struct object_surface *obj_surface;
- float *vb;
-
- float u1, v1, u2, v2;
- int i, width, height;
- int box_x1 = dest_region->x + destx;
- int box_y1 = dest_region->y + desty;
- int box_x2 = box_x1 + destw;
- int box_y2 = box_y1 + desth;
-
- obj_surface = SURFACE(surface);
- assert(surface);
- width = obj_surface->width;
- height = obj_surface->height;
-
- u1 = (float)srcx / width;
- v1 = (float)srcy / height;
- u2 = (float)(srcx + srcw) / width;
- v2 = (float)(srcy + srch) / height;
-
- dri_bo_map(render_state->vb.vertex_buffer, 1);
- assert(render_state->vb.vertex_buffer->virtual);
- vb = render_state->vb.vertex_buffer->virtual;
-
- i = 0;
- vb[i++] = u2;
- vb[i++] = v2;
- vb[i++] = (float)box_x2;
- vb[i++] = (float)box_y2;
-
- vb[i++] = u1;
- vb[i++] = v2;
- vb[i++] = (float)box_x1;
- vb[i++] = (float)box_y2;
-
- vb[i++] = u1;
- vb[i++] = v1;
- vb[i++] = (float)box_x1;
- vb[i++] = (float)box_y1;
+ struct object_surface *obj_surface = SURFACE(surface);
+ assert(obj_surface);
- dri_bo_unmap(render_state->vb.vertex_buffer);
+ return i965_render_do_upload_vertex(ctx,
+ obj_surface->width, obj_surface->height,
+ src_rect,
+ dst_rect,
+ cliprects, num_cliprects);
}
static void
@@ -929,17 +931,13 @@ i965_render_upload_constants(VADriverContextP ctx)
dri_bo_unmap(render_state->curbe.bo);
}
-static void
+static unsigned int
i965_surface_render_state_setup(VADriverContextP ctx,
- VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth)
+ VASurfaceID surface,
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
{
i965_render_vs_unit(ctx);
i965_render_sf_unit(ctx);
@@ -951,22 +949,17 @@ i965_surface_render_state_setup(VADriverContextP ctx,
i965_render_cc_unit(ctx);
i965_render_binding_table(ctx);
i965_render_upload_constants(ctx);
- i965_render_upload_vertex(ctx, surface,
- srcx, srcy, srcw, srch,
- destx, desty, destw, desth);
+ return i965_render_upload_vertex(ctx, surface, src_rect, dst_rect,
+ cliprects, num_cliprects);
}
-static void
+static unsigned int
i965_subpic_render_state_setup(VADriverContextP ctx,
- VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth)
+ VASurfaceID surface,
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
{
i965_render_vs_unit(ctx);
i965_render_sf_unit(ctx);
@@ -977,13 +970,8 @@ i965_subpic_render_state_setup(VADriverContextP ctx,
i965_render_cc_viewport(ctx);
i965_subpic_render_cc_unit(ctx);
i965_render_binding_table(ctx);
-
- VARectangle output_rect;
- output_rect.x = destx;
- output_rect.y = desty;
- output_rect.width = destw;
- output_rect.height = desth;
- i965_subpic_render_upload_vertex(ctx, surface, &output_rect);
+ return i965_subpic_render_upload_vertex(ctx, surface, dst_rect,
+ cliprects, num_cliprects);
}
static void
@@ -1235,7 +1223,7 @@ i965_render_upload_image_palette(
}
static void
-i965_render_startup(VADriverContextP ctx)
+i965_render_startup(VADriverContextP ctx, unsigned int vb_offset)
{
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct i965_render_state *render_state = &i965->render_state;
@@ -1246,7 +1234,7 @@ i965_render_startup(VADriverContextP ctx)
(0 << VB0_BUFFER_INDEX_SHIFT) |
VB0_VERTEXDATA |
((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
- OUT_RELOC(ctx, render_state->vb.vertex_buffer, I915_GEM_DOMAIN_VERTEX, 0, 0);
+ OUT_RELOC(ctx, render_state->vb.vertex_buffer, I915_GEM_DOMAIN_VERTEX, 0, vb_offset);
if (IS_IRONLAKE(i965->intel.device_id))
OUT_RELOC(ctx, render_state->vb.vertex_buffer, I915_GEM_DOMAIN_VERTEX, 0, 12 * 4);
@@ -1311,8 +1299,10 @@ i965_clear_dest_region(VADriverContextP ctx)
}
static void
-i965_surface_render_pipeline_setup(VADriverContextP ctx)
+i965_surface_render_pipeline_setup(VADriverContextP ctx, unsigned int n_rects)
{
+ unsigned int i;
+
intel_batchbuffer_start_atomic(ctx, 0x1000);
intel_batchbuffer_emit_mi_flush(ctx);
i965_clear_dest_region(ctx);
@@ -1327,13 +1317,16 @@ i965_surface_render_pipeline_setup(VADriverContextP ctx)
i965_render_constant_buffer(ctx);
i965_render_drawing_rectangle(ctx);
i965_render_vertex_elements(ctx);
- i965_render_startup(ctx);
+ for (i = 0; i < n_rects; i++)
+ i965_render_startup(ctx, 48 * i);
intel_batchbuffer_end_atomic(ctx);
}
static void
-i965_subpic_render_pipeline_setup(VADriverContextP ctx)
+i965_subpic_render_pipeline_setup(VADriverContextP ctx, unsigned int n_rects)
{
+ unsigned int i;
+
intel_batchbuffer_start_atomic(ctx, 0x1000);
intel_batchbuffer_emit_mi_flush(ctx);
i965_render_pipeline_select(ctx);
@@ -1346,7 +1339,8 @@ i965_subpic_render_pipeline_setup(VADriverContextP ctx)
i965_render_cs_urb_layout(ctx);
i965_render_drawing_rectangle(ctx);
i965_render_vertex_elements(ctx);
- i965_render_startup(ctx);
+ for (i = 0; i < n_rects; i++)
+ i965_render_startup(ctx, 48 * i);
intel_batchbuffer_end_atomic(ctx);
}
@@ -1440,45 +1434,39 @@ i965_render_initialize(VADriverContextP ctx)
void
i965_render_put_surface(VADriverContextP ctx,
VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth)
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
{
+ unsigned int n_rects;
+
i965_render_initialize(ctx);
- i965_surface_render_state_setup(ctx, surface,
- srcx, srcy, srcw, srch,
- destx, desty, destw, desth);
- i965_surface_render_pipeline_setup(ctx);
+ n_rects = i965_surface_render_state_setup(ctx, surface,
+ src_rect, dst_rect,
+ cliprects, num_cliprects);
+ i965_surface_render_pipeline_setup(ctx, n_rects);
intel_batchbuffer_flush(ctx);
}
void
i965_render_put_subpic(VADriverContextP ctx,
- VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth)
+ VASurfaceID surface,
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects)
{
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct object_surface *obj_surface = SURFACE(surface);
struct object_subpic *obj_subpic = SUBPIC(obj_surface->subpic);
+ unsigned int n_rects;
assert(obj_subpic);
i965_render_initialize(ctx);
- i965_subpic_render_state_setup(ctx, surface,
- srcx, srcy, srcw, srch,
- destx, desty, destw, desth);
- i965_subpic_render_pipeline_setup(ctx);
+ n_rects = i965_subpic_render_state_setup(ctx, surface, src_rect, dst_rect,
+ cliprects, num_cliprects);
+ i965_subpic_render_pipeline_setup(ctx, n_rects);
i965_render_upload_image_palette(ctx, obj_subpic->image, 0xff);
intel_batchbuffer_flush(ctx);
}
diff --git a/i965_drv_video/i965_render.h b/i965_drv_video/i965_render.h
index 2643285..d1052d4 100644
--- a/i965_drv_video/i965_render.h
+++ b/i965_drv_video/i965_render.h
@@ -28,6 +28,7 @@
#ifndef _I965_RENDER_H_
#define _I965_RENDER_H_
+#define MAX_CLIP_RECTS 80 /* vb_bo:4096 / vb:(3*4*4) */
#define MAX_RENDER_SURFACES 16
#define MAX_SAMPLERS 16
@@ -70,27 +71,20 @@ struct i965_render_state
Bool i965_render_init(VADriverContextP ctx);
Bool i965_render_terminate(VADriverContextP ctx);
+
void i965_render_put_surface(VADriverContextP ctx,
VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth);
-
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects);
void
i965_render_put_subpic(VADriverContextP ctx,
- VASurfaceID surface,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth);
+ VASurfaceID surface,
+ const VARectangle *src_rect,
+ const VARectangle *dst_rect,
+ const VARectangle *cliprects,
+ unsigned int num_cliprects);
+
#endif /* _I965_RENDER_H_ */

398
packages/multimedia/libva/patches/039_g45_add_vaDeriveImage.diff
View File

@ -1,398 +0,0 @@
commit e435677c2c9228eed9df09a41c8ffeedc5665401
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Mon Mar 8 17:22:06 2010 +0100
[G45] Implement vaDeriveImage().
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 8669a4e..aad947a 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -66,19 +66,12 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
{ VA_FOURCC('Y','V','1','2'), VA_LSB_FIRST, 12, } },
};
-static const i965_image_format_map_t *
-get_image_format(const VAImageFormat *va_format)
+static const i965_image_format_map_t *get_image_format(unsigned int fourcc)
{
unsigned int i;
for (i = 0; i965_image_formats_map[i].type != 0; i++) {
const i965_image_format_map_t * const m = &i965_image_formats_map[i];
- if (m->va_format.fourcc == va_format->fourcc &&
- (m->type == I965_SURFACETYPE_RGBA ?
- (m->va_format.byte_order == va_format->byte_order &&
- m->va_format.red_mask == va_format->red_mask &&
- m->va_format.green_mask == va_format->green_mask &&
- m->va_format.blue_mask == va_format->blue_mask &&
- m->va_format.alpha_mask == va_format->alpha_mask) : 1))
+ if (m->va_format.fourcc == fourcc)
return m;
}
return NULL;
@@ -357,12 +350,27 @@ VAStatus i965_QueryConfigAttributes(VADriverContextP ctx,
return vaStatus;
}
+static struct object_image *
+i965_CreateImage_impl(
+ VADriverContextP ctx,
+ const VAImageFormat *format,
+ unsigned int width,
+ unsigned int height,
+ VASurfaceID surface
+);
+
+static void
+i965_DestroyImage_impl(
+ VADriverContextP ctx,
+ struct object_image *obj_image,
+ int from_surface
+);
+
static void
i965_destroy_surface(struct object_heap *heap, struct object_base *obj)
{
struct object_surface *obj_surface = (struct object_surface *)obj;
- dri_bo_unreference(obj_surface->bo);
obj_surface->bo = NULL;
if (obj_surface->free_private_data != NULL) {
@@ -393,6 +401,8 @@ i965_CreateSurfaces(VADriverContextP ctx,
for (i = 0; i < num_surfaces; i++) {
int surfaceID = NEW_SURFACE_ID();
struct object_surface *obj_surface = SURFACE(surfaceID);
+ struct object_image *obj_image;
+ struct object_buffer *obj_buffer;
if (NULL == obj_surface) {
vaStatus = VA_STATUS_ERROR_ALLOCATION_FAILED;
@@ -404,19 +414,25 @@ i965_CreateSurfaces(VADriverContextP ctx,
obj_surface->subpic = VA_INVALID_ID;
obj_surface->width = ALIGN(width, 16);
obj_surface->height = ALIGN(height, 16);
- obj_surface->size = SIZE_YUV420(obj_surface->width, obj_surface->height);
- obj_surface->bo = dri_bo_alloc(i965->intel.bufmgr,
- "vaapi surface",
- obj_surface->size,
- 64);
-
- assert(obj_surface->bo);
- if (NULL == obj_surface->bo) {
- vaStatus = VA_STATUS_ERROR_UNKNOWN;
- break;
- }
+ obj_surface->is_derived = 0;
obj_surface->private_data = NULL;
obj_surface->free_private_data = NULL;
+
+ obj_image = i965_CreateImage_impl(ctx, NULL, obj_surface->width, obj_surface->height, surfaceID);
+ if (!obj_image) {
+ vaStatus = VA_STATUS_ERROR_ALLOCATION_FAILED;
+ break;
+ }
+ obj_surface->size = obj_image->image.data_size;
+ obj_surface->image = obj_image->image;
+
+ obj_buffer = BUFFER(obj_image->image.buf);
+ if (!obj_buffer) {
+ vaStatus = VA_STATUS_ERROR_ALLOCATION_FAILED;
+ break;
+ }
+ assert(obj_buffer->buffer_store);
+ obj_surface->bo = obj_buffer->buffer_store->bo;
}
/* Error recovery */
@@ -446,6 +462,7 @@ i965_DestroySurfaces(VADriverContextP ctx,
struct object_surface *obj_surface = SURFACE(surface_list[i]);
assert(obj_surface);
+ i965_DestroyImage_impl(ctx, IMAGE(obj_surface->image.image_id), 1);
i965_destroy_surface(&i965->surface_heap, (struct object_base *)obj_surface);
}
@@ -1289,46 +1306,22 @@ i965_destroy_heap(struct object_heap *heap,
VAStatus
i965_DestroyImage(VADriverContextP ctx, VAImageID image);
-VAStatus
-i965_CreateImage(VADriverContextP ctx,
- VAImageFormat *format,
- int width,
- int height,
- VAImage *out_image) /* out */
+static int
+setup_image_format(
+ VAImage *image,
+ unsigned int fourcc,
+ unsigned int width,
+ unsigned int height
+)
{
- struct i965_driver_data *i965 = i965_driver_data(ctx);
- struct object_image *obj_image;
- VAStatus va_status = VA_STATUS_ERROR_OPERATION_FAILED;
- VAImageID image_id;
unsigned int width2, height2, size2, size;
- out_image->image_id = VA_INVALID_ID;
- out_image->buf = VA_INVALID_ID;
-
- image_id = NEW_IMAGE_ID();
- if (image_id == VA_INVALID_ID)
- return VA_STATUS_ERROR_ALLOCATION_FAILED;
-
- obj_image = IMAGE(image_id);
- if (!obj_image)
- return VA_STATUS_ERROR_ALLOCATION_FAILED;
- obj_image->bo = NULL;
- obj_image->palette = NULL;
-
- VAImage * const image = &obj_image->image;
- image->image_id = image_id;
- image->buf = VA_INVALID_ID;
-
size = width * height;
width2 = (width + 1) / 2;
height2 = (height + 1) / 2;
size2 = width2 * height2;
- image->num_palette_entries = 0;
- image->entry_bytes = 0;
- memset(image->component_order, 0, sizeof(image->component_order));
-
- switch (format->fourcc) {
+ switch (fourcc) {
case VA_FOURCC('I','A','4','4'):
case VA_FOURCC('A','I','4','4'):
image->num_planes = 1;
@@ -1361,15 +1354,56 @@ i965_CreateImage(VADriverContextP ctx,
image->data_size = size + 2 * size2;
break;
default:
- goto error;
+ return 0;
}
+ return 1;
+}
- va_status = i965_CreateBuffer(ctx, 0, VAImageBufferType,
- image->data_size, 1, NULL, &image->buf);
- if (va_status != VA_STATUS_SUCCESS)
- goto error;
+static struct object_image *
+i965_CreateImage_impl(
+ VADriverContextP ctx,
+ const VAImageFormat *format,
+ unsigned int width,
+ unsigned int height,
+ VASurfaceID surface
+)
+{
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct object_image *obj_image;
+ VAImageID image_id;
- obj_image->bo = BUFFER(image->buf)->buffer_store->bo;
+ image_id = NEW_IMAGE_ID();
+ if (image_id == VA_INVALID_ID)
+ return NULL;
+
+ obj_image = IMAGE(image_id);
+ if (!obj_image)
+ return NULL;
+ obj_image->surface = surface;
+ obj_image->bo = NULL;
+ obj_image->palette = NULL;
+
+ VAImage * const image = &obj_image->image;
+ image->image_id = image_id;
+ image->buf = VA_INVALID_ID;
+
+ image->num_palette_entries = 0;
+ image->entry_bytes = 0;
+ memset(image->component_order, 0, sizeof(image->component_order));
+
+ if (surface == VA_INVALID_ID) {
+ if (!setup_image_format(image, format->fourcc, width, height))
+ goto error;
+ image->format = *format;
+ }
+ else {
+ /* VA image format will be initialized through first vaDeriveImage() */
+ if (!setup_image_format(image, VA_FOURCC_YV12, width, height))
+ goto error;
+ memset(&image->format, 0, sizeof(image->format));
+ }
+ image->width = width;
+ image->height = height;
if (image->num_palette_entries > 0 && image->entry_bytes > 0) {
obj_image->palette = malloc(image->num_palette_entries * sizeof(obj_image->palette));
@@ -1377,25 +1411,66 @@ i965_CreateImage(VADriverContextP ctx,
goto error;
}
- image->image_id = image_id;
- image->format = *format;
- image->width = width;
- image->height = height;
+ if (i965_CreateBuffer(ctx, 0, VAImageBufferType,
+ image->data_size, 1, NULL,
+ &image->buf) != VA_STATUS_SUCCESS)
+ goto error;
- *out_image = *image;
- return VA_STATUS_SUCCESS;
+ obj_image->bo = BUFFER(image->buf)->buffer_store->bo;
+ return obj_image;
error:
- i965_DestroyImage(ctx, image_id);
- return va_status;
+ i965_DestroyImage_impl(ctx, obj_image, 0);
+ return NULL;
+}
+
+VAStatus
+i965_CreateImage(VADriverContextP ctx,
+ VAImageFormat *format,
+ int width,
+ int height,
+ VAImage *out_image) /* out */
+{
+ struct object_image *obj_image;
+
+ obj_image = i965_CreateImage_impl(ctx, format, width, height, VA_INVALID_ID);
+ if (!obj_image)
+ return VA_STATUS_ERROR_ALLOCATION_FAILED;
+
+ *out_image = obj_image->image;
+ return VA_STATUS_SUCCESS;
}
VAStatus i965_DeriveImage(VADriverContextP ctx,
VASurfaceID surface,
VAImage *image) /* out */
{
- /* TODO */
- return VA_STATUS_ERROR_OPERATION_FAILED;
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct i965_render_state *render_state = &i965->render_state;
+
+ struct object_surface *obj_surface = SURFACE(surface);
+ if (!obj_surface)
+ return VA_STATUS_ERROR_INVALID_SURFACE;
+
+ struct object_image *obj_image = IMAGE(obj_surface->image.image_id);
+ if (!obj_image)
+ return VA_STATUS_ERROR_INVALID_IMAGE;
+
+ if (!obj_surface->is_derived) {
+ /* Reset VA image format on each call so that a VA surface can
+ be re-used with another context (and internal surface format) */
+ VAImage * const image = &obj_surface->image;
+ const i965_image_format_map_t *m;
+ m = get_image_format(render_state->interleaved_uv ? VA_FOURCC_NV12 : VA_FOURCC_YV12);
+ if (!m)
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+ if (!setup_image_format(image, m->va_format.fourcc, image->width, image->height))
+ return VA_STATUS_ERROR_OPERATION_FAILED;
+ image->format = m->va_format;
+ obj_surface->is_derived = 1;
+ }
+ *image = obj_surface->image;
+ return VA_STATUS_SUCCESS;
}
static void
@@ -1404,15 +1479,24 @@ i965_destroy_image(struct object_heap *heap, struct object_base *obj)
object_heap_free(heap, obj);
}
-
-VAStatus
-i965_DestroyImage(VADriverContextP ctx, VAImageID image)
+static void
+i965_DestroyImage_impl(
+ VADriverContextP ctx,
+ struct object_image *obj_image,
+ int from_surface
+)
{
- struct i965_driver_data *i965 = i965_driver_data(ctx);
- struct object_image *obj_image = IMAGE(image);
+ struct i965_driver_data * const i965 = i965_driver_data(ctx);
if (!obj_image)
- return VA_STATUS_SUCCESS;
+ return;
+
+ if (!from_surface && obj_image->surface != VA_INVALID_ID) {
+ /* only destroy when called from vaDestroySurfaces() */
+ struct object_surface *obj_surface = SURFACE(obj_image->surface);
+ obj_surface->is_derived = 0;
+ return;
+ }
if (obj_image->image.buf != VA_INVALID_ID) {
i965_DestroyBuffer(ctx, obj_image->image.buf);
@@ -1425,6 +1509,15 @@ i965_DestroyImage(VADriverContextP ctx, VAImageID image)
}
i965_destroy_image(&i965->image_heap, (struct object_base *)obj_image);
+}
+
+VAStatus
+i965_DestroyImage(VADriverContextP ctx, VAImageID image)
+{
+ struct i965_driver_data *i965 = i965_driver_data(ctx);
+ struct object_image *obj_image = IMAGE(image);
+
+ i965_DestroyImage_impl(ctx, obj_image, 0);
return VA_STATUS_SUCCESS;
}
@@ -1472,6 +1565,9 @@ i965_GetImage(VADriverContextP ctx,
if (!obj_surface)
return VA_STATUS_ERROR_INVALID_SURFACE;
+ if (obj_surface->is_derived)
+ return VA_STATUS_ERROR_SURFACE_BUSY;
+
struct object_image *obj_image = IMAGE(image);
if (!obj_image)
return VA_STATUS_ERROR_INVALID_IMAGE;
@@ -1535,6 +1631,9 @@ i965_PutImage(VADriverContextP ctx,
if (!obj_surface)
return VA_STATUS_ERROR_INVALID_SURFACE;
+ if (obj_surface->is_derived)
+ return VA_STATUS_ERROR_SURFACE_BUSY;
+
struct object_image *obj_image = IMAGE(image);
if (!obj_image)
return VA_STATUS_ERROR_INVALID_IMAGE;
diff --git a/i965_drv_video/i965_drv_video.h b/i965_drv_video/i965_drv_video.h
index 0a839e6..c05ed34 100644
--- a/i965_drv_video/i965_drv_video.h
+++ b/i965_drv_video/i965_drv_video.h
@@ -102,6 +102,8 @@ struct object_surface
int width;
int height;
int size;
+ VAImage image;
+ int is_derived;
dri_bo *bo;
void (*free_private_data)(void **data);
void *private_data;
@@ -121,6 +123,7 @@ struct object_image
{
struct object_base base;
VAImage image;
+ VASurfaceID surface;
dri_bo *bo;
unsigned int *palette;
};

71
packages/multimedia/libva/patches/040_g45_add_i420_image_format.diff
View File

@ -1,71 +0,0 @@
commit c6912e0d320c1692cd4331ec90193a96e6ef21fe
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Thu Mar 18 12:25:20 2010 +0100
[G45] Add I420 image format.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index d5b88d0..ddb9ae9 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -64,6 +64,8 @@ static const i965_image_format_map_t
i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
{ I965_SURFACETYPE_YUV,
{ VA_FOURCC('Y','V','1','2'), VA_LSB_FIRST, 12, } },
+ { I965_SURFACETYPE_YUV,
+ { VA_FOURCC('I','4','2','0'), VA_LSB_FIRST, 12, } },
};
static const i965_image_format_map_t *
@@ -1390,6 +1392,16 @@ i965_CreateImage_impl(
image->offsets[2] = size;
image->data_size = size + 2 * size2;
break;
+ case VA_FOURCC('I','4','2','0'):
+ image->num_planes = 3;
+ image->pitches[0] = width;
+ image->offsets[0] = 0;
+ image->pitches[1] = width2;
+ image->offsets[1] = size;
+ image->pitches[2] = width2;
+ image->offsets[2] = size + size2;
+ image->data_size = size + 2 * size2;
+ break;
default:
goto error;
}
@@ -1575,7 +1587,9 @@ i965_GetImage(VADriverContextP ctx,
dri_bo_map(obj_surface->bo, 0);
switch (obj_image->image.format.fourcc) {
- case VA_FOURCC('Y','V','1','2'): /* YV12 is native format here */
+ case VA_FOURCC('Y','V','1','2'):
+ case VA_FOURCC('I','4','2','0'):
+ /* I420 is native format for MPEG-2 decoded surfaces */
if (render_state->interleaved_uv)
goto operation_failed;
memcpy(image_data, obj_surface->bo->virtual, obj_surface->bo->size);
@@ -1644,7 +1658,9 @@ i965_PutImage(VADriverContextP ctx,
dri_bo_map(obj_surface->bo, 1);
switch (obj_image->image.format.fourcc) {
- case VA_FOURCC('Y','V','1','2'): /* YV12 is native format here */
+ case VA_FOURCC('Y','V','1','2'):
+ case VA_FOURCC('I','4','2','0'):
+ /* I420 is native format for MPEG-2 decoded surfaces */
if (render_state->interleaved_uv)
goto operation_failed;
memcpy(obj_surface->bo->virtual, image_data, obj_surface->bo->size);
diff --git a/i965_drv_video/i965_drv_video.h b/i965_drv_video/i965_drv_video.h
index c05ed34..f2a20f2 100644
--- a/i965_drv_video/i965_drv_video.h
+++ b/i965_drv_video/i965_drv_video.h
@@ -43,7 +43,7 @@
#define I965_MAX_PROFILES 11
#define I965_MAX_ENTRYPOINTS 5
#define I965_MAX_CONFIG_ATTRIBUTES 10
-#define I965_MAX_IMAGE_FORMATS 1
+#define I965_MAX_IMAGE_FORMATS 2
#define I965_MAX_SUBPIC_FORMATS 4
#define I965_MAX_DISPLAY_ATTRIBUTES 4
#define I965_STR_VENDOR "i965 Driver 0.1"

35
packages/multimedia/libva/patches/041_g45_internals.diff
View File

@ -1,35 +0,0 @@
commit acd21062fe185d9c49df3d493955343e5fb52783
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Mon Apr 19 14:01:55 2010 +0200
[G45] Don't export internal symbols as they can be mixed up with
those from the system i965_dri.so.
diff --git a/i965_drv_video/Makefile.am b/i965_drv_video/Makefile.am
index 88b5590..6421107 100644
--- a/i965_drv_video/Makefile.am
+++ b/i965_drv_video/Makefile.am
@@ -22,7 +22,7 @@
SUBDIRS = shaders
-AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@
+AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@ -fvisibility=hidden
i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index 7b3a206..f0c3bc1 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -1706,6 +1706,10 @@ i965_Terminate(VADriverContextP ctx)
VAStatus
__vaDriverInit_0_31( VADriverContextP ctx )
+ __attribute__((__visibility__("default")));
+
+VAStatus
+__vaDriverInit_0_31( VADriverContextP ctx )
{
struct i965_driver_data *i965;
int result;

73
packages/multimedia/libva/patches/042_g45_add_nv12_image_format.diff
View File

@ -1,73 +0,0 @@
commit 3e0d91566ca828f0a40013704a90369a11a631ef
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Apr 28 15:27:21 2010 +0200
[G45] Add NV12 image format.
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c
index ddb9ae9..f2f4c25 100644
--- a/i965_drv_video/i965_drv_video.c
+++ b/i965_drv_video/i965_drv_video.c
@@ -66,6 +66,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
{ VA_FOURCC('Y','V','1','2'), VA_LSB_FIRST, 12, } },
{ I965_SURFACETYPE_YUV,
{ VA_FOURCC('I','4','2','0'), VA_LSB_FIRST, 12, } },
+ { I965_SURFACETYPE_YUV,
+ { VA_FOURCC('N','V','1','2'), VA_LSB_FIRST, 12, } },
};
static const i965_image_format_map_t *
@@ -1402,6 +1404,14 @@ i965_CreateImage_impl(
image->offsets[2] = size + size2;
image->data_size = size + 2 * size2;
break;
+ case VA_FOURCC('N','V','1','2'):
+ image->num_planes = 2;
+ image->pitches[0] = width;
+ image->offsets[0] = 0;
+ image->pitches[1] = width;
+ image->offsets[1] = size;
+ image->data_size = size + 2 * size2;
+ break;
default:
goto error;
}
@@ -1594,6 +1604,12 @@ i965_GetImage(VADriverContextP ctx,
goto operation_failed;
memcpy(image_data, obj_surface->bo->virtual, obj_surface->bo->size);
break;
+ case VA_FOURCC('N','V','1','2'):
+ /* NV12 is native format for H.264 decoded surfaces */
+ if (!render_state->interleaved_uv)
+ goto operation_failed;
+ memcpy(image_data, obj_surface->bo->virtual, obj_surface->bo->size);
+ break;
default:
operation_failed:
va_status = VA_STATUS_ERROR_OPERATION_FAILED;
@@ -1665,6 +1681,12 @@ i965_PutImage(VADriverContextP ctx,
goto operation_failed;
memcpy(obj_surface->bo->virtual, image_data, obj_surface->bo->size);
break;
+ case VA_FOURCC('N','V','1','2'):
+ /* NV12 is native format for H.264 decoded surfaces */
+ if (!render_state->interleaved_uv)
+ goto operation_failed;
+ memcpy(obj_surface->bo->virtual, image_data, obj_surface->bo->size);
+ break;
default:
operation_failed:
va_status = VA_STATUS_ERROR_OPERATION_FAILED;
diff --git a/i965_drv_video/i965_drv_video.h b/i965_drv_video/i965_drv_video.h
index f2a20f2..d762a47 100644
--- a/i965_drv_video/i965_drv_video.h
+++ b/i965_drv_video/i965_drv_video.h
@@ -43,7 +43,7 @@
#define I965_MAX_PROFILES 11
#define I965_MAX_ENTRYPOINTS 5
#define I965_MAX_CONFIG_ATTRIBUTES 10
-#define I965_MAX_IMAGE_FORMATS 2
+#define I965_MAX_IMAGE_FORMATS 3
#define I965_MAX_SUBPIC_FORMATS 4
#define I965_MAX_DISPLAY_ATTRIBUTES 4
#define I965_STR_VENDOR "i965 Driver 0.1"

41
packages/multimedia/libva/patches/102_attribute_visibility.diff
View File

@ -1,41 +0,0 @@
commit 26db277f8e028be83d9ab16ef8e4077e9f745c17
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Thu Sep 3 15:46:37 2009 +0000
Check for __attribute__((visibility("hidden"))).
diff --git a/configure.ac b/configure.ac
index eedfe4c..f2d0ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,30 @@ if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdr
fi
AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
+dnl Check for __attribute__((visibility()))
+AC_CACHE_CHECK([whether __attribute__((visibility())) is supported],
+ libva_cv_visibility_attribute,
+ [cat > conftest.c <<EOF
+int foo __attribute__ ((visibility ("hidden"))) = 1;
+int bar __attribute__ ((visibility ("protected"))) = 1;
+EOF
+ libva_cv_visibility_attribute=no
+ if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+ if grep '\.hidden.*foo' conftest.s >/dev/null; then
+ if grep '\.protected.*bar' conftest.s >/dev/null; then
+ libva_cv_visibility_attribute=yes
+ fi
+ fi
+ fi
+ rm -f conftest.[cs]
+])
+ATTRIBUTE_HIDDEN=""
+if test $libva_cv_visibility_attribute = yes; then
+ ATTRIBUTE_HIDDEN="__attribute__((visibility(\"hidden\")))"
+fi
+AC_DEFINE_UNQUOTED([ATTRIBUTE_HIDDEN], [$ATTRIBUTE_HIDDEN],
+ [Defined to __attribute__((visibility("hidden"))) when available])
+
# We only need the headers, we don't link against the DRM libraries
LIBVA_CFLAGS="$DRM_CFLAGS"
AC_SUBST(LIBVA_CFLAGS)

22
packages/multimedia/libva/patches/103_fix_vainfo_deps.diff
View File

@ -1,22 +0,0 @@
commit a07468c4f0e30b5f207a2bdf1b362f5584d748a7
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue Sep 22 12:29:56 2009 +0000
Fix vainfo dependencies (Konstantin Pavlov).
diff --git a/test/Makefile.am b/test/Makefile.am
index d7e1b1f..8785259 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -25,9 +25,8 @@ bin_PROGRAMS = vainfo
AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
-
-vainfo_LDADD = $(top_srcdir)/va/$(libvabackendlib)
-vainfo_DEPENDENCIES = $(top_srcdir)/va/$(libvabackendlib)
+vainfo_LDADD = $(top_srcdir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
+vainfo_DEPENDENCIES = $(top_srcdir)/va/libva.la $(top_srcdir)/va/$(libvabackendlib)
vainfo_SOURCES = vainfo.c
SUBDIRS = basic decode encode putsurface

18
packages/multimedia/libva/patches/104_fix_libva_pkgconfig_deps.diff
View File

@ -1,18 +0,0 @@
commit 5f1314d188c4ecc2e0d5be54bcd663013e8b0077
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue Sep 22 13:00:34 2009 +0000
Fix libva-x11 dependencies. Ensure this grabs libva so that people don't have to check for that themselves.
diff --git a/libva-x11.pc.in b/libva-x11.pc.in
index 75e4f0b..6dde07f 100644
--- a/libva-x11.pc.in
+++ b/libva-x11.pc.in
@@ -6,6 +6,7 @@ display=x11
Name: libva-${display}
Description: Userspace Video Acceleration (VA) ${display} interface
+Requires: libva
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lva-${display}
Cflags: -I${includedir}

21
packages/multimedia/libva/patches/105_dont_search_LIBGL_DRIVERS_PATH.diff
View File

@ -1,21 +0,0 @@
commit ecc7b5f332674ee57ad11a0d6bb58a252549c762
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue Sep 22 13:03:23 2009 +0000
Don't search LIBGL_DRIVERS_PATH, stick to LIBVA_DRIVERS_PATH only or the default path.
diff --git a/va/va.c b/va/va.c
index c8e036e..ada70ce 100644
--- a/va/va.c
+++ b/va/va.c
@@ -127,10 +127,6 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
{
/* don't allow setuid apps to use LIBVA_DRIVERS_PATH */
search_path = getenv("LIBVA_DRIVERS_PATH");
- if (!search_path)
- {
- search_path = getenv("LIBGL_DRIVERS_PATH");
- }
}
if (!search_path)
{

19
packages/multimedia/libva/patches/108_drivers_path.diff
View File

@ -1,19 +0,0 @@
commit 43becedcfa2b9b040006868a63c686a131c9ba74
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Jun 24 08:12:13 2009 +0000
Install drivers into pkglibdir/va/.
diff --git a/configure.ac b/configure.ac
index f2d0ea4..ebe5df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_ARG_ENABLE(i965-driver,
AC_ARG_WITH(drivers-path,
[AC_HELP_STRING([--with-drivers-path=[[path]]], [drivers path])],,
- [with_drivers_path="$libdir/dri"])
+ [with_drivers_path="$libdir/va/drivers"])
LIBVA_DRIVERS_PATH="$with_drivers_path"
AC_SUBST(LIBVA_DRIVERS_PATH)

97
packages/multimedia/libva/patches/201_libva_LIBVA_DRIVER_NAME.diff
View File

@ -1,97 +0,0 @@
commit 1f9ee94ab4ac60459048bef5a2aa348cdf88c390
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue Feb 23 09:11:22 2010 +0000
Move LIBVA_DRIVER_NAME check in vaInitialize().
diff --git a/va/va.c b/va/va.c
index ada70ce..b5940e5 100644
--- a/va/va.c
+++ b/va/va.c
@@ -320,30 +320,42 @@ VAStatus vaInitialize (
int *minor_version /* out */
)
{
- char *driver_name = NULL;
- VAStatus vaStatus;
-
- CHECK_DISPLAY(dpy);
+ const char *driver_name_env = NULL;
+ char *driver_name = NULL;
+ VAStatus vaStatus;
- va_debug_trace = (getenv("LIBVA_DEBUG_TRACE") != NULL);
+ CHECK_DISPLAY(dpy);
- va_infoMessage("libva version %s\n", VA_VERSION_S);
+ va_debug_trace = (getenv("LIBVA_DEBUG_TRACE") != NULL);
- vaStatus = va_getDriverName(dpy, &driver_name);
- va_infoMessage("va_getDriverName() returns %d\n", vaStatus);
-
- if (VA_STATUS_SUCCESS == vaStatus)
- {
- vaStatus = va_openDriver(dpy, driver_name);
- va_infoMessage("va_openDriver() returns %d\n", vaStatus);
-
- *major_version = VA_MAJOR_VERSION;
- *minor_version = VA_MINOR_VERSION;
- }
+ va_infoMessage("libva version %s\n", VA_VERSION_S);
- if (driver_name)
- free(driver_name);
- return vaStatus;
+ driver_name_env = getenv("LIBVA_DRIVER_NAME");
+ if (driver_name_env && geteuid() == getuid())
+ {
+ /* Don't allow setuid apps to use LIBVA_DRIVER_NAME */
+ driver_name = strdup(driver_name_env);
+ vaStatus = VA_STATUS_SUCCESS;
+ va_infoMessage("User requested driver '%s'\n", driver_name);
+ }
+ else
+ {
+ vaStatus = va_getDriverName(dpy, &driver_name);
+ va_infoMessage("va_getDriverName() returns %d\n", vaStatus);
+ }
+
+ if (VA_STATUS_SUCCESS == vaStatus)
+ {
+ vaStatus = va_openDriver(dpy, driver_name);
+ va_infoMessage("va_openDriver() returns %d\n", vaStatus);
+
+ *major_version = VA_MAJOR_VERSION;
+ *minor_version = VA_MINOR_VERSION;
+ }
+
+ if (driver_name)
+ free(driver_name);
+ return vaStatus;
}
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 29e81c8..78e38de 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -136,19 +136,10 @@ static VAStatus va_DisplayContextGetDriverName (
)
{
VAStatus vaStatus;
- char *driver_name_env;
if (driver_name)
*driver_name = NULL;
- if ((driver_name_env = getenv("LIBVA_DRIVER_NAME")) != NULL
- && geteuid() == getuid())
- {
- /* don't allow setuid apps to use LIBVA_DRIVER_NAME */
- *driver_name = strdup(driver_name_env);
- return VA_STATUS_SUCCESS;
- }
-
vaStatus = va_DRI2GetDriverName(pDisplayContext, driver_name);
if (vaStatus != VA_STATUS_SUCCESS)
vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name);

155
packages/multimedia/libva/patches/202_check_crystalhd.diff
View File

@ -1,155 +0,0 @@
commit 0eeee71bcd334512a6b86702ee612b35feb644b2
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue Feb 23 10:05:25 2010 +0000
Detect Broadcom Crystal HD chip.
diff --git a/va/Makefile.am b/va/Makefile.am
index aeaf82f..f382c0e 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -42,7 +42,7 @@ libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
SUBDIRS = x11
-libva_la_SOURCES = va.c
+libva_la_SOURCES = va.c va_crystalhd.c
libvaincludedir = ${includedir}/va
libvainclude_HEADERS = va.h va_x11.h va_backend.h va_version.h
@@ -51,4 +51,5 @@ DISTCLEANFILES = \
va_version.h
EXTRA_DIST = \
- va_version.h.in
+ va_version.h.in \
+ va_crystalhd.h
diff --git a/va/va.c b/va/va.c
index b5940e5..fd68481 100644
--- a/va/va.c
+++ b/va/va.c
@@ -24,8 +24,10 @@
#define _GNU_SOURCE 1
+#include "config.h"
#include "va.h"
#include "va_backend.h"
+#include "va_crystalhd.h"
#include <assert.h>
#include <stdarg.h>
@@ -349,6 +351,15 @@ VAStatus vaInitialize (
vaStatus = va_openDriver(dpy, driver_name);
va_infoMessage("va_openDriver() returns %d\n", vaStatus);
+ if (vaStatus != VA_STATUS_SUCCESS && !driver_name_env)
+ {
+ if (va_hasCrystalHD())
+ {
+ vaStatus = va_openDriver(dpy, "crystalhd");
+ va_infoMessage("va_openDriver() returns %d\n", vaStatus);
+ }
+ }
+
*major_version = VA_MAJOR_VERSION;
*minor_version = VA_MINOR_VERSION;
}
diff --git a/va/va_crystalhd.c b/va/va_crystalhd.c
new file mode 100644
index 0000000..1ddd4fe
--- /dev/null
+++ b/va/va_crystalhd.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "va_crystalhd.h"
+
+/* Checks if the Broadcom Crystal HD decoder is available */
+int va_hasCrystalHD(void)
+{
+ char line[1024];
+ int len, vendor, device, dummy, found = 0;
+ FILE *fp;
+
+ fp = fopen("/proc/bus/pci/devices", "r");
+ if (!fp)
+ return 0;
+
+ while (!found && fgets(line, sizeof(line), fp)) {
+ len = strlen(line);
+ if (len == 0)
+ continue;
+ line[len - 1] = 0;
+ if (sscanf(line, "%x %04x%04x", &dummy, &vendor, &device) == 3) {
+ if (vendor == 0x14e4 && device == 0x1612) /* BCM70012 */
+ found = 1;
+ }
+ }
+ fclose(fp);
+ return found;
+}
diff --git a/va/va_crystalhd.h b/va/va_crystalhd.h
new file mode 100644
index 0000000..44a39d9
--- /dev/null
+++ b/va/va_crystalhd.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef VA_CRYSTALHD_H
+#define VA_CRYSTALHD_H
+
+/** Checks if the Broadcom Crystal HD decoder is available */
+int va_hasCrystalHD(void)
+ ATTRIBUTE_HIDDEN;
+
+#endif /* VA_CRYSTALHD_H */

538
packages/multimedia/libva/patches/203_fix_fglrx_detection.diff
View File

@ -1,538 +0,0 @@
commit 02c2bb46ae11a1674927e6e65f990df1dc9ed1ce
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Mon Mar 8 09:17:09 2010 +0100
Don't link against libdrm to workaround XvBA / fglrx >= 8.66-RC1 bugs.
diff --git a/va/Makefile.am b/va/Makefile.am
index f382c0e..3b9ccfc 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -36,7 +36,7 @@ libva_la_LDFLAGS = $(LDADD) -no-undefined
libva_la_LIBADD = $(LIBVA_LIBS) -ldl
libva_x11_la_SOURCES =
-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS)
libva_x11_la_LDFLAGS = $(LDADD)
libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index 40346f1..7466fda 100644
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -25,6 +25,6 @@ noinst_LTLIBRARIES = libva_x11.la
libva_x11includedir = ${includedir}/va
libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h
-libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c
+libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c libdrm_glue.c
-EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h
+EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h libdrm_glue.h
diff --git a/va/x11/dri1_util.c b/va/x11/dri1_util.c
index 3e67e2a..f6ce1ba 100644
--- a/va/x11/dri1_util.c
+++ b/va/x11/dri1_util.c
@@ -1,10 +1,13 @@
+#include "config.h"
+#include <stdio.h>
#include <stdlib.h>
+#include <strings.h> /* strcasecmp() */
#include <fcntl.h>
#include <unistd.h>
#include <sys/mman.h>
#include <assert.h>
-#include <xf86drm.h>
+#include "libdrm_glue.h"
#include "X11/Xlib.h"
#include "va.h"
@@ -21,6 +24,75 @@ struct dri1_drawable
int height;
};
+static int
+firegl_drmOpenMinor(int minor)
+{
+ char buf[64];
+ int fd;
+
+ sprintf(buf, "/dev/ati/card%d", minor);
+ if ((fd = open(buf, O_RDWR, 0)) >= 0)
+ return fd;
+ return -1;
+}
+
+static int
+firegl_drmOpenByBusID(const char *busid)
+{
+ int i, fd;
+ drmSetVersion sv;
+ const char *buf;
+
+ for (i = 0; i < DRM_MAX_MINOR; i++) {
+ if ((fd = firegl_drmOpenMinor(i)) < 0)
+ continue;
+ sv.drm_di_major = 1;
+ sv.drm_di_minor = 1;
+ sv.drm_dd_major = -1;
+ sv.drm_dd_minor = -1;
+ libdrm_drmSetInterfaceVersion(fd, &sv);
+ buf = libdrm_drmGetBusid(fd);
+ if (buf && strcasecmp(buf, busid) == 0) { /* XXX: drmMatchBusID() */
+ libdrm_drmFreeBusid(buf);
+ return fd;
+ }
+ if (buf)
+ libdrm_drmFreeBusid(buf);
+ close(fd);
+ }
+ return -1;
+}
+
+static int
+drm_open_once(struct dri_state *dri_state, const char *BusID, int *newlyopened)
+{
+ dri_state->driConnectedFlag = VA_NONE;
+ dri_state->fd = libdrm_drmOpenOnce(NULL, BusID, newlyopened);
+ if (dri_state->fd < 0) {
+ dri_state->fd = firegl_drmOpenByBusID(BusID);
+ if (dri_state->fd >= 0) {
+ *newlyopened = 1;
+ dri_state->driConnectedFlag |= VA_DRI_AMD;
+ }
+ }
+ return dri_state->fd;
+}
+
+static void
+drm_close_once(struct dri_state *dri_state)
+{
+ /* XXX: dri_state->close() doesn't seem to be called, thus this
+ function is never called either */
+ if (dri_state->fd < 0)
+ return;
+ if (dri_state->driConnectedFlag & VA_DRI_AMD)
+ close(dri_state->fd);
+ else
+ libdrm_drmCloseOnce(dri_state->fd);
+ dri_state->fd = -1;
+ dri_state->driConnectedFlag = VA_NONE;
+}
+
static struct dri_drawable *
dri1CreateDrawable(VADriverContextP ctx, XID x_drawable)
{
@@ -64,9 +136,9 @@ dri1Close(VADriverContextP ctx)
free_drawable_hashtable(ctx);
VA_DRIDestroyContext(ctx->x11_dpy, ctx->x11_screen, dri_state->hwContextID);
assert(dri_state->pSAREA != MAP_FAILED);
- drmUnmap(dri_state->pSAREA, SAREA_MAX);
+ libdrm_drmUnmap(dri_state->pSAREA, SAREA_MAX);
assert(dri_state->fd >= 0);
- drmCloseOnce(dri_state->fd);
+ drm_close_once(dri_state);
VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
}
@@ -104,21 +176,20 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
&dri_state->hSAREA, &BusID))
goto err_out0;
-
- dri_state->fd = drmOpenOnce(NULL, BusID, &newlyopened);
+ drm_open_once(dri_state, BusID, &newlyopened);
XFree(BusID);
if (dri_state->fd < 0)
goto err_out1;
- if (drmGetMagic(dri_state->fd, &magic))
+ if (libdrm_drmGetMagic(dri_state->fd, &magic))
goto err_out1;
if (newlyopened && !VA_DRIAuthConnection(ctx->x11_dpy, ctx->x11_screen, magic))
goto err_out1;
- if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
+ if (libdrm_drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
goto err_out1;
if (!VA_DRICreateContext(ctx->x11_dpy, ctx->x11_screen,
@@ -126,7 +197,8 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
&dri_state->hwContextID, &dri_state->hwContext))
goto err_out1;
- dri_state->driConnectedFlag = VA_DRI1;
+ dri_state->driConnectedFlag &= VA_DRI_AMD; /* clear flags but AMD bit */
+ dri_state->driConnectedFlag |= VA_DRI1;
dri_state->createDrawable = dri1CreateDrawable;
dri_state->destroyDrawable = dri1DestroyDrawable;
dri_state->swapBuffer = dri1SwapBuffer;
@@ -137,10 +209,10 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
err_out1:
if (dri_state->pSAREA != MAP_FAILED)
- drmUnmap(dri_state->pSAREA, SAREA_MAX);
+ libdrm_drmUnmap(dri_state->pSAREA, SAREA_MAX);
if (dri_state->fd >= 0)
- drmCloseOnce(dri_state->fd);
+ drm_close_once(dri_state);
VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
diff --git a/va/x11/dri2_util.c b/va/x11/dri2_util.c
index ebe7a2c..b727e97 100644
--- a/va/x11/dri2_util.c
+++ b/va/x11/dri2_util.c
@@ -3,7 +3,7 @@
#include <unistd.h>
#include <assert.h>
-#include <xf86drm.h>
+#include "libdrm_glue.h"
#include <X11/Xlibint.h>
#include <X11/Xlib.h>
@@ -166,7 +166,7 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name)
if (dri_state->fd < 0)
goto err_out;
- if (drmGetMagic(dri_state->fd, &magic))
+ if (libdrm_drmGetMagic(dri_state->fd, &magic))
goto err_out;
if (!VA_DRI2Authenticate(ctx->x11_dpy, RootWindow(ctx->x11_dpy, ctx->x11_screen),
diff --git a/va/x11/libdrm_glue.c b/va/x11/libdrm_glue.c
new file mode 100644
index 0000000..92c7d60
--- /dev/null
+++ b/va/x11/libdrm_glue.c
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include "libdrm_glue.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+#include <assert.h>
+
+#define LOAD_FUNC_(NAME, RET, ARGS, FALLBACK) \
+ static RET (*lib_##NAME) ARGS; \
+ if (lib_##NAME == NULL) { \
+ lib_##NAME = libdrm_symbol(#NAME); \
+ if (!lib_##NAME) \
+ lib_##NAME = FALLBACK; \
+ } \
+ assert(lib_##NAME != NULL)
+
+#define LOAD_FUNC(NAME, RET, ARGS) \
+ LOAD_FUNC_(NAME, RET, ARGS, NULL)
+
+static void *libdrm_handle;
+static int libdrm_handle_ok = -1;
+
+static inline void *libdrm_symbol(const char *name)
+{
+ if (!libdrm_open())
+ return NULL;
+ return dlsym(libdrm_handle, name);
+}
+
+int libdrm_open(void)
+{
+ if (libdrm_handle_ok < 0) {
+ libdrm_handle = dlopen("libdrm.so.2", RTLD_LOCAL|RTLD_LAZY);
+ libdrm_handle_ok = libdrm_handle != NULL;
+ }
+ assert(libdrm_handle);
+ return libdrm_handle_ok;
+}
+
+void libdrm_close(void)
+{
+ if (libdrm_handle)
+ dlclose(libdrm_handle);
+}
+
+// Default drmOpenOnce() and drmCloseOnce() implementations based on current GIT
+#define DRM_MAX_FDS 16
+static struct {
+ char *BusID;
+ int fd;
+ int refcount;
+} connection[DRM_MAX_FDS];
+
+static int nr_fds = 0;
+
+// Default implementation for drmOpenOnce() if none exists in the library
+static int
+libdrm_default_drmOpenOnce(void *unused, const char *BusID, int *newlyopened)
+{
+ int i;
+ int fd;
+
+ for (i = 0; i < nr_fds; i++)
+ if (strcmp(BusID, connection[i].BusID) == 0) {
+ connection[i].refcount++;
+ *newlyopened = 0;
+ return connection[i].fd;
+ }
+
+ fd = libdrm_drmOpen(unused, BusID);
+ if (fd <= 0 || nr_fds == DRM_MAX_FDS)
+ return fd;
+
+ connection[nr_fds].BusID = strdup(BusID);
+ connection[nr_fds].fd = fd;
+ connection[nr_fds].refcount = 1;
+ *newlyopened = 1;
+
+ if (0)
+ fprintf(stderr, "saved connection %d for %s %d\n",
+ nr_fds, connection[nr_fds].BusID,
+ strcmp(BusID, connection[nr_fds].BusID));
+ nr_fds++;
+ return fd;
+}
+
+// Default implementation for drmCloseOnce() if none exists in the library
+static void libdrm_default_drmCloseOnce(int fd)
+{
+ int i;
+
+ for (i = 0; i < nr_fds; i++) {
+ if (fd == connection[i].fd) {
+ if (--connection[i].refcount == 0) {
+ libdrm_drmClose(connection[i].fd);
+ free(connection[i].BusID);
+ if (i < --nr_fds)
+ connection[i] = connection[nr_fds];
+ return;
+ }
+ }
+ }
+}
+
+// Determine whether the DRM kernel driver has been loaded
+int libdrm_drmAvailable(void)
+{
+ LOAD_FUNC(drmAvailable, int, (void));
+ return lib_drmAvailable();
+}
+
+// Open the DRM device
+int libdrm_drmOpen(const char *name, const char *busid)
+{
+ LOAD_FUNC(drmOpen, int, (const char *, const char *));
+ return lib_drmOpen(name, busid);
+}
+
+// Close the device
+int libdrm_drmClose(int fd)
+{
+ LOAD_FUNC(drmClose, int, (int));
+ return lib_drmClose(fd);
+}
+
+// Open the DRM device (re-use an existing connection)
+int libdrm_drmOpenOnce(void *unused, const char *BusID, int *newlyopened)
+{
+ LOAD_FUNC_(drmOpenOnce, int, (void *, const char *, int *),
+ libdrm_default_drmOpenOnce);
+ return lib_drmOpenOnce(unused, BusID, newlyopened);
+}
+
+// Close the device (unref an existing connection prior to actually closing it)
+void libdrm_drmCloseOnce(int fd)
+{
+ LOAD_FUNC_(drmCloseOnce, void, (int), libdrm_default_drmCloseOnce);
+ lib_drmCloseOnce(fd);
+}
+
+// DRM connection cookie
+int libdrm_drmGetMagic(int fd, drm_magic_t * magic)
+{
+ LOAD_FUNC(drmGetMagic, int, (int, drm_magic_t *));
+ return lib_drmGetMagic(fd, magic);
+}
+
+// Issue a set-version ioctl
+int libdrm_drmSetInterfaceVersion(int fd, drmSetVersion *version)
+{
+ LOAD_FUNC(drmSetInterfaceVersion, int, (int, drmSetVersion *));
+ return lib_drmSetInterfaceVersion(fd, version);
+}
+
+// Get the bus ID of the device
+char *libdrm_drmGetBusid(int fd)
+{
+ LOAD_FUNC(drmGetBusid, char *, (int));
+ return lib_drmGetBusid(fd);
+}
+
+// Free the bus ID information
+void libdrm_drmFreeBusid(const char *busid)
+{
+ LOAD_FUNC(drmFreeBusid, void, (const char *));
+ lib_drmFreeBusid(busid);
+}
+
+// Map a region of memory
+int libdrm_drmMap(int fd,
+ drm_handle_t handle,
+ drmSize size,
+ drmAddressPtr address)
+{
+ LOAD_FUNC(drmMap, int, (int, drm_handle_t, drmSize, drmAddressPtr));
+ return lib_drmMap(fd, handle, size, address);
+}
+
+// Unmap mappings obtained with drmMap()
+int libdrm_drmUnmap(drmAddress address, drmSize size)
+{
+ LOAD_FUNC(drmUnmap, int, (drmAddress, drmSize));
+ return lib_drmUnmap(address, size);
+}
diff --git a/va/x11/libdrm_glue.h b/va/x11/libdrm_glue.h
new file mode 100644
index 0000000..878470b
--- /dev/null
+++ b/va/x11/libdrm_glue.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef LIBDRM_GLUE_H
+#define LIBDRM_GLUE_H
+
+#include "config.h"
+#include <xf86drm.h>
+
+int libdrm_open(void)
+ ATTRIBUTE_HIDDEN;
+
+void libdrm_close(void)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmAvailable(void)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmOpen(const char *name, const char *busid)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmClose(int fd)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmOpenOnce(void *unused, const char *BusID, int *newlyopened)
+ ATTRIBUTE_HIDDEN;
+
+void libdrm_drmCloseOnce(int fd)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmGetMagic(int fd, drm_magic_t * magic)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmSetInterfaceVersion(int fd, drmSetVersion *version)
+ ATTRIBUTE_HIDDEN;
+
+char *libdrm_drmGetBusid(int fd)
+ ATTRIBUTE_HIDDEN;
+
+void libdrm_drmFreeBusid(const char *busid)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmMap(int fd,
+ drm_handle_t handle,
+ drmSize size,
+ drmAddressPtr address)
+ ATTRIBUTE_HIDDEN;
+
+int libdrm_drmUnmap(drmAddress address, drmSize size)
+ ATTRIBUTE_HIDDEN;
+
+#endif /* LIBDRM_GLUE_H */
diff --git a/va/x11/va_dricommon.h b/va/x11/va_dricommon.h
index b762bd0..5ed7a6a 100644
--- a/va/x11/va_dricommon.h
+++ b/va/x11/va_dricommon.h
@@ -13,7 +13,8 @@ enum
{
VA_NONE = 0,
VA_DRI1 = 1,
- VA_DRI2 = 2
+ VA_DRI2 = 2,
+ VA_DRI_AMD = 4 /* AMD DRI implementation */
};
union dri_buffer
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 78e38de..1216093 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -31,6 +31,7 @@
#include "va_dri2.h"
#include "va_dricommon.h"
#include "va_nvctrl.h"
+#include "libdrm_glue.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@ -75,6 +76,8 @@ static void va_DisplayContextDestroy (
}
ctx = &((*ctx)->pNext);
}
+
+ libdrm_close();
free(pDisplayContext->pDriverContext->dri_state);
free(pDisplayContext->pDriverContext);
free(pDisplayContext);

325
packages/multimedia/libva/patches/204_check_ATIFGLEXTENSION.diff
View File

@ -1,325 +0,0 @@
commit 595a044901ee32acc3212100966f5a1a9e181515
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Fri Nov 20 15:51:22 2009 +0000
Fix detection of fglrx.
diff --git a/va/Makefile.am b/va/Makefile.am
index 3b9ccfc..99f6bbf 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -36,7 +36,7 @@ libva_la_LDFLAGS = $(LDADD) -no-undefined
libva_la_LIBADD = $(LIBVA_LIBS) -ldl
libva_x11_la_SOURCES =
-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS)
+libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS) -ldl
libva_x11_la_LDFLAGS = $(LDADD)
libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index 7466fda..a6d9323 100644
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -25,6 +25,23 @@ noinst_LTLIBRARIES = libva_x11.la
libva_x11includedir = ${includedir}/va
libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h
-libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c libdrm_glue.c
+libva_x11_la_SOURCES = \
+ dri1_util.c \
+ dri2_util.c \
+ libdrm_glue.c \
+ va_dri.c \
+ va_dri2.c \
+ va_dricommon.c \
+ va_fglext.c \
+ va_nvctrl.c \
+ va_x11.c \
+ $(NULL)
-EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h libdrm_glue.h
+EXTRA_DIST = \
+ libdrm_glue.h \
+ va_dri2str.h \
+ va_dri2tokens.h \
+ va_dristr.h \
+ va_fglext.h \
+ va_nvctrl.h \
+ $(NULL)
diff --git a/va/x11/va_fglext.c b/va/x11/va_fglext.c
new file mode 100644
index 0000000..add1f28
--- /dev/null
+++ b/va/x11/va_fglext.c
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include <string.h>
+
+#define NEED_REPLIES
+#include <stdlib.h>
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+#include "va_fglext.h"
+
+#define ATIFGL_EXTENSION_NAME "ATIFGLEXTENSION"
+#define ATIFGL_EXTENSION_EVENTS 0
+
+typedef struct _FGLGetDriverData {
+ CARD8 reqType;
+ CARD8 fireglReqType;
+ CARD16 length B16;
+ CARD32 screen B32;
+ CARD16 size B16;
+ CARD16 pad1;
+} xFGLGetDriverDataReq;
+#define sz_xFGLGetDriverDataReq sizeof(xFGLGetDriverDataReq)
+
+typedef struct {
+ BYTE type;
+ BYTE pad1;
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD8 majorVersion;
+ CARD8 minorVersion;
+ CARD8 patchlevel B16;
+ CARD8 BIOSVersionMajor;
+ CARD8 BIOSVersionMinor;
+ CARD8 HasSecondary;
+ CARD16 pad3 B16;
+ CARD32 pad4 B32;
+ CARD32 pad5 B32;
+ CARD32 pad6 B32;
+ CARD32 pad7 B32;
+ // ... there are more fields
+} xFGLGetDriverDataReply;
+#define sz_xFGLGetDriverDataReply sizeof(xFGLGetDriverDataReply)
+
+#define X_FGLGetDriverData 0
+
+static XExtensionInfo _fglext_ext_info_data;
+static XExtensionInfo *fglext_ext_info = &_fglext_ext_info_data;
+static /* const */ char *fglext_extension_name = ATIFGL_EXTENSION_NAME;
+
+#define xFGLCheckExtension(dpy,i,val) \
+ XextCheckExtension (dpy, i, fglext_extension_name, val)
+
+static int close_display();
+static /* const */ XExtensionHooks fglext_extension_hooks = {
+ NULL, /* create_gc */
+ NULL, /* copy_gc */
+ NULL, /* flush_gc */
+ NULL, /* free_gc */
+ NULL, /* create_font */
+ NULL, /* free_font */
+ close_display, /* close_display */
+ NULL, /* wire_to_event */
+ NULL, /* event_to_wire */
+ NULL, /* error */
+ NULL, /* error_string */
+};
+
+static XEXT_GENERATE_FIND_DISPLAY (find_display, fglext_ext_info,
+ fglext_extension_name,
+ &fglext_extension_hooks,
+ ATIFGL_EXTENSION_EVENTS, NULL)
+
+static XEXT_GENERATE_CLOSE_DISPLAY (close_display, fglext_ext_info)
+
+Bool VA_FGLEXTQueryDirectRenderingCapable( Display *dpy, int screen,
+ Bool *isCapable )
+{
+ char **extensions;
+ int i, n_extensions, has_fglext = 0, has_fglrxdri = 0;
+
+ if (isCapable)
+ *isCapable = False;
+
+ extensions = XListExtensions(dpy, &n_extensions);
+ if (!extensions)
+ return False;
+
+ for (i = 0; i < n_extensions; i++) {
+ if (strcmp(extensions[i], ATIFGL_EXTENSION_NAME) == 0)
+ has_fglext = 1;
+ if (strcmp(extensions[i], "ATIFGLRXDRI") == 0)
+ has_fglrxdri = 1;
+ }
+ XFreeExtensionList(extensions);
+
+ if (!has_fglext)
+ return False;
+
+ if (isCapable)
+ *isCapable = has_fglrxdri;
+
+ return True;
+}
+
+Bool VA_FGLEXTGetClientDriverName( Display *dpy, int screen,
+ int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+ int *ddxDriverPatchVersion, char **clientDriverName )
+{
+ XExtDisplayInfo *info = find_display (dpy);
+ xFGLGetDriverDataReply rep;
+ xFGLGetDriverDataReq *req;
+
+ if (ddxDriverMajorVersion)
+ *ddxDriverMajorVersion = 0;
+ if (ddxDriverMinorVersion)
+ *ddxDriverMinorVersion = 0;
+ if (ddxDriverPatchVersion)
+ *ddxDriverPatchVersion = 0;
+ if (clientDriverName)
+ *clientDriverName = NULL;
+
+ if(!XextHasExtension(info))
+ return False;
+
+ xFGLCheckExtension (dpy, info, False);
+
+ LockDisplay (dpy);
+ GetReq (FGLGetDriverData, req);
+ req->reqType = info->codes->major_opcode;
+ req->fireglReqType = X_FGLGetDriverData;
+ req->screen = screen;
+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+ UnlockDisplay (dpy);
+ SyncHandle ();
+ return False;
+ }
+ UnlockDisplay (dpy);
+ SyncHandle ();
+
+ if (ddxDriverMajorVersion)
+ *ddxDriverMajorVersion = rep.majorVersion;
+ if (ddxDriverMinorVersion)
+ *ddxDriverMinorVersion = rep.minorVersion;
+ if (ddxDriverPatchVersion)
+ *ddxDriverPatchVersion = rep.patchlevel;
+ if (clientDriverName)
+ *clientDriverName = strdup("fglrx");
+
+ return True;
+}
diff --git a/va/x11/va_fglext.h b/va/x11/va_fglext.h
new file mode 100644
index 0000000..f2d87c3
--- /dev/null
+++ b/va/x11/va_fglext.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef VA_FGLEXTLIB_H
+#define VA_FGLEXTLIB_H
+
+#include <X11/Xlib.h>
+
+Bool VA_FGLEXTQueryDirectRenderingCapable( Display *dpy, int screen,
+ Bool *isCapable );
+
+Bool VA_FGLEXTGetClientDriverName( Display *dpy, int screen,
+ int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+ int *ddxDriverPatchVersion, char **clientDriverName );
+
+#endif /* VA_FGLEXTLIB_H */
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 1216093..71cc36f 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -31,6 +31,7 @@
#include "va_dri2.h"
#include "va_dricommon.h"
#include "va_nvctrl.h"
+#include "va_fglext.h"
#include "libdrm_glue.h"
#include <stdio.h>
#include <stdlib.h>
@@ -133,6 +134,29 @@ static VAStatus va_NVCTRL_GetDriverName (
return VA_STATUS_SUCCESS;
}
+static VAStatus va_FGLEXT_GetDriverName(
+ VADisplayContextP pDisplayContext,
+ char **driver_name
+)
+{
+ VADriverContextP ctx = pDisplayContext->pDriverContext;
+ int direct_capable, driver_major, driver_minor, driver_patch;
+ Bool result;
+
+ result = VA_FGLEXTQueryDirectRenderingCapable(ctx->x11_dpy, ctx->x11_screen,
+ &direct_capable);
+ if (!result || !direct_capable)
+ return VA_STATUS_ERROR_UNKNOWN;
+
+ result = VA_FGLEXTGetClientDriverName(ctx->x11_dpy, ctx->x11_screen,
+ &driver_major, &driver_minor,
+ &driver_patch, driver_name);
+ if (!result)
+ return VA_STATUS_ERROR_UNKNOWN;
+
+ return VA_STATUS_SUCCESS;
+}
+
static VAStatus va_DisplayContextGetDriverName (
VADisplayContextP pDisplayContext,
char **driver_name
@@ -148,7 +172,8 @@ static VAStatus va_DisplayContextGetDriverName (
vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name);
if (vaStatus != VA_STATUS_SUCCESS)
vaStatus = va_NVCTRL_GetDriverName(pDisplayContext, driver_name);
-
+ if (vaStatus != VA_STATUS_SUCCESS)
+ vaStatus = va_FGLEXT_GetDriverName(pDisplayContext, driver_name);
return vaStatus;
}

96
packages/multimedia/libva/patches/300_sds_version.diff
View File

@ -1,96 +0,0 @@
commit 1821919f68487c5e4fec33bd242208f49cb58c1e
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Jun 24 11:32:40 2009 +0000
Explicit API extensions from SDS.
diff --git a/configure.ac b/configure.ac
index ebe5df6..95cf992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,9 @@ m4_define([libva_micro_version], [0])
m4_define([libva_version],
[libva_major_version.libva_minor_version.libva_micro_version])
+# increase this number for each API change
+m4_define([libva_sds_version], [6])
+
# if the library source code has changed, increment revision
m4_define([libva_lt_revision], [1])
# if any interface was added/removed/changed, then inc current, reset revision
@@ -52,11 +55,14 @@ AC_SUBST(LIBVA_MINOR_VERSION)
AC_SUBST(LIBVA_MICRO_VERSION)
AC_SUBST(LIBVA_VERSION)
+LIBVA_SDS_VERSION=libva_sds_version
+AC_SUBST(LIBVA_SDS_VERSION)
+
LIBVA_LT_CURRENT=libva_lt_current
LIBVA_LT_REV=libva_lt_revision
LIBVA_LT_AGE=libva_lt_age
LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
-LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION"
+LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION.$LIBVA_SDS_VERSION"
AC_SUBST(LIBVA_LT_VERSION)
AC_SUBST(LIBVA_LT_LDFLAGS)
diff --git a/libva.pc.in b/libva.pc.in
index 60f1483..0b37945 100644
--- a/libva.pc.in
+++ b/libva.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
driverdir=@LIBVA_DRIVERS_PATH@
+sdsversion=@LIBVA_SDS_VERSION@
Name: libva
Description: Userspace Video Acceleration (VA) core interface
diff --git a/va/va.c b/va/va.c
index fd68481..0d208d8 100644
--- a/va/va.c
+++ b/va/va.c
@@ -162,7 +162,15 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
else
{
VADriverInit init_func;
- init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC);
+ char driver_init_func_sds[32];
+ /* First, try SDS extensions (VDPAU and XvBA backends) */
+ sprintf(driver_init_func_sds, "%s_%d_sds%d",
+ DRIVER_INIT_FUNC, VA_MICRO_VERSION, VA_SDS_VERSION);
+ init_func = (VADriverInit) dlsym(handle, driver_init_func_sds);
+ if (!init_func)
+ {
+ init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC);
+ }
if (!init_func)
{
va_errorMessage("%s has no function %s\n", driver_path, DRIVER_INIT_FUNC);
diff --git a/va/va_version.h.in b/va/va_version.h.in
index c9ea97a..197c482 100644
--- a/va/va_version.h.in
+++ b/va/va_version.h.in
@@ -47,6 +47,13 @@
#define VA_MICRO_VERSION (@LIBVA_MICRO_VERSION@)
/**
+ * VA_SDS_VERSION:
+ *
+ * The version of the SDS API extensions to the VA library
+ */
+#define VA_SDS_VERSION (@LIBVA_SDS_VERSION@)
+
+/**
* VA_VERSION:
*
* The full version of the VA library, like 1.2.3
@@ -59,7 +66,7 @@
* The full version of the VA library, in string form (suited for
* string concatenation)
*/
-#define VA_VERSION_S "@LIBVA_VERSION@"
+#define VA_VERSION_S "@LIBVA_VERSION@-sds@LIBVA_SDS_VERSION@"
/**
* VA_VERSION_HEX:

202
packages/multimedia/libva/patches/321_libva_glx.base.diff
View File

@ -1,202 +0,0 @@
commit e69075435675d356c7c9b4ff734a60e8cd031604
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Mon Mar 8 09:44:25 2010 +0100
Add OpenGL extensions (v3) and generic implementation with TFP and FBO.
diff --git a/Makefile.am b/Makefile.am
index 459660b..e75a2db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,10 +32,13 @@ endif
pcfiles = libva.pc
pcfiles += libva-x11.pc
+if USE_GLX
+pcfiles += libva-glx.pc
+endif
pkgconfigdir = @pkgconfigdir@
pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = libva.pc.in libva-x11.pc.in
+EXTRA_DIST = libva.pc.in libva-x11.pc.in libva-glx.pc.in
CLEANFILES = $(pcfiles)
diff --git a/configure.ac b/configure.ac
index 95cf992..86366e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,11 @@ LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION -release $LIBVA_VERSION.$LIBVA
AC_SUBST(LIBVA_LT_VERSION)
AC_SUBST(LIBVA_LT_LDFLAGS)
+AC_ARG_ENABLE(glx,
+ [AC_HELP_STRING([--enable-glx],
+ [build with OpenGL for X11 support])],
+ [], [enable_glx=yes])
+
AC_ARG_ENABLE(dummy-driver,
[AC_HELP_STRING([--enable-dummy-driver],
[build dummy video driver])],
@@ -130,6 +135,22 @@ fi
AC_DEFINE_UNQUOTED([ATTRIBUTE_HIDDEN], [$ATTRIBUTE_HIDDEN],
[Defined to __attribute__((visibility("hidden"))) when available])
+# Check for OpenGL (X11)
+USE_GLX="no"
+GL_DEPS_CFLAGS=""
+GL_DEPS_LIBS=""
+if test x$enable_glx = xyes; then
+ AC_CHECK_HEADERS([GL/gl.h])
+ AC_CHECK_HEADERS([GL/glx.h])
+ AC_CHECK_LIB(GL, glXCreateContext, [
+ USE_GLX="yes"
+ GL_DEPS_LIBS="-lX11 -lGL"
+ ])
+fi
+AC_SUBST(GL_DEPS_CFLAGS)
+AC_SUBST(GL_DEPS_LIBS)
+AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
+
# We only need the headers, we don't link against the DRM libraries
LIBVA_CFLAGS="$DRM_CFLAGS"
AC_SUBST(LIBVA_CFLAGS)
@@ -149,6 +170,7 @@ AC_OUTPUT([
va/Makefile
va/va_version.h
va/x11/Makefile
+ va/glx/Makefile
dummy_drv_video/Makefile
i965_drv_video/Makefile
i965_drv_video/shaders/Makefile
@@ -162,5 +184,6 @@ AC_OUTPUT([
test/encode/Makefile
libva.pc
libva-x11.pc
+ libva-glx.pc
])
diff --git a/libva-glx.pc.in b/libva-glx.pc.in
new file mode 100644
index 0000000..2019915
--- /dev/null
+++ b/libva-glx.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+display=glx
+
+Name: libva-${display}
+Description: Userspace Video Acceleration (VA) ${display} interface
+Requires: libva
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lva-${display}
+Cflags: -I${includedir}
diff --git a/va/Makefile.am b/va/Makefile.am
index 99f6bbf..ebff3d5 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -27,9 +27,17 @@ INCLUDES = \
LDADD = \
$(LIBVA_LT_LDFLAGS)
-lib_LTLIBRARIES = \
- libva.la \
- libva-x11.la
+libva_x11_backend = libva-x11.la
+libva_x11_backenddir = x11
+if USE_GLX
+libva_glx_backend = libva-glx.la
+libva_glx_backenddir = glx
+else
+libva_glx_backend =
+libva_glx_backenddir =
+endif
+
+lib_LTLIBRARIES = libva.la $(libva_x11_backend) $(libva_glx_backend)
libva_ladir = $(libdir)
libva_la_LDFLAGS = $(LDADD) -no-undefined
@@ -40,7 +48,14 @@ libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS
libva_x11_la_LDFLAGS = $(LDADD)
libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
-SUBDIRS = x11
+libva_glx_la_SOURCES =
+libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl
+libva_glx_la_LDFLAGS = $(LDADD)
+libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la
+
+SUBDIRS = $(libva_x11_backenddir) $(libva_glx_backenddir)
+
+DIST_SUBDIRS = x11 glx
libva_la_SOURCES = va.c va_crystalhd.c
diff --git a/va/glx/Makefile.am b/va/glx/Makefile.am
new file mode 100644
index 0000000..337f34e
diff --git a/va/glx/va_backend_glx.h b/va/glx/va_backend_glx.h
new file mode 100644
index 0000000..d110485
diff --git a/va/glx/va_glx.c b/va/glx/va_glx.c
new file mode 100644
index 0000000..ec50a0e
diff --git a/va/glx/va_glx.h b/va/glx/va_glx.h
new file mode 100644
index 0000000..1a0624d
diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c
new file mode 100644
index 0000000..b0f24bb
diff --git a/va/glx/va_glx_impl.h b/va/glx/va_glx_impl.h
new file mode 100644
index 0000000..977bfcc
diff --git a/va/glx/va_glx_private.h b/va/glx/va_glx_private.h
new file mode 100644
index 0000000..d416729
diff --git a/va/va_backend.h b/va/va_backend.h
index ff86744..06fef7f 100644
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -365,6 +365,9 @@ struct VADriverVTable
unsigned int *chroma_v_offset,
void **buffer
);
+
+ /* Optional: GLX support hooks */
+ struct VADriverVTableGLX *glx;
};
struct VADriverContext
@@ -387,6 +390,7 @@ struct VADriverContext
void *handle; /* dlopen handle */
void *dri_state;
+ void *glx; /* opaque for GLX code */
};
#define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */
@@ -409,6 +413,8 @@ struct VADisplayContext
VADisplayContextP ctx,
char **driver_name
);
+
+ void *opaque; /* opaque for display extensions (e.g. GLX) */
};
typedef VAStatus (*VADriverInit) (
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 71cc36f..6826b31 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -217,6 +217,7 @@ VADisplay vaGetDisplay (
pDisplayContext->vaIsValid = va_DisplayContextIsValid;
pDisplayContext->vaDestroy = va_DisplayContextDestroy;
pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
+ pDisplayContext->opaque = NULL;
pDisplayContexts = pDisplayContext;
pDriverContext->dri_state = dri_state;
dpy = (VADisplay)pDisplayContext;

1630
packages/multimedia/libva/patches/322_libva_glx.diff
View File

File diff suppressed because it is too large Load Diff

143
packages/multimedia/libva/patches/390_compat.base.diff
View File

@ -1,143 +0,0 @@
commit 94db34ae392a7787afac9087799bb0421c844b83
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Wed Jun 24 11:40:56 2009 +0000
Add compatibility layer with original VA-API 0.29 to 0.31.
diff --git a/va/Makefile.am b/va/Makefile.am
index ebff3d5..1752526 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -57,7 +57,7 @@ SUBDIRS = $(libva_x11_backenddir) $(libva_glx_backenddir)
DIST_SUBDIRS = x11 glx
-libva_la_SOURCES = va.c va_crystalhd.c
+libva_la_SOURCES = va.c va_crystalhd.c va_compat.c
libvaincludedir = ${includedir}/va
libvainclude_HEADERS = va.h va_x11.h va_backend.h va_version.h
@@ -67,4 +67,8 @@ DISTCLEANFILES = \
EXTRA_DIST = \
va_version.h.in \
- va_crystalhd.h
+ va_crystalhd.h \
+ va_compat.h \
+ va_compat_template.h
+
+va_compat.c: va_compat_template.h
diff --git a/va/va.c b/va/va.c
index 0d208d8..ad201fa 100644
--- a/va/va.c
+++ b/va/va.c
@@ -28,6 +28,7 @@
#include "va.h"
#include "va_backend.h"
#include "va_crystalhd.h"
+#include "va_compat.h"
#include <assert.h>
#include <stdarg.h>
@@ -39,6 +40,8 @@
#define DRIVER_INIT_FUNC "__vaDriverInit_0_31"
+#define DRIVER_INIT_FUNC_0_29 "__vaDriverInit_0_29"
+#define DRIVER_INIT_FUNC_0_30 "__vaDriverInit_0_30"
#define DRIVER_EXTENSION "_drv_video.so"
@@ -163,13 +166,24 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
{
VADriverInit init_func;
char driver_init_func_sds[32];
+ int compat_version = 0;
/* First, try SDS extensions (VDPAU and XvBA backends) */
sprintf(driver_init_func_sds, "%s_%d_sds%d",
DRIVER_INIT_FUNC, VA_MICRO_VERSION, VA_SDS_VERSION);
init_func = (VADriverInit) dlsym(handle, driver_init_func_sds);
if (!init_func)
{
+ /* Otherwise, we need the compatibility layer for some buffers */
init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC);
+ compat_version = VA_MINOR_VERSION;
+ if (!init_func) {
+ init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC_0_29);
+ compat_version = 29;
+ }
+ if (!init_func) {
+ init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC_0_30);
+ compat_version = 30;
+ }
}
if (!init_func)
{
@@ -178,7 +192,36 @@ static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
}
else
{
- vaStatus = (*init_func)(ctx);
+ struct VADriverContext_0_29 ctx_0_29;
+ struct VADriverContext_0_30 ctx_0_30;
+ void *compat_ctx = NULL;
+
+ switch (compat_version) {
+ case 29:
+ compat_ctx = &ctx_0_29;
+ ctx_0_29.pDriverData = NULL;
+ ctx_0_29.x11_dpy = ctx->x11_dpy;
+ ctx_0_29.x11_screen = ctx->x11_screen;
+ break;
+ case 30:
+ compat_ctx = &ctx_0_30;
+ ctx_0_30.pDriverData = NULL;
+ ctx_0_30.x11_dpy = ctx->x11_dpy;
+ ctx_0_30.x11_screen = ctx->x11_screen;
+ break;
+ case VA_MINOR_VERSION:
+ compat_ctx = ctx;
+ break;
+ default:
+ ASSERT(compat_version == 0);
+ vaStatus = VA_STATUS_ERROR_UNKNOWN;
+ break;
+ }
+
+ vaStatus = (*init_func)(compat_ctx ? compat_ctx : ctx);
+
+ if (VA_STATUS_SUCCESS == vaStatus)
+ vaStatus = va_compat_init(dpy, compat_version, compat_ctx);
if (VA_STATUS_SUCCESS == vaStatus)
{
@@ -399,6 +442,8 @@ VAStatus vaTerminate (
old_ctx->handle = NULL;
}
+ va_compat_fini(dpy);
+
if (VA_STATUS_SUCCESS == vaStatus)
pDisplayContext->vaDestroy(pDisplayContext);
return vaStatus;
diff --git a/va/va_backend.h b/va/va_backend.h
index 06fef7f..9cf8911 100644
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -391,6 +391,7 @@ struct VADriverContext
void *dri_state;
void *glx; /* opaque for GLX code */
+ void *compat; /* opaque for compat code */
};
#define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */
diff --git a/va/va_compat.c b/va/va_compat.c
new file mode 100644
index 0000000..af43188
diff --git a/va/va_compat.h b/va/va_compat.h
new file mode 100644
index 0000000..2c9d801
diff --git a/va/va_compat_template.h b/va/va_compat_template.h
new file mode 100644
index 0000000..18349de

3220
packages/multimedia/libva/patches/391_compat.diff
View File

File diff suppressed because it is too large Load Diff

183
packages/multimedia/libva/patches/392_compat.dso.diff
View File

@ -1,183 +0,0 @@
commit 23dc87f7a37ea245e9797b947df6fbd3c911dd76
Author: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Fri Oct 16 12:39:06 2009 +0000
Fix compatibility with older programs linked against libva.so.0.
diff --git a/va/Makefile.am b/va/Makefile.am
index 1752526..f92ba8a 100644
--- a/va/Makefile.am
+++ b/va/Makefile.am
@@ -72,3 +72,8 @@ EXTRA_DIST = \
va_compat_template.h
va_compat.c: va_compat_template.h
+
+lib_LTLIBRARIES += libva-compat.la
+libva_compat_la_SOURCES = va_compat_lib.c
+libva_compat_la_LIBADD = libva-x11.la -ldl
+libva_compat_la_DEPENDENCIES = libva-x11.la
diff --git a/va/va_compat_lib.c b/va/va_compat_lib.c
new file mode 100644
index 0000000..b7e9ea5
--- /dev/null
+++ b/va/va_compat_lib.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include <dlfcn.h>
+#include <assert.h>
+#include <stddef.h>
+
+typedef void *VADisplay;
+typedef int VAStatus;
+typedef unsigned int VAGenericID;
+typedef VAGenericID VAContextID;
+typedef VAGenericID VASurfaceID;
+typedef VAGenericID VAImageID;
+typedef VAGenericID VASubpictureID;
+
+#define PREPARE_FUNC(NAME, RET, ARGS) \
+ static RET (*lib_##NAME) ARGS; \
+ if (lib_##NAME == NULL) \
+ lib_##NAME = dlsym(RTLD_NEXT, #NAME); \
+ assert(lib_##NAME != NULL)
+
+VAStatus
+vaSyncSurface(
+ VADisplay dpy,
+ VAContextID context,
+ VASurfaceID render_target
+)
+{
+ PREPARE_FUNC(vaSyncSurface, VAStatus, (VADisplay, VASurfaceID));
+
+ return lib_vaSyncSurface(dpy, render_target);
+}
+
+VAStatus
+vaPutImage(
+ VADisplay dpy,
+ VASurfaceID surface,
+ VAImageID image,
+ int src_x,
+ int src_y,
+ unsigned int width,
+ unsigned int height,
+ int dest_x,
+ int dest_y
+)
+{
+ PREPARE_FUNC(vaPutImage, VAStatus, (VADisplay, VASurfaceID, VAImageID,
+ int, int, unsigned int, unsigned int,
+ int, int, unsigned int, unsigned int));
+
+ return lib_vaPutImage(dpy, surface, image,
+ src_x, src_y, width, height,
+ dest_x, dest_y, width, height);
+}
+
+VAStatus
+vaPutImage2(
+ VADisplay dpy,
+ VASurfaceID surface,
+ VAImageID image,
+ int src_x,
+ int src_y,
+ unsigned int src_width,
+ unsigned int src_height,
+ int dest_x,
+ int dest_y,
+ unsigned int dest_width,
+ unsigned int dest_height
+)
+{
+ PREPARE_FUNC(vaPutImage, VAStatus, (VADisplay, VASurfaceID, VAImageID,
+ int, int, unsigned int, unsigned int,
+ int, int, unsigned int, unsigned int));
+
+ return lib_vaPutImage(dpy, surface, image,
+ src_x, src_y, src_width, src_height,
+ dest_x, dest_y, dest_width, dest_height);
+}
+
+VAStatus
+vaAssociateSubpicture(
+ VADisplay dpy,
+ VASubpictureID subpicture,
+ VASurfaceID *target_surfaces,
+ int num_surfaces,
+ short src_x,
+ short src_y,
+ short dest_x,
+ short dest_y,
+ unsigned short width,
+ unsigned short height,
+ unsigned int flags
+)
+{
+ PREPARE_FUNC(vaAssociateSubpicture,
+ VAStatus, (VADisplay, VASubpictureID, VASurfaceID *, int,
+ short, short, unsigned short, unsigned short,
+ short, short, unsigned short, unsigned short,
+ unsigned int));
+
+ return lib_vaAssociateSubpicture(dpy, subpicture,
+ target_surfaces, num_surfaces,
+ src_x, src_y, width, height,
+ dest_x, dest_y, width, height,
+ flags);
+}
+
+VAStatus
+vaAssociateSubpicture2(
+ VADisplay dpy,
+ VASubpictureID subpicture,
+ VASurfaceID *target_surfaces,
+ int num_surfaces,
+ short src_x,
+ short src_y,
+ unsigned short src_width,
+ unsigned short src_height,
+ short dest_x,
+ short dest_y,
+ unsigned short dest_width,
+ unsigned short dest_height,
+ unsigned int flags
+)
+{
+ PREPARE_FUNC(vaAssociateSubpicture,
+ VAStatus, (VADisplay, VASubpictureID, VASurfaceID *, int,
+ short, short, unsigned short, unsigned short,
+ short, short, unsigned short, unsigned short,
+ unsigned int));
+
+ return lib_vaAssociateSubpicture(dpy, subpicture,
+ target_surfaces, num_surfaces,
+ src_x, src_y, src_width, src_height,
+ dest_x, dest_y, dest_width, dest_height,
+ flags);
+}

47
packages/multimedia/libva/patches/x11-libs_libva_files_libva-dont-install-tests.diff
View File

@ -1,47 +0,0 @@
Don't install some useeless tests programs
--- libva-0.31.0/test/basic/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500
+++ libva-0.31.0/test/basic/Makefile.am 2010-03-10 13:36:50.449834525 -0500
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
+check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
test_07 test_08 test_09 test_10 test_11
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
--- libva-0.31.0/test/decode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500
+++ libva-0.31.0/test/decode/Makefile.am 2010-03-10 13:37:09.636843464 -0500
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = mpeg2vldemo
+check_PROGRAMS = mpeg2vldemo
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
--- libva-0.31.0/test/encode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500
+++ libva-0.31.0/test/encode/Makefile.am 2010-03-10 13:37:26.701846294 -0500
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = h264encode
+check_PROGRAMS = h264encode
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
--- libva-0.31.0/test/putsurface/Makefile.am~ 2010-03-10 13:18:55.270697040 -0500
+++ libva-0.31.0/test/putsurface/Makefile.am 2010-03-10 13:38:08.106713556 -0500
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = putsurface
+check_PROGRAMS = putsurface
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA