Merge pull request #1910 from itechatmxc/master

Patches to libva and libva-intel driver to solve issues with some h.264 videos
This commit is contained in:
Stephan Raue 2013-02-14 16:29:42 -08:00
commit c33c171d68
2 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,23 @@
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 5b36c8d..2967347 100755
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -194,7 +194,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
if (gen7_avc_surface->dmv_top == NULL) {
gen7_avc_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr,
"direct mv w/r buffer",
- width_in_mbs * height_in_mbs * 64,
+ width_in_mbs * (height_in_mbs + 1) * 64,
0x1000);
assert(gen7_avc_surface->dmv_top);
}
@@ -203,7 +203,7 @@ gen7_mfd_init_avc_surface(VADriverContextP ctx,
gen7_avc_surface->dmv_bottom == NULL) {
gen7_avc_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr,
"direct mv w/r buffer",
- width_in_mbs * height_in_mbs * 64,
+ width_in_mbs * (height_in_mbs + 1) * 64,
0x1000);
assert(gen7_avc_surface->dmv_bottom);
}

View File

@ -0,0 +1,13 @@
diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c
index 049be09..72ec9a4 100644
--- a/va/glx/va_glx_impl.c
+++ b/va/glx/va_glx_impl.c
@@ -937,6 +937,7 @@ associate_surface(
return status;
x11_trap_errors();
+ status = ctx->vtable->vaSyncSurface(ctx, surface);
status = ctx->vtable->vaPutSurface(
ctx,
surface,