diff options
| -rw-r--r-- | test/android_winsys.cpp | 19 | ||||
| -rwxr-xr-x | test/decode/Android.mk | 7 | ||||
| -rwxr-xr-x | test/encode/Android.mk | 17 | ||||
| -rw-r--r-- | test/putsurface/Android.mk | 2 | ||||
| -rw-r--r-- | test/vainfo/Android.mk | 6 | ||||
| -rw-r--r-- | test/vainfo/vainfo.c | 1 | ||||
| -rwxr-xr-x | va/Android.mk | 4 | ||||
| -rw-r--r-- | va/sysdeps.h | 3 |
8 files changed, 26 insertions, 33 deletions
diff --git a/test/android_winsys.cpp b/test/android_winsys.cpp index 93489cd..3c6a245 100644 --- a/test/android_winsys.cpp +++ b/test/android_winsys.cpp @@ -24,12 +24,6 @@ #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) diff --git a/test/decode/Android.mk b/test/decode/Android.mk index e94b5d9..d1053b7 100755 --- a/test/decode/Android.mk +++ b/test/decode/Android.mk @@ -14,15 +14,14 @@ LOCAL_CFLAGS += \ -DANDROID LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/../../va \ $(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) diff --git a/test/encode/Android.mk b/test/encode/Android.mk index acb6fac..9bc662a 100755 --- a/test/encode/Android.mk +++ b/test/encode/Android.mk @@ -6,21 +6,22 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - h264encode_android.cpp \ - #h264encode_x11.c \ + ../common/va_display.c \ + ../common/va_display_android.cpp \ + avcenc.c LOCAL_CFLAGS += \ - -DANDROID + -DANDROID LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva \ - $(TOPDIR)/hardware/intel/libva/va/ \ - $(TARGET_OUT_HEADERS)/X11 + $(LOCAL_PATH)/../../va \ + $(LOCAL_PATH)/../common \ + $(TARGET_OUT_HEADERS)/libva LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := h264encode +LOCAL_MODULE := avcenc -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) diff --git a/test/putsurface/Android.mk b/test/putsurface/Android.mk index 0b5d438..03edb61 100644 --- a/test/putsurface/Android.mk +++ b/test/putsurface/Android.mk @@ -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) diff --git a/test/vainfo/Android.mk b/test/vainfo/Android.mk index 91ea526..5c97388 100644 --- a/test/vainfo/Android.mk +++ b/test/vainfo/Android.mk @@ -14,12 +14,14 @@ LOCAL_CFLAGS += \ -DANDROID LOCAL_C_INCLUDES += \ - $(TARGET_OUT_HEADERS)/libva + $(LOCAL_PATH)/../../va \ + $(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) diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c index 1eee671..d09751f 100644 --- a/test/vainfo/vainfo.c +++ b/test/vainfo/vainfo.c @@ -28,6 +28,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) { \ diff --git a/va/Android.mk b/va/Android.mk index f54a622..eddb844 100755 --- a/va/Android.mk +++ b/va/Android.mk @@ -63,8 +63,8 @@ LOCAL_COPY_HEADERS := \ va.h \ va_backend.h \ va_dec_jpeg.h \ - va_version.h \ - x11/va_dricommon.h + va_drmcommon.h \ + va_version.h LOCAL_COPY_HEADERS_TO := libva/va diff --git a/va/sysdeps.h b/va/sysdeps.h index 75c3c5d..4de764d 100644 --- a/va/sysdeps.h +++ b/va/sysdeps.h @@ -41,6 +41,9 @@ # define True 1 # define False 0 +/* Macros generated from configure */ +# define LIBVA_VERSION_S "1.1.0" + /* Android logging utilities */ # include <utils/Log.h> |