Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-ffmpeg: Commit

external/ffmpeg


Commit MetaInfo

Revisióncf70cc0605ae91b0637e3faece5704c70d4510b4 (tree)
Tiempo2017-06-08 00:42:30
AutorJaap Jan Meijer <jjmeijer88@gmai...>
CommiterChih-Wei Huang

Log Message

Include and link against libva

Change-Id: Iba7201ddafbd637d229f0d03b81fb56fc4d3f863

Cambiar Resumen

Diferencia incremental

--- a/libavcodec/Android.mk
+++ b/libavcodec/Android.mk
@@ -14,12 +14,14 @@ FFMPEG_MULTILIB := 32
1414 include $(LOCAL_PATH)/../android/build.mk
1515
1616 LOCAL_C_INCLUDES += \
17- external/zlib
17+ external/zlib \
18+ $(TARGET_OUT_HEADERS)/libva
1819
1920 LOCAL_SHARED_LIBRARIES += \
2021 libz \
2122 libavutil \
22- libswresample
23+ libswresample \
24+ libva
2325
2426 ifneq ($(ARCH_ARM_HAVE_NEON),)
2527 LOCAL_SRC_FILES += neon/mpegvideo.c
@@ -35,12 +37,14 @@ FFMPEG_MULTILIB := 64
3537 include $(LOCAL_PATH)/../android/build.mk
3638
3739 LOCAL_C_INCLUDES += \
38- external/zlib
40+ external/zlib \
41+ $(TARGET_OUT_HEADERS)/libva
3942
4043 LOCAL_SHARED_LIBRARIES += \
4144 libz \
4245 libavutil \
43- libswresample
46+ libswresample \
47+ libva
4448
4549 ifneq ($(ARCH_ARM_HAVE_NEON),)
4650 LOCAL_SRC_FILES += neon/mpegvideo.c
--- a/libavutil/Android.mk
+++ b/libavutil/Android.mk
@@ -13,6 +13,13 @@ LOCAL_PATH := $(call my-dir)
1313 FFMPEG_MULTILIB := 32
1414 include $(LOCAL_PATH)/../android/build.mk
1515
16+LOCAL_C_INCLUDES += \
17+ $(TARGET_OUT_HEADERS)/libva
18+
19+LOCAL_SHARED_LIBRARIES += \
20+ libva \
21+ libva-android \
22+
1623 LOCAL_MULTILIB := $(FFMPEG_MULTILIB)
1724
1825 include $(BUILD_SHARED_LIBRARY)
@@ -22,6 +29,13 @@ include $(BUILD_SHARED_LIBRARY)
2229 FFMPEG_MULTILIB := 64
2330 include $(LOCAL_PATH)/../android/build.mk
2431
32+LOCAL_C_INCLUDES += \
33+ $(TARGET_OUT_HEADERS)/libva
34+
35+LOCAL_SHARED_LIBRARIES += \
36+ libva \
37+ libva-android \
38+
2539 LOCAL_MULTILIB := $(FFMPEG_MULTILIB)
2640
2741 include $(BUILD_SHARED_LIBRARY)
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -24,6 +24,9 @@
2424 #if HAVE_VAAPI_DRM
2525 # include <va/va_drm.h>
2626 #endif
27+#if HAVE_VAAPI_ANDROID
28+# include <va/va_android.h>
29+#endif
2730
2831 #include <fcntl.h>
2932 #if HAVE_UNISTD_H
@@ -968,6 +971,22 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
968971 }
969972 #endif
970973
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+
971990 if (!display) {
972991 av_log(ctx, AV_LOG_ERROR, "No VA display found for "
973992 "device: %s.\n", device ? device : "");
Show on old repository browser