Commit 71b5fec1 authored by Austin Yuan's avatar Austin Yuan

refine vaCreateSurfaceFromMrstV4L2Buf to vaCreateSurfaceFromV4L2Buf to make it more generic

Signed-off-by: default avatarAustin Yuan <shengquan.yuan@intel.com>
parent 0068a944
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <dlfcn.h> #include <dlfcn.h>
#include <unistd.h> #include <unistd.h>
#include <linux/videodev2.h>
#define VA_STR_VERSION VA_BUILD_DATE VA_BUILD_GIT #define VA_STR_VERSION VA_BUILD_DATE VA_BUILD_GIT
#define VA_MAJOR_VERSION 0 #define VA_MAJOR_VERSION 0
...@@ -1242,18 +1244,11 @@ VAStatus vaCreateSurfaceFromCIFrame ( ...@@ -1242,18 +1244,11 @@ VAStatus vaCreateSurfaceFromCIFrame (
} }
VAStatus vaCreateSurfaceFromMrstV4L2Buf( VAStatus vaCreateSurfaceFromV4L2Buf(
VADisplay dpy, VADisplay dpy,
unsigned int width, int v4l2_fd, /* file descriptor of V4L2 device */
unsigned int height, struct v4l2_format *v4l2_fmt, /* format of V4L2 */
unsigned int size, struct v4l2_buffer *v4l2_buf, /* V4L2 buffer */
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 */ VASurfaceID *surface /* out */
) )
{ {
...@@ -1261,10 +1256,10 @@ VAStatus vaCreateSurfaceFromMrstV4L2Buf( ...@@ -1261,10 +1256,10 @@ VAStatus vaCreateSurfaceFromMrstV4L2Buf(
CHECK_DISPLAY(dpy); CHECK_DISPLAY(dpy);
ctx = CTX(dpy); ctx = CTX(dpy);
TRACE(vtable.vaCreateSurfaceFromMrstV4L2Buf); TRACE(vtable.vaCreateSurfaceFromV4L2Buf);
if (ctx->vtable.vaCreateSurfaceFromMrstV4L2Buf) if (ctx->vtable.vaCreateSurfaceFromV4L2Buf)
return ctx->vtable.vaCreateSurfaceFromMrstV4L2Buf( ctx, width, height, size, fourcc, luma_stride, chroma_u_stride, chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset, surface ); return ctx->vtable.vaCreateSurfaceFromV4L2Buf( ctx, v4l2_fd, v4l2_fmt, v4l2_buf, surface );
else else
return VA_STATUS_ERROR_UNKNOWN; return VA_STATUS_ERROR_UNKNOWN;
} }
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <linux/videodev2.h>
typedef struct VADriverContext *VADriverContextP; typedef struct VADriverContext *VADriverContextP;
...@@ -382,18 +383,11 @@ struct VADriverVTable ...@@ -382,18 +383,11 @@ struct VADriverVTable
); );
VAStatus (*vaCreateSurfaceFromMrstV4L2Buf) ( VAStatus (*vaCreateSurfaceFromV4L2Buf) (
VADriverContextP ctx, VADriverContextP ctx,
unsigned int width, int v4l2_fd, /* file descriptor of V4L2 device */
unsigned int height, struct v4l2_format *v4l2_fmt, /* format of V4L2 */
unsigned int size, struct v4l2_buffer *v4l2_buf, /* V4L2 buffer */
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 */ VASurfaceID *surface /* out */
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment