libva-intel-driver: update to libva-intel-driver-1.6.0.pre1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2015-06-04 11:55:58 +02:00
parent be756962a2
commit 3d1eea3cc6
4 changed files with 3 additions and 1282 deletions

View File

@ -17,12 +17,13 @@
################################################################################
PKG_NAME="libva-intel-driver"
PKG_VERSION="1.5.1"
PKG_VERSION="1.6.0.pre1"
PKG_REV="1"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
PKG_URL="http://www.freedesktop.org/software/vaapi/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
#PKG_URL="http://www.freedesktop.org/software/vaapi/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://www.freedesktop.org/software/vaapi/testing/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain libva libdrm"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"

View File

@ -1,73 +0,0 @@
From 545888beaa727d588c78422161a43355898cc908 Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Mon, 23 Mar 2015 09:41:52 +0800
Subject: [PATCH] VPP: Make sure the store buffer is allocated
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---
src/i965_post_processing.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index 2c01e43..f5bf89c 100755
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -1294,25 +1294,32 @@ pp_dndi_context_ensure_surfaces_storage(VADriverContextP ctx,
VASurfaceID new_surface;
unsigned int width, height;
- if (dndi_ctx->frame_store[i].obj_surface)
+ if (dndi_ctx->frame_store[i].obj_surface &&
+ dndi_ctx->frame_store[i].obj_surface->bo)
continue; // user allocated surface, not VPP internal
- if (i <= DNDI_FRAME_IN_STMM) {
- width = src_surface->orig_width;
- height = src_surface->orig_height;
- }
- else {
- width = dst_surface->orig_width;
- height = dst_surface->orig_height;
- }
+ if (dndi_ctx->frame_store[i].obj_surface) {
+ obj_surface = dndi_ctx->frame_store[i].obj_surface;
+ dndi_ctx->frame_store[i].is_scratch_surface = 0;
+ } else {
+ if (i <= DNDI_FRAME_IN_STMM) {
+ width = src_surface->orig_width;
+ height = src_surface->orig_height;
+ }
+ else {
+ width = dst_surface->orig_width;
+ height = dst_surface->orig_height;
+ }
- status = i965_CreateSurfaces(ctx, width, height, VA_RT_FORMAT_YUV420,
- 1, &new_surface);
- if (status != VA_STATUS_SUCCESS)
- return status;
+ status = i965_CreateSurfaces(ctx, width, height, VA_RT_FORMAT_YUV420,
+ 1, &new_surface);
+ if (status != VA_STATUS_SUCCESS)
+ return status;
- obj_surface = SURFACE(new_surface);
- assert(obj_surface != NULL);
+ obj_surface = SURFACE(new_surface);
+ assert(obj_surface != NULL);
+ dndi_ctx->frame_store[i].is_scratch_surface = 1;
+ }
if (i <= DNDI_FRAME_IN_PREVIOUS) {
status = i965_check_alloc_surface_bo(ctx, obj_surface,
@@ -1330,7 +1337,6 @@ pp_dndi_context_ensure_surfaces_storage(VADriverContextP ctx,
return status;
dndi_ctx->frame_store[i].obj_surface = obj_surface;
- dndi_ctx->frame_store[i].is_scratch_surface = 1;
}
return VA_STATUS_SUCCESS;
}
--
1.7.9.5

View File

@ -1,39 +0,0 @@
From: Andy Furniss <adf.lists at gmail.com>
Signed-off-by: Andy Furniss <adf.lists at gmail.com>
---
src/i965_post_processing.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index fefc5d7..edee114 100755
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -3423,11 +3423,7 @@ pp_nv12_dndi_initialize(VADriverContextP ctx, struct i965_post_processing_contex
obj_surface->orig_width, obj_surface->orig_height, obj_surface->width,
I965_SURFACEFORMAT_R8_UNORM, 20, 1);
- /* If we are in "First Frame" mode, i.e. past frames are not
- available for motion measure, then don't use the TFF flag */
- dndi_top_first = !(deint_params->flags & (dndi_ctx->is_first_frame ?
- VA_DEINTERLACING_BOTTOM_FIELD :
- VA_DEINTERLACING_BOTTOM_FIELD_FIRST));
+ dndi_top_first = !(deint_params->flags & VA_DEINTERLACING_BOTTOM_FIELD);
/* sampler dndi */
dri_bo_map(pp_context->sampler_state_table.bo, True);
@@ -3833,11 +3829,7 @@ gen7_pp_nv12_dndi_initialize(VADriverContextP ctx, struct i965_post_processing_c
obj_surface->orig_width, obj_surface->orig_height, obj_surface->width,
I965_SURFACEFORMAT_R8_UNORM, 33, 1);
- /* If we are in "First Frame" mode, i.e. past frames are not
- available for motion measure, then don't use the TFF flag */
- dndi_top_first = !(deint_params->flags & (dndi_ctx->is_first_frame ?
- VA_DEINTERLACING_BOTTOM_FIELD :
- VA_DEINTERLACING_BOTTOM_FIELD_FIRST));
+ dndi_top_first = !(deint_params->flags & VA_DEINTERLACING_BOTTOM_FIELD);
/* sampler dndi */
dri_bo_map(pp_context->sampler_state_table.bo, True);
--
1.7.9.5