commit b0cb52d5d82f740efcfa201f9b66d19302d66679
author Austin Yuan <shengquan.yuan@intel.com> Mon Feb 16 08:42:14 2009 -0500
committer Austin Yuan <shengquan.yuan@intel.com> Mon Feb 16 08:42:14 2009 -0500
tree d225b41929449f00b8fb8090f92e8f9e57793c20
parent ad7f7f2b72da6e5b632ebed6878e84d7c3527beb
parent 363989ecbaf75829686218091c8d3d9703fa5e6c

Merge branch 'master' of ssh://git@moblin-mdi.jf.intel.com/umg-moorestown-libva

src/va.c

diff --git a/src/va.c b/src/va.c
index a38248e..1f6b1fe 100644
--- a/src/va.c
+++ b/src/va.c
@@ -1267,13 +1267,19 @@
   return ctx->vtable.vaDbgCopySurfaceToBuffer( ctx, surface, buffer, stride );
 }
 
-
-VAStatus vaDbgCreateSurfaceFromUB(
+#warning TODO: Remove vaDbgCreateSurfaceFromMrstV4L2Buf in rev 0.29
+VAStatus vaDbgCreateSurfaceFromMrstV4L2Buf(
     VADisplay dpy,
     unsigned int width,
     unsigned int height,
     unsigned int size,
-    void *start,
+    unsigned int fourcc,
+    unsigned int luma_stride,
+    unsigned int chroma_u_stride,
+    unsigned int chroma_v_stride,
+    unsigned int luma_offset,
+    unsigned int chroma_u_offset,
+    unsigned int chroma_v_offset,
     VASurfaceID *surface	/* out */
 )
 {
@@ -1281,7 +1287,7 @@
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
 
-  TRACE(vaDbgCreateSurfaceFromUB);
-  return ctx->vtable.vaDbgCreateSurfaceFromUB( ctx, width, height, size, start, surface );
+  TRACE(vtable.vaDbgCreateSurfaceFromMrstV4L2Buf);
+  return ctx->vtable.vaDbgCreateSurfaceFromMrstV4L2Buf( ctx, width, height, size, fourcc, luma_stride, chroma_u_stride, chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset, surface );
 }
 

src/va_backend.h

diff --git a/src/va_backend.h b/src/va_backend.h
index 7411eac..7f1f6a2 100755
--- a/src/va_backend.h
+++ b/src/va_backend.h
@@ -393,12 +393,18 @@
 		void **buffer, /* out */
 		unsigned int *stride /* out */
 	);
-        VAStatus (*vaDbgCreateSurfaceFromUB) (
+        VAStatus (*vaDbgCreateSurfaceFromMrstV4L2Buf) (
 		VADriverContextP ctx,
                 unsigned int width,
                 unsigned int height,
                 unsigned int size,
-                void *start,
+                unsigned int fourcc,
+                unsigned int luma_stride,
+                unsigned int chroma_u_stride,
+                unsigned int chroma_v_stride,
+                unsigned int luma_offset,
+                unsigned int chroma_u_offset,
+                unsigned int chroma_v_offset,
                 VASurfaceID *surface	/* out */
         );
 };