From patchwork Tue Sep 18 22:30:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10360 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp10909jap; Tue, 18 Sep 2018 15:31:41 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdb/Airmj9WvwznDgl5+r3RsudPT8W41+5HqOfuelTQVrNsnLDo2KEGFb6lXPWvlzf9r4lZq X-Received: by 2002:adf:9e06:: with SMTP id u6-v6mr24969290wre.51.1537309901314; Tue, 18 Sep 2018 15:31:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309901; cv=none; d=google.com; s=arc-20160816; b=Tx5hhsYMA9Kw0m+aVcki8Y/MDkkKJn2SyiydKHVHANBvFFWQXfWXpfZLkHpQyJa0jo djIqpAEFtXv6gX9l4EVm9mGdhwqp1DhkzR6jm1fgQ5Uv/ufl80jeISypXiQvD97qskAX HDgYtkp0jiycyOj09jtZR4X1Pd/blRXh6EyQq3P+ikneUHYxRP0pgvM/iveSrZc98wW4 Zjo98bzMyX+IMwYpHpLjmiKR2oGWM7dD6ddjj9yCsaxAZEG278QktJZMwjQR7KD4Evoe foZztG1Emckn/k6C8UlU4gutoakhc3kl3gvhTGCt/zFSlkVIPo1FjmACuPvJmxllcraM yNBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=YCVQMfPpCsdj8ShJWLUGMD3TjZJA3atnpGcRanfpsl4=; b=Ou0Z4tE9dyKj0rUyTiawNe1Lh/vAJFmePIgLs11aTDLotb5dUKqS0zr6yW3+4chCnn Y0mxex9Ogpvj3bcVrniUpoAtogNybv4xCI0oQiTznM4JWlYnw/b6hqkU5j72dQzUN4md avTlDOzjBERZB5nz2W7JHGxnsMi639SKwIPPfRK28DVuAGRmXS94Dz/HFPZefsaLTc83 2CCdPishuBqCnGG1YTX3ZSIHq7oii/dWecvjQWRTsArTXOhxA5C2WiKmyTwtAUsaYfqS CuGjrRxT7JzcaUNHhud7w7AtyaZwk1eEzKvT9su63Cqu82gVyoDe4bnV8aaz86firiYK jZYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=g4hx49q6; 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 v67-v6si12046003wmb.167.2018.09.18.15.31.40; Tue, 18 Sep 2018 15:31:41 -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.20150623.gappssmtp.com header.s=20150623 header.b=g4hx49q6; 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 C68F668A03A; Wed, 19 Sep 2018 01:31:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B90C689F25 for ; Wed, 19 Sep 2018 01:31:09 +0300 (EEST) Received: by mail-wm1-f44.google.com with SMTP id j25-v6so7995776wmc.1 for ; Tue, 18 Sep 2018 15:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=AZjIRa8h+idtF5dRMAPkE+SMkr/EOBtpPWbWdiEwbTI=; b=g4hx49q6yb0B/FunNePTxczB2+JKwmRVUGo5wLCdWMo0/UHyjP0eAnkEz4H7eRe3Eh LOn+V0OGYWhvRq8V9BXBdeXUDnZ2zWUiyv26Fp5E8EFjBJf9skRv1HYQ1N9W1bXtsvpx DAcIssoxCALsYrT1im/GbeG6p3hfNV20pzkDd9NfeZiuWXLL2VkfxlQIBF7gFVDwaarx G6wOu/PZd5xH2UqttGT3OYrxD5Uhe+RjS7QyIxkd01j0+uuwyGF9NmQbaNzyjot0Kfgq di4u8fzEsp+TT5YHrYVvY70WCT0suoPNTsz2nvElLFEZ/8CisgGApvrzr9q30G3XoSgz 4JpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AZjIRa8h+idtF5dRMAPkE+SMkr/EOBtpPWbWdiEwbTI=; b=QWb0fC+ObxDK4iP3y3nE3/vZ+bhgwBQctsJyQ4U4072NN8xG7bUFF+4wm+/yR06tTv nQlXPGEZ5m6srfwg3EK32Eu+sLijddSrDV28CnuA5EJrZnR7ulspueufwLDKIAtCmZeD YpTTmFCzl3+9dHJRuc2tfCgUTPgjRwZpLnsvO3Z5lWj+t86z4jqkqoj1TtbQTnyrZxuR Xy79Lz3jejAt836Xr95GejhVNw6DrfmEAN2Of3hrlqWcSODs80ZfdWBDbqduaQMa9vgl lIU/xkGWLdtzB+tn9M4IVK0dQ3ECCv4DRdA6iYcTu+CHwNoeCK+MGwEGSjbVoizvfZPZ Yb0A== X-Gm-Message-State: APzg51AITFSkbWOU8nmVk/KlJ2J9VRw0fdziQw9HKMwQy6dbtDvYsKjy 1jHo57mN45OzuBZ2VjKkb1uBOOzU/RM= X-Received: by 2002:a1c:be06:: with SMTP id o6-v6mr18259550wmf.65.1537309882008; Tue, 18 Sep 2018 15:31:22 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id e141-v6sm4863826wmd.32.2018.09.18.15.31.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:21 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:39 +0100 Message-Id: <20180918223116.14322-2-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 01/38] configure: Use pkgconfig for VAAPI X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Set the minimum version to 0.35.0 (libva 1.3.0) and remove redundant configure tests. This also allows the proprietary libmfx fork of libva, which always shows the version number 0.99.0 (independent of the actual version). --- configure | 31 ++++++++++++------------------- libavcodec/vaapi_decode.c | 2 -- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 25120337de..42320de62b 100755 --- a/configure +++ b/configure @@ -2896,7 +2896,7 @@ vc1_vdpau_hwaccel_deps="vdpau" vc1_vdpau_hwaccel_select="vc1_decoder" vp8_nvdec_hwaccel_deps="nvdec" vp8_nvdec_hwaccel_select="vp8_decoder" -vp8_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferVP8" +vp8_vaapi_hwaccel_deps="vaapi" vp8_vaapi_hwaccel_select="vp8_decoder" vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9" vp9_d3d11va_hwaccel_select="vp9_decoder" @@ -2951,7 +2951,6 @@ h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec" h264_qsv_encoder_select="qsvenc" h264_rkmpp_decoder_deps="rkmpp" h264_rkmpp_decoder_select="h264_mp4toannexb_bsf" -h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264" h264_vaapi_encoder_select="cbs_h264 vaapi_encode" h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m" h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m" @@ -2982,7 +2981,6 @@ mpeg2_mmal_decoder_deps="mmal" mpeg2_mediacodec_decoder_deps="mediacodec" mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser" mpeg2_qsv_encoder_select="qsvenc" -mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2" mpeg2_vaapi_encoder_select="cbs_mpeg2 vaapi_encode" mpeg2_v4l2m2m_decoder_deps="v4l2_m2m mpeg2_v4l2_m2m" mpeg4_crystalhd_decoder_select="crystalhd" @@ -3371,7 +3369,7 @@ deconvolve_filter_select="fft" deinterlace_qsv_filter_deps="libmfx" deinterlace_vaapi_filter_deps="vaapi" delogo_filter_deps="gpl" -denoise_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" +denoise_vaapi_filter_deps="vaapi" deshake_filter_select="pixelutils" dilation_opencl_filter_deps="opencl" drawtext_filter_deps="libfreetype" @@ -3419,7 +3417,7 @@ phase_filter_deps="gpl" pp7_filter_deps="gpl" pp_filter_deps="gpl postproc" prewitt_opencl_filter_deps="opencl" -procamp_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" +procamp_vaapi_filter_deps="vaapi" program_opencl_filter_deps="opencl" pullup_filter_deps="gpl" removelogo_filter_deps="avcodec avformat swscale" @@ -3432,7 +3430,7 @@ scale2ref_filter_deps="swscale" scale_filter_deps="swscale" scale_qsv_filter_deps="libmfx" select_filter_select="pixelutils" -sharpness_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" +sharpness_vaapi_filter_deps="vaapi" showcqt_filter_deps="avcodec avformat swscale" showcqt_filter_suggest="libfontconfig libfreetype" showcqt_filter_select="fft" @@ -3471,7 +3469,7 @@ libvmaf_filter_deps="libvmaf pthreads" zmq_filter_deps="libzmq" zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" -scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer" +scale_vaapi_filter_deps="vaapi" vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_select="qsvvpp" @@ -5954,13 +5952,9 @@ check_type "windows.h d3d11.h" "ID3D11VideoContext" check_type "d3d9.h dxva2api.h" DXVA2_ConfigPictureDecode -D_WIN32_WINNT=0x0602 check_type "va/va.h va/va_dec_hevc.h" "VAPictureParameterBufferHEVC" -check_type "va/va.h va/va_dec_vp8.h" "VAPictureParameterBufferVP8" check_struct "va/va.h" "VADecPictureParameterBufferVP9" bit_depth -check_type "va/va.h va/va_vpp.h" "VAProcPipelineParameterBuffer" -check_type "va/va.h va/va_enc_h264.h" "VAEncPictureParameterBufferH264" 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_mpeg2.h" "VAEncPictureParameterBufferMPEG2" check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8" check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9" @@ -6378,18 +6372,17 @@ test_cpp <= 0.35.0" "va/va.h" vaInitialize if enabled vaapi; then - check_lib vaapi_drm "va/va.h va/va_drm.h" vaGetDisplayDRM -lva -lva-drm - check_lib vaapi_x11 "va/va.h va/va_x11.h" vaGetDisplay -lva -lva-x11 -lX11 -fi + check_pkg_config vaapi_drm "libva-drm" "va/va_drm.h" vaGetDisplayDRM + + if enabled xlib; then + check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay + fi -enabled vaapi && check_cpp_condition vaapi_1 "va/va.h" "VA_CHECK_VERSION(1, 0, 0)" +fi if enabled_all opencl libdrm ; then check_type "CL/cl_intel.h" "clCreateImageFromFdINTEL_fn" && diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index d0a6b5817d..ece75c0815 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -389,9 +389,7 @@ static const struct { MAP(VC1, VC1_MAIN, VC1Main ), MAP(VC1, VC1_COMPLEX, VC1Advanced ), MAP(VC1, VC1_ADVANCED, VC1Advanced ), -#if VA_CHECK_VERSION(0, 35, 0) MAP(VP8, UNKNOWN, VP8Version0_3 ), -#endif #if VA_CHECK_VERSION(0, 38, 0) MAP(VP9, VP9_0, VP9Profile0 ), #endif