Include and link against libva

Change-Id: Iba7201ddafbd637d229f0d03b81fb56fc4d3f863

diff --git a/libavcodec/Android.mk b/libavcodec/Android.mk
index 2216a77..9efeb36 100644 (file)
--- a/libavcodec/Android.mk
+++ b/libavcodec/Android.mk
@@ -14,12 +14,14 @@ FFMPEG_MULTILIB := 32
 include $(LOCAL_PATH)/../android/build.mk
 
 LOCAL_C_INCLUDES +=            \
-       external/zlib
+       external/zlib \
+       $(TARGET_OUT_HEADERS)/libva
 
 LOCAL_SHARED_LIBRARIES +=      \
        libz \
        libavutil \
-       libswresample
+       libswresample \
+       libva
 
 ifneq ($(ARCH_ARM_HAVE_NEON),)
   LOCAL_SRC_FILES += neon/mpegvideo.c
@@ -35,12 +37,14 @@ FFMPEG_MULTILIB := 64
 include $(LOCAL_PATH)/../android/build.mk
 
 LOCAL_C_INCLUDES +=            \
-       external/zlib
+       external/zlib \
+       $(TARGET_OUT_HEADERS)/libva
 
 LOCAL_SHARED_LIBRARIES +=      \
        libz \
        libavutil \
-       libswresample
+       libswresample \
+       libva
 
 ifneq ($(ARCH_ARM_HAVE_NEON),)
   LOCAL_SRC_FILES += neon/mpegvideo.c

diff --git a/libavutil/Android.mk b/libavutil/Android.mk
index 22c509f..73116e2 100644 (file)
--- a/libavutil/Android.mk
+++ b/libavutil/Android.mk
@@ -13,6 +13,13 @@ LOCAL_PATH := $(call my-dir)
 FFMPEG_MULTILIB := 32
 include $(LOCAL_PATH)/../android/build.mk
 
+LOCAL_C_INCLUDES +=            \
+       $(TARGET_OUT_HEADERS)/libva
+
+LOCAL_SHARED_LIBRARIES +=      \
+       libva \
+       libva-android \
+
 LOCAL_MULTILIB := $(FFMPEG_MULTILIB)
 
 include $(BUILD_SHARED_LIBRARY)
@@ -22,6 +29,13 @@ include $(BUILD_SHARED_LIBRARY)
 FFMPEG_MULTILIB := 64
 include $(LOCAL_PATH)/../android/build.mk
 
+LOCAL_C_INCLUDES +=            \
+       $(TARGET_OUT_HEADERS)/libva
+
+LOCAL_SHARED_LIBRARIES +=      \
+       libva \
+       libva-android \
+
 LOCAL_MULTILIB := $(FFMPEG_MULTILIB)
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 3b50e95..b24ebc9 100644 (file)
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -24,6 +24,9 @@
 #if HAVE_VAAPI_DRM
 #   include <va/va_drm.h>
 #endif
+#if HAVE_VAAPI_ANDROID
+#   include <va/va_android.h>
+#endif
 
 #include <fcntl.h>
 #if HAVE_UNISTD_H
@@ -968,6 +971,22 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
     }
 #endif
 
+#if HAVE_VAAPI_ANDROID
+    if (!display) {
+        int mDisplay;
+        mDisplay = 0x18C34078;
+        display = vaGetDisplay(&mDisplay);
+        if (!display) {
+            av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display "
+                   "from Android device %s.\n", device);
+            return AVERROR_UNKNOWN;
+        }
+
+        av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via "
+               "Android device %s.\n", device);
+    }
+#endif
+
     if (!display) {
         av_log(ctx, AV_LOG_ERROR, "No VA display found for "
                "device: %s.\n", device ? device : "");