From patchwork Mon Apr 22 21:44:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 48229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:2d06:b0:1a9:af23:56c1 with SMTP id tw6csp41484pzb; Mon, 22 Apr 2024 14:44:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUja9CloGlkKeTKW3rvYhxzur376mRlMkhaSFSOdeq2Wkm11ry4dxGW5yMzPzW/SfDeXdkSx/pMFHuDJ1IJMx14fyyP6JIb1hGxMQ== X-Google-Smtp-Source: AGHT+IGxCg5UYLTAYqAsZ1KndA5AYWP6beWnVSS/U4p6reyr8EjzFYtbmxXihrLbEhSxlHsPtjUC X-Received: by 2002:a50:a408:0:b0:56e:603:9fc9 with SMTP id u8-20020a50a408000000b0056e06039fc9mr9442992edb.3.1713822246374; Mon, 22 Apr 2024 14:44:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713822246; cv=none; d=google.com; s=arc-20160816; b=lCknsg2VFlz4WSGHIcWx4hLnYZYO3qhPFk97VlKLfwPELF1ygNnGnMn6HW4z2ygTnZ KB/KQDdJ8gwUH0j2AB5vVrctTsGU3CNdBFrw/2uAGCMPcQWPFMASVSHC6TRf7TKPtTXV dGfCwHNSQ0+WSMthZf51LjmPA7P0zk9gKxto0z6vVo+tVaA2L4a056itHgqudfwAQkAd DNaevzkdQuTjd5zYQXYNTOFpMcWEJmVNCP36SpQrDDkwYmZFcTO2VDqxWjRm2l/NMrlm rjziisgWvAhuUL8PnUxRrosVylJSy7CMONpGoIoTAz8sMq4MWoxEKJjGScCJUNxwaFDc xQjA== 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=nSvxKQq3IRyJws0IVVhfNV7iZXM4/z/am9k7vuKABmc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ERCajodmt141+cjKlvbusopt4Qv8SZQniW58LdMZ4jb2/57gyrloFjgRHNN5oaxkKN l9p0VC7eDlSDFHeblOfJlVWHt0+aLxEob+s6RBIRR2oRSTsW2wJy+igvT9EVuNHXPWGp vgW4/y1+3krH2IeLZhTn/fOf0ijOfVxztl4KJPZ8mTG7GHzyYBojdpI/y139UlDZSY0W OMpK89Feu8m+w6Jv1rp95tnRsVl4e3To+C3QfpIivOAFfQD1uyqsqPlwnOUJN4lmBa7K p6yY62qxJ2xwOyxxxbG5ds5wkdoqv50iT+OuhBydUOUTAjgMWKqcQhoNS1HvUziNpsdR laXA==; 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=sdmehavj; 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 d4-20020a056402516400b0056bf76d3fe8si6500306ede.71.2024.04.22.14.44.06; Mon, 22 Apr 2024 14:44:06 -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=sdmehavj; 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 1E46968D194; Tue, 23 Apr 2024 00:44:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B27468D194 for ; Tue, 23 Apr 2024 00:43:57 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-343e46ec237so4198442f8f.2 for ; Mon, 22 Apr 2024 14:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1713822236; x=1714427036; 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=EdhmiCbkWHBBdJnBkG2/A6zxlPR7m5g6qSrJQ/Ya5vo=; b=sdmehavjBbUyBfKgmivADiIR/jWGiuZtC0CwfhZfyYk6j78DzQDv0l86OvjAGLzrjz uly0K7iffWxn1PONvBCtKXjDJ/7j1BdsAl4Sgws4lXEVkYhsxr1nyJb766s0wZjTk0GZ KJPWRQ5+ZA7W59MRDyDKxdG+8pKBrxYlGOpxLKoDWQkzVjqiN93iXUb1TH4QXdSD7SpA Jzu47L15ANW3sh3beQiQztWOu/cIzLP0MUCiWtzEJeAlrxBvMCK7hfxQCCkTTcjPuCdM z347fbUqMFuCQdkxIFma3irnwYu/6R+YOLV3l4vw6xXKp9bxKQK7XPRr78+VEkBLHW2C FBgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713822236; x=1714427036; 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=EdhmiCbkWHBBdJnBkG2/A6zxlPR7m5g6qSrJQ/Ya5vo=; b=gRXmb74qZpTNsaE7QHEX9F0mmiDxM8BVtbm52YeQ34RX7V82gkW5Lb5Urja5unYizQ nkUlXaX6lIdWf2YCKurzj+TUM3Yqcem/ByCUQs2zpuyc1LTjbOIuFBCo95pHNHgOQhbz Y0qlUAc4VtmUxVLExTTeF7b1I4rnK/DIsWAoPmCB8WuAXQFyL48wH0vDh3RxK2iP4oio ga9CAcrlbJXEx2XYF1AW2LPh16Q1n4qLCt1ENXgeK3If4T9WyqOmrCsi7cnAWtZ9vTr9 C8ojGhXdv/2jOIj164cWfDHiWWMk7v8NMiQjUlw6eJOj2/oeDXfu0O7BMq0u8hAjDwT/ 05JA== X-Gm-Message-State: AOJu0YwlH5ikiUnUkJdETmbp9S1bDqE8l1khk7nBwKEBo5M4MWDUUMnY reCQE3jQQXY2HqmJjphg/lz3PhBCw3ESdyLmSv0zQz26eQG4x6gH98rRKp4qSa4+Y3XeZCLjDAc Y X-Received: by 2002:a5d:628c:0:b0:345:ca71:5ddb with SMTP id k12-20020a5d628c000000b00345ca715ddbmr8812843wru.66.1713822236375; Mon, 22 Apr 2024 14:43:56 -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 r26-20020adfa15a000000b0034b6d40ecdbsm141771wrr.48.2024.04.22.14.43.56 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Apr 2024 14:43:56 -0700 (PDT) Message-ID: Date: Mon, 22 Apr 2024 22:44:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: In-Reply-To: Subject: [FFmpeg-devel] [PATCH v3 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: 0hjHJXcdkj2f 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. --- configure | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 02711bf930..e3361a1a73 100755 --- a/configure +++ b/configure @@ -2625,7 +2625,6 @@ CONFIG_EXTRA=" texturedsp texturedspenc tpeldsp - vaapi_1 vaapi_encode vc1dsp videodsp @@ -3189,7 +3188,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" @@ -3261,7 +3260,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" @@ -3353,7 +3352,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" @@ -3362,7 +3360,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" @@ -3390,7 +3387,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" @@ -3399,7 +3395,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" @@ -3950,9 +3945,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" @@ -7245,7 +7240,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 @@ -7261,18 +7256,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