diff options
| author | Ren Zhaohan <zhaohan.ren@intel.com> | 2010-05-12 14:16:37 +0800 |
|---|---|---|
| committer | Ren Zhaohan <zhaohan.ren@intel.com> | 2010-05-12 14:16:37 +0800 |
| commit | e734b66e657d92dbd29b216fc753d0c30c7df4f0 (patch) | |
| tree | 7faeae624751ca44a143235b53e02a7c51caa3a0 /va | |
| parent | c6fc410af1e24d2e8fcebe342fd9c2a964d504e9 (diff) | |
remove Drawable paramater of vaPutSurfaceBuf
Diffstat (limited to 'va')
| -rw-r--r-- | va/va_backend_tpi.h | 1 | ||||
| -rw-r--r-- | va/va_tpi.c | 7 | ||||
| -rw-r--r-- | va/va_tpi.h | 13 |
3 files changed, 8 insertions, 13 deletions
diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h index f4417d2..2f40e5a 100644 --- a/va/va_backend_tpi.h +++ b/va/va_backend_tpi.h @@ -54,7 +54,6 @@ struct VADriverVTableTPI VAStatus (*vaPutSurfaceBuf) ( VADisplay dpy, VASurfaceID surface, - unsigned int draw, /* Android Surface/Window */ unsigned char* data, int* data_len, short srcx, diff --git a/va/va_tpi.c b/va/va_tpi.c index f375656..dda28e5 100644 --- a/va/va_tpi.c +++ b/va/va_tpi.c @@ -39,10 +39,6 @@ #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext) #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) { VADisplayContextP pDisplayContext = (VADisplayContextP)dpy; @@ -111,7 +107,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf( VAStatus vaPutSurfaceBuf ( VADisplay dpy, VASurfaceID surface, - Drawable draw, /* Android Surface/Window */ unsigned char* data, int* data_len, short srcx, @@ -134,7 +129,7 @@ VAStatus vaPutSurfaceBuf ( tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi; 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 ); } else return VA_STATUS_ERROR_UNIMPLEMENTED; diff --git a/va/va_tpi.h b/va/va_tpi.h index 632639a..1fe4b8d 100644 --- a/va/va_tpi.h +++ b/va/va_tpi.h @@ -30,14 +30,12 @@ * and also a vaSyncSurface should be called before application tries to access the frame * from CI stack */ +#include <va/va.h> -#ifdef ANDROID -#define Drawable unsigned int -#else -#include <X11/Xlib.h> +#ifdef __cplusplus +extern "C" { #endif -#include <va/va.h> VAStatus vaCreateSurfaceFromCIFrame ( VADisplay dpy, unsigned long frame_id, @@ -55,7 +53,6 @@ VAStatus vaCreateSurfaceFromV4L2Buf( VAStatus vaPutSurfaceBuf ( VADisplay dpy, VASurfaceID surface, - Drawable draw, /* Android Surface/Window */ unsigned char* data, int* data_len, short srcx, @@ -70,3 +67,7 @@ VAStatus vaPutSurfaceBuf ( unsigned int number_cliprects, /* number of clip rects in the clip list */ unsigned int flags /* de-interlacing flags */ ); + +#ifdef __cplusplus +} +#endif |