android: enable logging except the user build

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

diff --git a/va/va_android.h b/va/va_android.h
index de223fc..92bf1e0 100644 (file)
--- a/va/va_android.h
+++ b/va/va_android.h
@@ -1,16 +1,40 @@
+/*
+ * 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>
 
-#ifdef ANDROID    
-#include <ui/Surface.h>
-using namespace android;
-#endif
+/** \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
+
 /*
  * Returns a suitable VADisplay for VA API
  */
@@ -18,11 +42,20 @@ VADisplay vaGetDisplay (
     void *android_dpy
 );
 
-#ifdef ANDROID    
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+#ifdef ANDROID
+#include <system/window.h>
+#include <utils/StrongPointer.h>
+using namespace android;
+
 /*
  * Output rendering
- * Following is the rendering interface for X windows, 
- * to get the decode output surface to a X drawable
+ * 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
@@ -30,7 +63,7 @@ VADisplay vaGetDisplay (
 VAStatus vaPutSurface (
     VADisplay dpy,
     VASurfaceID surface,       
-    sp<Surface> draw, /* Android Window/Surface */
+    sp<ANativeWindow> draw, /* Android Native Window */
     short srcx,
     short srcy,
     unsigned short srcw,
@@ -43,9 +76,8 @@ VAStatus vaPutSurface (
     unsigned int number_cliprects, /* number of clip rects in the clip list */
     unsigned int flags /* PutSurface flags */
 );
-#endif
-    
-#ifdef __cplusplus
-}
-#endif
+
+#endif /* ANDROID */
+#endif /* __cplusplus */
+
 #endif /* _VA_ANDROID_H_ */