update NEWS for libva 2.4.0

[android-x86/hardware-intel-common-libva.git] / va / va_android.h

diff --git a/va/va_android.h b/va/va_android.h
index 08844f4..bf017e5 100644 (file)
--- a/va/va_android.h
+++ b/va/va_android.h
@@ -1,8 +1,36 @@
+/*
+ * Copyright (c) 2012 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 #ifndef _VA_ANDROID_H_
 #define _VA_ANDROID_H_
 
 #include <va/va.h>
 
+/** \brief Android Gralloc buffer memory type. */
+#define VA_SURFACE_ATTRIB_MEM_TYPE_ANDROID_GRALLOC     0x00100000
+/** \brief Android ION buffer memory type. */
+#define VA_SURFACE_ATTRIB_MEM_TYPE_ANDROID_ION         0x00200000
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -18,37 +46,4 @@ VADisplay vaGetDisplay (
 }
 #endif
 
-#ifdef __cplusplus
-#ifdef ANDROID    
-#include <ui/ISurface.h>
-using namespace android;
-
-/*
- * Output rendering
- * Following is the rendering interface for Android system, 
- * to get the decode output surface to an ISurface object.
- * It basically performs a de-interlacing (if needed), 
- * color space conversion and scaling to the destination
- * rectangle
- */
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,       
-    sp<ISurface> draw, /* Android Window/Surface */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied destination clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* PutSurface flags */
-);
-
-#endif /* ANDROID */
-#endif /* __cplusplus */
-
 #endif /* _VA_ANDROID_H_ */