From patchwork Wed Apr 3 22:11:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47775 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp692214pzb; Wed, 3 Apr 2024 15:11:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJR93MBHC4S5w6LWW1is+LBE8qmCgCIQt4AnMb9svY2suuZqtY7uk2t24DJWY2ckunrsl/bo1WBkSb2KJWYi7IdeQr4Wqh21bNBQ== X-Google-Smtp-Source: AGHT+IHuZzLqWHuyBjxs71kKPPYgzHbqlm+IUYHG/+XQc1/MIX+UYvAgL6afhn6povDPXtcQm/PY X-Received: by 2002:ac2:4344:0:b0:516:7de8:335a with SMTP id o4-20020ac24344000000b005167de8335amr573186lfl.59.1712182271487; Wed, 03 Apr 2024 15:11:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712182271; cv=none; d=google.com; s=arc-20160816; b=TPmB+J0Qcoaip3fAkqvtZrwZNumGGTKAe6VfOH5Id8Thq8usNK5AaSzoaByGODmNTo DXlA6UNNd1nG7DN/5CSof9eOUCzSkVKRUJy3v5pAVzlYRU7mSVTBi6/1fAWKWktR4bza dhKzNyqi6eOQpo2m0RJu+WEcw9QX9c4PekwG6HF7ZF06PN7sXzzPXuLG/9/cckHeeOfm On9lj+EtLcoEsbz4H4cKnvjWrhFe4awXzhmnb94t2xFr8Yw3N08xMV4mpPSIe/eXAHbr LAXVI7tsJIPzhrUJGSxcPu02SBTdoEcI57pokwI19Jj0xKk6ygrcvge/71XD8RW2dXUo ICnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:in-reply-to:references:to:from:content-language :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=QIGjBcgLRlQ88xrJjSehVsT1sGGMyNeJLeq1IlawULU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=I9rkAO8Yv8tOXcv5yn8xuMD6SFqEbowyyx0f8dg3mjaDZzcC+q9tQCbs3mty8A6ayj /pPu3WbgOQocHSUYxsBnVgovkdBsXAjnnTykxCA+4oNBK3fViOsErfw0XOYyRsUJd9aq zET4gXaxmTbes827XipO8QgbVmc0Zqc22sPWftZVkwLTc969bi8OkQsBtOnofQbWNfp6 jAQlKZETW+oQPwRaKWsiehojJjRQRGc8rTC6Hulwx1M7w8sOk14AC1mXo9l66W7FZdVl 43D9GxuksFvfiNAG8DUPSDaeGt0+xvzgBqk6jDFjJfMhzenee2PnhXVZYl9gTYdhcvH3 L9Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=PuIMWlfM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jx21-20020a170906ca5500b00a452d150025si7164000ejb.1015.2024.04.03.15.11.11; Wed, 03 Apr 2024 15:11:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20230601.gappssmtp.com header.s=20230601 header.b=PuIMWlfM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 226E668CF1F; Thu, 4 Apr 2024 01:11:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B397268CAF7 for ; Thu, 4 Apr 2024 01:11:02 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-34356f794a5so261143f8f.1 for ; Wed, 03 Apr 2024 15:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712182262; x=1712787062; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=WrQfG6h5t7BL/WyVw1ClnTnfbTXsWUHZ4LRuR7hQ8nY=; b=PuIMWlfMJSBVwjeWGG3GOUmYNeIawzVpy9TWlR/33KYO74BfTCik/AdS0QHSXWWCTn sf+kuFEYd8unhe3ecjZdyrtNYg4rB1kdgAnA5HSIIOnFiq3EplVcK3U7qOC2H7j4s2Lx uW0sfNVuQpI210SOP2czsWGvq7b+iWb1aUrfPComuRshIKSxertW6j4AM/1DkCOPeuys jfJrfEBtgoZGsqV90IbeJdM/Dmz3OCE/PJzpfs8QWmhYviGfrm5OXUmq8cOUa6CSfooh KfQBziLUKryNZKuq3ZT8868CAMvBBKTakOaNh8mMwMuFUiYs2+tJKVqMEnHLcTxgXgcd 1jCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712182262; x=1712787062; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WrQfG6h5t7BL/WyVw1ClnTnfbTXsWUHZ4LRuR7hQ8nY=; b=p/uq0NxNQOxmEnImbq31xpD270in6K1m6jERt8EOTp0Gw0PmKM6ujYW2USBo05l0cL qHiGFenqtuw/fELi4gP7QAEcsgwzbVzg59l1VQUU8ev61a4lmuxmHc/xTPDsCSKSPtvJ TwjAXJb+bHySOWbQRo0fPOH/AcCPOq6sMU+y9uPc5hAY7XVck7P5I4w6FfxwLi60wO4w 9syb42UTEwiZI1F/pZosOksJCyrpG6yHZodvtnCCPrRQY//9pILTmAhRposEA99UQWws 06T7vvoOHkwKd7tvPbZ7Rvk6pSx406ouMcbbqBby6PAuEUXA2cVJfxiEMgcxPpH9vth4 mqmg== X-Gm-Message-State: AOJu0YxVLFhmHSOgL3KDaiellrVjJemQxtTwOtPC6RvfuOC9mz/7zNKE YYdma4HPdBUHsk+serr457eoIFWQU27n40IW3WgLLOzdNXluYWnj+13+Zeycr8Vk/NrecZQErjw C X-Received: by 2002:adf:cd91:0:b0:343:955d:822d with SMTP id q17-20020adfcd91000000b00343955d822dmr671268wrj.7.1712182262001; Wed, 03 Apr 2024 15:11:02 -0700 (PDT) Received: from [192.168.0.15] (cpc92302-cmbg19-2-0-cust1183.5-4.cable.virginm.net. [82.1.212.160]) by smtp.gmail.com with ESMTPSA id ck5-20020a5d5e85000000b0034349225fbcsm11099073wrb.114.2024.04.03.15.11.01 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 15:11:01 -0700 (PDT) Message-ID: <0d0fc76f-6922-42a2-94e9-9926ca720262@jkqxz.net> Date: Wed, 3 Apr 2024 23:11:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <6708e86a-38e7-4ed7-a202-508b2ec9165f@jkqxz.net> In-Reply-To: <6708e86a-38e7-4ed7-a202-508b2ec9165f@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 4/4] configure: Remove libva 1.x support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vM5FoP/uJjVy libva 2.0 was released in 2017 and the 2.x versions are included in all supported distributions nowadays. Various features no longer need any configure check after this command, including all codecs except AV1. Note that the libva version is the API version plus one, so this is removing support for VAAPI 0.x and requiring VAAPI 1.x. --- Fixed some filter checks and added a note about the version numbering. configure | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 29cc8773fd..0253553caf 100755 --- a/configure +++ b/configure @@ -2622,7 +2622,6 @@ CONFIG_EXTRA=" texturedsp texturedspenc tpeldsp - vaapi_1 vaapi_encode vc1dsp videodsp @@ -3185,7 +3184,7 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_nvdec_hwaccel_deps="nvdec" hevc_nvdec_hwaccel_select="hevc_decoder" -hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" +hevc_vaapi_hwaccel_deps="vaapi" hevc_vaapi_hwaccel_select="hevc_decoder" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" hevc_vdpau_hwaccel_select="hevc_decoder" @@ -3257,7 +3256,7 @@ vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" vp9_dxva2_hwaccel_select="vp9_decoder" vp9_nvdec_hwaccel_deps="nvdec" vp9_nvdec_hwaccel_select="vp9_decoder" -vp9_vaapi_hwaccel_deps="vaapi VADecPictureParameterBufferVP9_bit_depth" +vp9_vaapi_hwaccel_deps="vaapi" vp9_vaapi_hwaccel_select="vp9_decoder" vp9_vdpau_hwaccel_deps="vdpau VdpPictureInfoVP9" vp9_vdpau_hwaccel_select="vp9_decoder" @@ -3349,7 +3348,6 @@ hevc_qsv_decoder_select="hevc_mp4toannexb_bsf qsvdec" hevc_qsv_encoder_select="hevcparse qsvenc" hevc_rkmpp_decoder_deps="rkmpp" hevc_rkmpp_decoder_select="hevc_mp4toannexb_bsf" -hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC" hevc_vaapi_encoder_select="atsc_a53 cbs_h265 vaapi_encode" hevc_v4l2m2m_decoder_deps="v4l2_m2m hevc_v4l2_m2m" hevc_v4l2m2m_decoder_select="hevc_mp4toannexb_bsf" @@ -3358,7 +3356,6 @@ mjpeg_cuvid_decoder_deps="cuvid" mjpeg_qsv_decoder_select="qsvdec" mjpeg_qsv_encoder_deps="libmfx" mjpeg_qsv_encoder_select="qsvenc" -mjpeg_vaapi_encoder_deps="VAEncPictureParameterBufferJPEG" mjpeg_vaapi_encoder_select="cbs_jpeg jpegtables vaapi_encode" mp3_mf_encoder_deps="mediafoundation" mpeg1_cuvid_decoder_deps="cuvid" @@ -3386,7 +3383,6 @@ vp8_mediacodec_decoder_deps="mediacodec" vp8_mediacodec_encoder_deps="mediacodec" vp8_qsv_decoder_select="qsvdec" vp8_rkmpp_decoder_deps="rkmpp" -vp8_vaapi_encoder_deps="VAEncPictureParameterBufferVP8" vp8_vaapi_encoder_select="vaapi_encode" vp8_v4l2m2m_decoder_deps="v4l2_m2m vp8_v4l2_m2m" vp8_v4l2m2m_encoder_deps="v4l2_m2m vp8_v4l2_m2m" @@ -3395,7 +3391,6 @@ vp9_mediacodec_decoder_deps="mediacodec" vp9_mediacodec_encoder_deps="mediacodec" vp9_qsv_decoder_select="qsvdec" vp9_rkmpp_decoder_deps="rkmpp" -vp9_vaapi_encoder_deps="VAEncPictureParameterBufferVP9" vp9_vaapi_encoder_select="vaapi_encode" vp9_qsv_encoder_deps="libmfx MFX_CODEC_VP9" vp9_qsv_encoder_select="qsvenc" @@ -3942,9 +3937,9 @@ xfade_vulkan_filter_deps="vulkan spirv_compiler" yadif_cuda_filter_deps="ffnvcodec" yadif_cuda_filter_deps_any="cuda_nvcc cuda_llvm" yadif_videotoolbox_filter_deps="metal corevideo videotoolbox" -hstack_vaapi_filter_deps="vaapi_1" -vstack_vaapi_filter_deps="vaapi_1" -xstack_vaapi_filter_deps="vaapi_1" +hstack_vaapi_filter_deps="vaapi" +vstack_vaapi_filter_deps="vaapi" +xstack_vaapi_filter_deps="vaapi" hstack_qsv_filter_deps="libmfx" hstack_qsv_filter_select="qsvvpp" vstack_qsv_filter_deps="libmfx" @@ -7238,7 +7233,7 @@ enabled libdrm && check_pkg_config libdrm_getfb2 libdrm "xf86drmMode.h" drmModeGetFB2 enabled vaapi && - check_pkg_config vaapi "libva >= 0.35.0" "va/va.h" vaInitialize + check_pkg_config vaapi "libva >= 1.0.0" "va/va.h" vaInitialize if enabled vaapi; then case $target_os in @@ -7254,18 +7249,10 @@ if enabled vaapi; then check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay fi - check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)" - - check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC" - check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth check_struct "va/va.h" "VADecPictureParameterBufferAV1" bit_depth_idx check_type "va/va.h va/va_vpp.h" "VAProcFilterParameterBufferHDRToneMapping" check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" rotation_flags check_struct "va/va.h va/va_vpp.h" "VAProcPipelineCaps" blend_flags - check_type "va/va.h va/va_enc_hevc.h" "VAEncPictureParameterBufferHEVC" - check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG" - check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8" - check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" check_type "va/va.h va/va_enc_av1.h" "VAEncPictureParameterBufferAV1" fi