libva 1.8.1

[android-x86/hardware-intel-common-libva.git] / va / va_tpi.c

diff --git a/va/va_tpi.c b/va/va_tpi.c
index f375656..21d547d 100644 (file)
--- a/va/va_tpi.c
+++ b/va/va_tpi.c
@@ -23,10 +23,10 @@
  */
 
 #define _GNU_SOURCE 1
+#include "sysdeps.h"
 #include "va.h"
 #include "va_backend.h"
 #include "va_backend_tpi.h"
-#include "config.h"
 
 #include <assert.h>
 #include <stdarg.h>
@@ -39,79 +39,36 @@
 #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;
-    return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext);
-}
-
-/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
- * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
- * of the frame, and to determine if the frame can be wrapped as a VA surface
- *
- * Application should make sure the frame is idle before the frame is passed into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from CI stack
+/*
+ * Create surfaces with special inputs/requirements
  */
-VAStatus vaCreateSurfaceFromCIFrame (
-    VADisplay dpy,
-    unsigned long frame_id,
-    VASurfaceID *surface       /* out */
+VAStatus vaCreateSurfacesWithAttribute (
+        VADisplay dpy,
+        int width,
+        int height,
+        int format,
+        int num_surfaces,
+        VASurfaceID *surfaces,       /* out */
+        VASurfaceAttributeTPI *attribute_tpi
 )
 {
   VADriverContextP ctx;
   struct VADriverVTableTPI *tpi;
   CHECK_DISPLAY(dpy);
   ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaCreateSurfaceFromCIFrame) {
-      return tpi->vaCreateSurfaceFromCIFrame( ctx, frame_id, surface );
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-  
-}
 
-/* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
- * can share the data without copy
- * The VA driver should query the camera device from v4l2_fd to see
- * if camera device memory/buffer can be wrapped into a VA surface
- * Buffer information is passed in by v4l2_fmt and v4l2_buf structure,
- * VA driver also needs do further check if the buffer can meet encode
- * hardware requirement, such as dimension, fourcc, stride, etc
- *
- * Application should make sure the buffer is idle before the frame into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from V4L2 stack
- */
-VAStatus vaCreateSurfaceFromV4L2Buf(
-    VADisplay dpy,
-    int v4l2_fd,         /* file descriptor of V4L2 device */
-    struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
-    struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
-    VASurfaceID *surface              /* out */
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaCreateSurfaceFromV4L2Buf) {
-      return tpi->vaCreateSurfaceFromV4L2Buf( ctx, v4l2_fd, v4l2_fmt, v4l2_buf, surface );
+  tpi = (struct VADriverVTableTPI *)ctx->vtable_tpi;
+  if (tpi && tpi->vaCreateSurfacesWithAttribute) {
+      return tpi->vaCreateSurfacesWithAttribute( ctx, width, height, format, num_surfaces, surfaces, attribute_tpi);
   } else
       return VA_STATUS_ERROR_UNIMPLEMENTED;
 }
 
+
 VAStatus vaPutSurfaceBuf (
     VADisplay dpy,
     VASurfaceID surface,
-    Drawable draw, /* Android Surface/Window */
     unsigned char* data,
     int* data_len,
     short srcx,
@@ -134,8 +91,8 @@ 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,
-                                      destx, desty, destw, desth, cliprects, number_cliprects, flags );
+      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;
 }