external/ffmpeg
Revisión | cf70cc0605ae91b0637e3faece5704c70d4510b4 (tree) |
---|---|
Tiempo | 2017-06-08 00:42:30 |
Autor | Jaap Jan Meijer <jjmeijer88@gmai...> |
Commiter | Chih-Wei Huang |
Include and link against libva
Change-Id: Iba7201ddafbd637d229f0d03b81fb56fc4d3f863
@@ -14,12 +14,14 @@ FFMPEG_MULTILIB := 32 | ||
14 | 14 | include $(LOCAL_PATH)/../android/build.mk |
15 | 15 | |
16 | 16 | LOCAL_C_INCLUDES += \ |
17 | - external/zlib | |
17 | + external/zlib \ | |
18 | + $(TARGET_OUT_HEADERS)/libva | |
18 | 19 | |
19 | 20 | LOCAL_SHARED_LIBRARIES += \ |
20 | 21 | libz \ |
21 | 22 | libavutil \ |
22 | - libswresample | |
23 | + libswresample \ | |
24 | + libva | |
23 | 25 | |
24 | 26 | ifneq ($(ARCH_ARM_HAVE_NEON),) |
25 | 27 | LOCAL_SRC_FILES += neon/mpegvideo.c |
@@ -35,12 +37,14 @@ FFMPEG_MULTILIB := 64 | ||
35 | 37 | include $(LOCAL_PATH)/../android/build.mk |
36 | 38 | |
37 | 39 | LOCAL_C_INCLUDES += \ |
38 | - external/zlib | |
40 | + external/zlib \ | |
41 | + $(TARGET_OUT_HEADERS)/libva | |
39 | 42 | |
40 | 43 | LOCAL_SHARED_LIBRARIES += \ |
41 | 44 | libz \ |
42 | 45 | libavutil \ |
43 | - libswresample | |
46 | + libswresample \ | |
47 | + libva | |
44 | 48 | |
45 | 49 | ifneq ($(ARCH_ARM_HAVE_NEON),) |
46 | 50 | LOCAL_SRC_FILES += neon/mpegvideo.c |
@@ -13,6 +13,13 @@ LOCAL_PATH := $(call my-dir) | ||
13 | 13 | FFMPEG_MULTILIB := 32 |
14 | 14 | include $(LOCAL_PATH)/../android/build.mk |
15 | 15 | |
16 | +LOCAL_C_INCLUDES += \ | |
17 | + $(TARGET_OUT_HEADERS)/libva | |
18 | + | |
19 | +LOCAL_SHARED_LIBRARIES += \ | |
20 | + libva \ | |
21 | + libva-android \ | |
22 | + | |
16 | 23 | LOCAL_MULTILIB := $(FFMPEG_MULTILIB) |
17 | 24 | |
18 | 25 | include $(BUILD_SHARED_LIBRARY) |
@@ -22,6 +29,13 @@ include $(BUILD_SHARED_LIBRARY) | ||
22 | 29 | FFMPEG_MULTILIB := 64 |
23 | 30 | include $(LOCAL_PATH)/../android/build.mk |
24 | 31 | |
32 | +LOCAL_C_INCLUDES += \ | |
33 | + $(TARGET_OUT_HEADERS)/libva | |
34 | + | |
35 | +LOCAL_SHARED_LIBRARIES += \ | |
36 | + libva \ | |
37 | + libva-android \ | |
38 | + | |
25 | 39 | LOCAL_MULTILIB := $(FFMPEG_MULTILIB) |
26 | 40 | |
27 | 41 | include $(BUILD_SHARED_LIBRARY) |
@@ -24,6 +24,9 @@ | ||
24 | 24 | #if HAVE_VAAPI_DRM |
25 | 25 | # include <va/va_drm.h> |
26 | 26 | #endif |
27 | +#if HAVE_VAAPI_ANDROID | |
28 | +# include <va/va_android.h> | |
29 | +#endif | |
27 | 30 | |
28 | 31 | #include <fcntl.h> |
29 | 32 | #if HAVE_UNISTD_H |
@@ -968,6 +971,22 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, | ||
968 | 971 | } |
969 | 972 | #endif |
970 | 973 | |
974 | +#if HAVE_VAAPI_ANDROID | |
975 | + if (!display) { | |
976 | + int mDisplay; | |
977 | + mDisplay = 0x18C34078; | |
978 | + display = vaGetDisplay(&mDisplay); | |
979 | + if (!display) { | |
980 | + av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display " | |
981 | + "from Android device %s.\n", device); | |
982 | + return AVERROR_UNKNOWN; | |
983 | + } | |
984 | + | |
985 | + av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via " | |
986 | + "Android device %s.\n", device); | |
987 | + } | |
988 | +#endif | |
989 | + | |
971 | 990 | if (!display) { |
972 | 991 | av_log(ctx, AV_LOG_ERROR, "No VA display found for " |
973 | 992 | "device: %s.\n", device ? device : ""); |