Commit e734b66e authored by Ren Zhaohan's avatar Ren Zhaohan

remove Drawable paramater of vaPutSurfaceBuf

parent c6fc410a
...@@ -54,7 +54,6 @@ struct VADriverVTableTPI ...@@ -54,7 +54,6 @@ struct VADriverVTableTPI
VAStatus (*vaPutSurfaceBuf) ( VAStatus (*vaPutSurfaceBuf) (
VADisplay dpy, VADisplay dpy,
VASurfaceID surface, VASurfaceID surface,
unsigned int draw, /* Android Surface/Window */
unsigned char* data, unsigned char* data,
int* data_len, int* data_len,
short srcx, short srcx,
......
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; } #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
#ifdef ANDROID
#define Drawable unsigned int
#endif
static int vaDisplayIsValid (VADisplay dpy) static int vaDisplayIsValid (VADisplay dpy)
{ {
VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
...@@ -111,7 +107,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf( ...@@ -111,7 +107,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf(
VAStatus vaPutSurfaceBuf ( VAStatus vaPutSurfaceBuf (
VADisplay dpy, VADisplay dpy,
VASurfaceID surface, VASurfaceID surface,
Drawable draw, /* Android Surface/Window */
unsigned char* data, unsigned char* data,
int* data_len, int* data_len,
short srcx, short srcx,
...@@ -134,7 +129,7 @@ VAStatus vaPutSurfaceBuf ( ...@@ -134,7 +129,7 @@ VAStatus vaPutSurfaceBuf (
tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi; tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
if (tpi && tpi->vaPutSurfaceBuf) { if (tpi && tpi->vaPutSurfaceBuf) {
return tpi->vaPutSurfaceBuf( ctx, surface, draw, data, data_len, srcx, srcy, srcw, srch, return tpi->vaPutSurfaceBuf( ctx, surface, data, data_len, srcx, srcy, srcw, srch,
destx, desty, destw, desth, cliprects, number_cliprects, flags ); destx, desty, destw, desth, cliprects, number_cliprects, flags );
} else } else
return VA_STATUS_ERROR_UNIMPLEMENTED; return VA_STATUS_ERROR_UNIMPLEMENTED;
......
...@@ -30,14 +30,12 @@ ...@@ -30,14 +30,12 @@
* and also a vaSyncSurface should be called before application tries to access the frame * and also a vaSyncSurface should be called before application tries to access the frame
* from CI stack * from CI stack
*/ */
#include <va/va.h>
#ifdef ANDROID #ifdef __cplusplus
#define Drawable unsigned int extern "C" {
#else
#include <X11/Xlib.h>
#endif #endif
#include <va/va.h>
VAStatus vaCreateSurfaceFromCIFrame ( VAStatus vaCreateSurfaceFromCIFrame (
VADisplay dpy, VADisplay dpy,
unsigned long frame_id, unsigned long frame_id,
...@@ -55,7 +53,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf( ...@@ -55,7 +53,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf(
VAStatus vaPutSurfaceBuf ( VAStatus vaPutSurfaceBuf (
VADisplay dpy, VADisplay dpy,
VASurfaceID surface, VASurfaceID surface,
Drawable draw, /* Android Surface/Window */
unsigned char* data, unsigned char* data,
int* data_len, int* data_len,
short srcx, short srcx,
...@@ -70,3 +67,7 @@ VAStatus vaPutSurfaceBuf ( ...@@ -70,3 +67,7 @@ VAStatus vaPutSurfaceBuf (
unsigned int number_cliprects, /* number of clip rects in the clip list */ unsigned int number_cliprects, /* number of clip rects in the clip list */
unsigned int flags /* de-interlacing flags */ unsigned int flags /* de-interlacing flags */
); );
#ifdef __cplusplus
}
#endif
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