android: fix tests for Android ICS.
authorHaitao Huang <haitao.huang@intel.com>
Tue, 21 Aug 2012 18:26:26 +0000 (13:26 -0500)
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>
Thu, 27 Sep 2012 15:39:42 +0000 (17:39 +0200)
Change-Id: I478063713883fbb5fb1fac372dbc418b19ff7d2b
Signed-off-by: Haitao Huang <haitao.huang@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
test/Android.mk
test/android_winsys.cpp
test/decode/Android.mk
test/encode/Android.mk
test/putsurface/Android.mk
test/vainfo/Android.mk
test/vainfo/vainfo.c
va/Android.mk
va/sysdeps.h

index 7d60473..f3f122c 100644 (file)
@@ -1,4 +1,4 @@
 # Recursive call sub-folder Android.mk
 #
-# include $(call all-subdir-makefiles)
+ include $(call all-subdir-makefiles)
 
index 93489cd..3c6a245 100644 (file)
 #include <ui/DisplayInfo.h>
 
 namespace android {
-    class Test {
-        public:
-                static const sp<ISurface>& getISurface(const sp<Surface>& s) {
-                            return s->getISurface();
-                }
-    };
 };
 
 #define min(a,b) (a<b?a:b)
@@ -44,21 +38,14 @@ do {                                                                    \
     /*h = min(win_height, info.h);*/                                    \
     w = win_width, h = win_height;                                      \
                                                                         \
-    surface_ctrl = client->createSurface(getpid(), 0, w, h, PIXEL_FORMAT_RGB_565, ISurfaceComposer::ePushBuffers); \
+    surface_ctrl = client->createSurface(getpid(), 0, w, h, PIXEL_FORMAT_RGB_565); \
     android_surface = surface_ctrl->getSurface();                       \
-    android_isurface = Test::getISurface(android_surface);              \
                                                                         \
-    client->openTransaction();                                          \
+    client->openGlobalTransaction();                                          \
     surface_ctrl->setPosition(x, y);                                    \
-    client->closeTransaction();                                         \
-                                                                        \
-    client->openTransaction();                                          \
     surface_ctrl->setSize(w, h);                                        \
-    client->closeTransaction();                                         \
-                                                                        \
-    client->openTransaction();                                          \
     surface_ctrl->setLayer(0x100000);                                   \
-    client->closeTransaction();                                         \
+    client->closeGlobalTransaction();                                         \
 } while (0)
 
 
index e94b5d9..5eca804 100755 (executable)
@@ -15,14 +15,12 @@ LOCAL_CFLAGS += \
 
 LOCAL_C_INCLUDES += \
   $(LOCAL_PATH)/../common \
-  $(TARGET_OUT_HEADERS)/libva  \
-  $(TOPDIR)/hardware/intel/libva/va/   \
-  $(TARGET_OUT_HEADERS)/X11    
+  $(TARGET_OUT_HEADERS)/libva
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE :=        mpeg2vldemo
 
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libui libsurfaceflinger_client
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
 
 include $(BUILD_EXECUTABLE)
 
index 8b58aa2..d2f4514 100755 (executable)
@@ -6,28 +6,6 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-  h264encode_android.cpp       \
-  #h264encode_x11.c    \
-
-LOCAL_CFLAGS += \
-    -DANDROID
-
-LOCAL_C_INCLUDES += \
-  $(TARGET_OUT_HEADERS)/libva  \
-  $(TOPDIR)/hardware/intel/libva/va/   \
-  $(TARGET_OUT_HEADERS)/X11    
-
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE :=        h264encode
-
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libui libsurfaceflinger_client
-
-include $(BUILD_EXECUTABLE)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
        ../common/va_display.c                  \
        ../common/va_display_android.cpp        \
        avcenc.c
@@ -42,7 +20,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE :=        avcenc
 
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui libsurfaceflinger_client
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
 
 include $(BUILD_EXECUTABLE)
 
index 0b5d438..03edb61 100644 (file)
@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := putsurface
 
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libui libsurfaceflinger_client
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
 
 include $(BUILD_EXECUTABLE)
 
index 91ea526..6ad550d 100644 (file)
@@ -14,12 +14,13 @@ LOCAL_CFLAGS += \
   -DANDROID
 
 LOCAL_C_INCLUDES += \
-  $(TARGET_OUT_HEADERS)/libva
+  $(LOCAL_PATH)/../common \
+  $(LOCAL_PATH)/../.. \
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := vainfo
 
-LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils
+LOCAL_SHARED_LIBRARIES := libva-android libva libdl libdrm libcutils libutils libgui
 
 include $(BUILD_EXECUTABLE)
 
index 95e8531..7ef27bb 100644 (file)
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "va_display.h"
+#include "va/sysdeps.h"
 
 #define CHECK_VASTATUS(va_status,func, ret)                             \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
index b0f366c..381c04e 100755 (executable)
@@ -66,7 +66,7 @@ LOCAL_COPY_HEADERS := \
        va_enc.h \
        va_enc_h264.h \
        va_backend.h \
-       x11/va_dricommon.h \
+       va_drmcommon.h \
        va_vpp.h \
        va_backend_vpp.h
 
index 75c3c5d..786a4d0 100644 (file)
@@ -41,6 +41,9 @@
 # define True  1
 # define False 0
 
+/* Macros generated from configure */
+# define LIBVA_VERSION_S "1.2.0.pre1"
+
 /* Android logging utilities */
 # include <utils/Log.h>