# Recursive call sub-folder Android.mk
#
-# include $(call all-subdir-makefiles)
+ include $(call all-subdir-makefiles)
#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)
/*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)
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)
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
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)
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)
-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)
#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) { \
va_enc.h \
va_enc_h264.h \
va_backend.h \
- x11/va_dricommon.h \
+ va_drmcommon.h \
va_vpp.h \
va_backend_vpp.h
# 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>