From 7cd527e25c762087c7b348a7a692c6567f501530 Mon Sep 17 00:00:00 2001 From: Michael Goffioul Date: Tue, 16 May 2023 14:03:56 +0200 Subject: [PATCH] Enable VA-API hwaccel for AV1 codec This still requires a compatible VA-API driver (legacy i965 driver does not support AV1). --- android/config-x86-x86.mak | 2 +- android/config-x86_64-x86_64.mak | 2 +- android/include/config_components.h | 2 +- configure | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/config-x86-x86.mak b/android/config-x86-x86.mak index 82acaf60cf..7ae4e397a5 100644 --- a/android/config-x86-x86.mak +++ b/android/config-x86-x86.mak @@ -1587,7 +1587,7 @@ CONFIG_MPEG2_VAAPI_ENCODER=yes !CONFIG_AV1_D3D11VA2_HWACCEL=yes !CONFIG_AV1_DXVA2_HWACCEL=yes !CONFIG_AV1_NVDEC_HWACCEL=yes -!CONFIG_AV1_VAAPI_HWACCEL=yes +CONFIG_AV1_VAAPI_HWACCEL=yes !CONFIG_AV1_VDPAU_HWACCEL=yes CONFIG_H263_VAAPI_HWACCEL=yes !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes diff --git a/android/config-x86_64-x86_64.mak b/android/config-x86_64-x86_64.mak index 5bec3d1211..975ec04076 100644 --- a/android/config-x86_64-x86_64.mak +++ b/android/config-x86_64-x86_64.mak @@ -1587,7 +1587,7 @@ CONFIG_MPEG2_VAAPI_ENCODER=yes !CONFIG_AV1_D3D11VA2_HWACCEL=yes !CONFIG_AV1_DXVA2_HWACCEL=yes !CONFIG_AV1_NVDEC_HWACCEL=yes -!CONFIG_AV1_VAAPI_HWACCEL=yes +CONFIG_AV1_VAAPI_HWACCEL=yes !CONFIG_AV1_VDPAU_HWACCEL=yes CONFIG_H263_VAAPI_HWACCEL=yes !CONFIG_H263_VIDEOTOOLBOX_HWACCEL=yes diff --git a/android/include/config_components.h b/android/include/config_components.h index fa87137d51..35366bdbce 100644 --- a/android/include/config_components.h +++ b/android/include/config_components.h @@ -845,7 +845,7 @@ #define CONFIG_AV1_D3D11VA2_HWACCEL 0 #define CONFIG_AV1_DXVA2_HWACCEL 0 #define CONFIG_AV1_NVDEC_HWACCEL 0 -#define CONFIG_AV1_VAAPI_HWACCEL 0 +#define CONFIG_AV1_VAAPI_HWACCEL 1 #define CONFIG_AV1_VDPAU_HWACCEL 0 #define CONFIG_H263_VAAPI_HWACCEL 1 #define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 diff --git a/configure b/configure index 0c730e2d55..ceaa90d2e3 100755 --- a/configure +++ b/configure @@ -6963,6 +6963,7 @@ if enabled x86; then android) hevc_vaapi_hwaccel_deps="vaapi" vp9_vaapi_hwaccel_deps="vaapi" + av1_vaapi_hwaccel_deps="vaapi" enable vaapi vaapi_1 vaapi_android enable libdrm libdrm_getfb2 linux_dma_buf_h enabled x86_32 && disable ebx_available