From patchwork Wed Apr 3 19:46:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 47770 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp622991pzb; Wed, 3 Apr 2024 12:46:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVZA5PntOFdywvmhgL3jqvQ5SYShR9BPG+9KlcUBvaQ3dWXxfRodXNueVteWnwh7AOgv6pBvhW0fwoklwwe8zrS/pMb8RYjEbsIgw== X-Google-Smtp-Source: AGHT+IFFQaa9OW26pwHIXVGcNlsCeivHOHSBrNbwMRkonB744+dfbtLWJMA9dnpA+Wt6pJhWmFho X-Received: by 2002:a17:907:d26:b0:a4e:68a9:a6d2 with SMTP id gn38-20020a1709070d2600b00a4e68a9a6d2mr220842ejc.64.1712173568067; Wed, 03 Apr 2024 12:46:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712173568; cv=none; d=google.com; s=arc-20160816; b=YeOlEc1fvswvUHSI4Wum3bH7YzGVv8T7u9wKpH1Wuj/EF7+9wYaGBrstUm6o1ptB9d TMRAzq8VxVZzAxdZwZmnyxnOzIQStQmuTBlCkWawPAnPmEvoN1ganhUvQJljJX6RAPu8 cDaby8pQ+LlNrA2asvFunfkXPZ8Ao9lhcDlitPjMwDFDXRCieplQl93q5AVdez+pQ6qJ 5KA+xMd1t6h2LreT9WF1GbDRsyt3aYa+cZR/KFsG36TB9qrhNYv5mwAbcdhCoECvTBKv 8gdHuKJOXvg4hnKGS+FYtNjbKPB+u//sTxFISGIcLR4Ie1YMdADnfoXYL6t/2z0o79eL c7fQ== 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=0+NMNnm1VezqvoG5Y+NhO5+MZ8KmInJSEUKqG3AMZDk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=UTADU0nM+gY//kY4IDtJQ7inM0sMlMYhCXd1b9CoLvTbbBpxaRWGvrMEnfeZN/vIbd M/r/V1aZ/zns/3MLHDNA0Uvu9/eStNpKPAE0CFcabWCDlqWztRfdRbLgGgz6Xm9gGmr+ jAuPH2qkDPr8l2dr5bYNs4wyCezL1oA803c2BKG8tFrjpDyXxnG3ZJEyPrVwu/BZIWb7 uojIsU6NHC8exY6uP7Irv1py9/3/hUBE++p55GmIV4S8mQL72RQjaxM4neYWLx/p3GPx FB5m8jBmnmQ9rwPsNigE0gu6x+pZTXOfV93SgENkAA65LQsL1yFsCcicTG/emz5PAMnO LcvQ==; 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=gKpLa6XZ; 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 gb36-20020a170907962400b00a4e283893dcsi7102990ejc.531.2024.04.03.12.46.07; Wed, 03 Apr 2024 12:46:08 -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=gKpLa6XZ; 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 4C0FC68D0C5; Wed, 3 Apr 2024 22:46:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 488FB68D0C5 for ; Wed, 3 Apr 2024 22:45:58 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-41624ebc521so1528945e9.1 for ; Wed, 03 Apr 2024 12:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20230601.gappssmtp.com; s=20230601; t=1712173557; x=1712778357; 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=Aq3AQ/jIfC+hA6xnoHqfECAbN5s/XWq2ri4yHGFpuwQ=; b=gKpLa6XZxmb94q3R3A71z2QxvYtgeeot6C52w4h7YbvJmL5eNozzbWBiN+mEamJ6vl 2StIEe/FpqJw3xow+MrbqDQ/EH8Ef8bJnW/vlqGPUUs+fDQlYZ811MbgE407S22UwmMs ZAPRlKHWuFdXtKV7x9N3GtbwP7f462yTlCFpBvMhFCvgk5b+jbS9PgzDmrsWj1qHqNfz KBXqsF1mGxPebGaQydQJh+XavGng3CBP852kj73dfRl71s0WCPrAPFREiU5Wl1aS5px+ f6hkAYcEOOxn/eJR/VR768tCZsBsjYniY/z6QItpxrZJCMkgi8NQManIxJVUFZ1et1vM h48w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712173557; x=1712778357; 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=Aq3AQ/jIfC+hA6xnoHqfECAbN5s/XWq2ri4yHGFpuwQ=; b=TbYZq7URaXGXJ+wZX0EgFd6R4TXGa358dgLWm0gwoPVq8gGlogRZNMljQkPMdr1A5l C0l5TF12JUAnnSaIY8JAejrZzYcbz0Gdnb04B5YquUtqczjDosrXuJYajmmbx17JdPuN fOG0Q6jIMJZN4+PKDkV1kANbfsbvkH+oEy6wtuUSUZwWd5aCFuIemBhwjWcy4XhN3Znu mbRWtnnQAzRWLfXDvdpeQacqQ/50BQyCzvdQbuPCVH4ZjrZaMLdCXmJIXb5dGZGoAwQ5 tQMvvXrwO56scX1khxP+MF3+g+yd9d8GaY8Tm2wBGjXDqAMp1MrfThBG2d3AyodUrm4R M6Aw== X-Gm-Message-State: AOJu0YztJEYI2OhzKzjaqJCek+HXxNbEO6WyQRhOR8yV2wGYkEOsryvE /OSDB57iAFuvd5i2nBOfVoCh4jPDcf2qBdlbVEh7KOZL1k7mMZGFbMmHewEoTMhf9QIt5K4VFdx H X-Received: by 2002:a05:600c:4f06:b0:413:1741:28b5 with SMTP id l6-20020a05600c4f0600b00413174128b5mr458485wmq.9.1712173557562; Wed, 03 Apr 2024 12:45:57 -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 f10-20020a0560001b0a00b00341dbb4a3a7sm17931399wrz.86.2024.04.03.12.45.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 03 Apr 2024 12:45:57 -0700 (PDT) Message-ID: <8e59da71-e1e5-4d29-8a85-c3c4d0814fde@jkqxz.net> Date: Wed, 3 Apr 2024 20:46:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Mark Thompson To: FFmpeg development discussions and patches References: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> In-Reply-To: <15056f44-06c8-40a1-bb78-db3e66b2ee86@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 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: ycFlGVGeGJld 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. --- configure | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 71386c3920..9adada002f 100755 --- a/configure +++ b/configure @@ -2622,7 +2622,6 @@ CONFIG_EXTRA=" texturedsp texturedspenc tpeldsp - vaapi_1 vaapi_encode vc1dsp videodsp @@ -3184,7 +3183,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" @@ -3256,7 +3255,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" @@ -3348,7 +3347,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" @@ -3357,7 +3355,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" @@ -3385,7 +3382,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" @@ -3394,7 +3390,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" @@ -3940,9 +3935,6 @@ 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_qsv_filter_deps="libmfx" hstack_qsv_filter_select="qsvvpp" vstack_qsv_filter_deps="libmfx" @@ -7236,7 +7228,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 @@ -7252,18 +7244,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