From patchwork Wed Aug 22 23:44:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10064 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1441444jap; Wed, 22 Aug 2018 16:46:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdapdsxwNkA1qd6rU7d6Wg1Gdf1hLw+i6nfTolEL2JjbDq+ixXCN0U7tsGjD+T8Zm/vnCtxW X-Received: by 2002:a1c:e4c3:: with SMTP id b186-v6mr3499975wmh.116.1534981618653; Wed, 22 Aug 2018 16:46:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981618; cv=none; d=google.com; s=arc-20160816; b=aSbE3brm2c16SWP/guj2qBgsOR+00D3vj29NSY0qIyQzac6wddzrNJAJNwR9XtyJmh Gt7Z6x/PdGkFc3nqST+Y6XhrfW5lZw+PFBPZ0YpkOcjBgDCZUQAM3ldHo3H7wLGw4k7r zJvz9S0JWfBqcKqdmKqLZC8lDmgJIQkL/QVNATHqiALCyT3DfGzOcsPOtH+9M2gY1QAk PtJV2s1ft8aVI6+mGAq+YF5t1/XE5p3wKgb93V+oVvnD/1Q1DjtbLy0mLCMMy8f13IY6 DKNt8JuOp/i2bnHbhaLPkljpHaWy9iiM5ta+Pr6bcjK347x/aK9wCJPYMtBOhp9fk4wz AU+g== 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:arc-authentication-results; bh=Tm3eYkgpO1rWTjjP1WqPb9QkahjEFssGrUjdr4WmzZk=; b=qf7AMLBq6+fCuA1LCj3Oo8YA6tVCa8KYpUNVBHqkq0Q2p1cK8hdXRBREKuxlvAAn0B 0yrA2FyfaIAiuWZi/mJimZcFxW65BAEFP0RJ56nYFVhFAqyNuSMvRZ+gOio0sPO13kG4 MuJoHeeY1dw+DGAYTRZm/O2J42mxdxIhAuwWotWpitQl4ztpCROWJkbNVQB1apZU18Ze lmsG+q3mRK8lgB3jF7CyzJNni57cGbe031oMRHJISyQsPEXHwzSzlLiNnyca9DEBZ6rF 2dZxBXZ8fxSQbaMW8CiWF8vY11kkgU22r6Mqy1C1dCwT86eJE385yoeQilhg7KZTfyFk Jj6g== 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=1QeaeL1N; 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 j2-v6si2385287wrh.290.2018.08.22.16.46.58; Wed, 22 Aug 2018 16:46:58 -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=1QeaeL1N; 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 1837A689E21; Thu, 23 Aug 2018 02:45:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95FCA689C58 for ; Thu, 23 Aug 2018 02:45:28 +0300 (EEST) Received: by mail-wr1-f53.google.com with SMTP id k5-v6so2974100wre.10 for ; Wed, 22 Aug 2018 16:45:30 -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=3IeiAlZNQFelez4MQOsU1KgBXLWTC4qJHp+sMzdL6Ec=; b=1QeaeL1NN5UHGsuSP4LiVor35cgafz4tGfAjodtBbWVKU6OueXFqFxN1qD3JMKmkot KzkNJYOPbrZ3HWJlxWTYyO5HkUNxtadm+0mX0zyxZzRWYBRS6TkPq9xELjLOsEmbd7xT idxanBGdaAoSuu1WwwlAw1/wRXAYKg0sLb2M+/85aGZ+tnLTWOcFKQoDvRk0VvnQIajj ehAtcYil/zX0dLCVpB1/NOHleQY6UWr2YxKWTdGc3zVfapi/OCIj7K2BDu5/3JkV+jQS W1OqqPJ17c0Bmv11eQXMIt7F5iQp1qiBV1Hg7yTHYYrOP0WBcPCl79YO/N7UZj2ge4wh UcmA== 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=3IeiAlZNQFelez4MQOsU1KgBXLWTC4qJHp+sMzdL6Ec=; b=dmf9GMg17WuU/Pn+mIaPykp1qlthJggENO5jFNwBiRWoyKybK94G5DlLb816MS0zSB yzWCi2+rJPeSMBSuVPB32CXXLMdmA4jhpeBSDvcoKNc2ywL/uWJUpePstdGD+HmILWq7 xUubnYY1oJC8PR5Wny6dNMdwMcnFvF5BijkBt//QPOzXO9CcdKEm1E9A7pF69fMi0axz sXeeTM7AZMiffsCuCe34sf/8jAS5eeFCEObxXOVoj6w/QwIpCRIRu2fc7T2lsQolqoAa d9Atz6iavjLtoRG5mIAitheLeV+5KYtHe5yZ1YhlKehW9X8cXBHcVEK6M7hiuH7V6sxE ofBw== X-Gm-Message-State: APzg51BU+RMiX7Q62y2eDF+CPAPg+d+VQ+gsnSDLrInpyI4NSiFB1YLD bJp7F1oB+ESsaQ3BmCKBq2ycVyd8X9w= X-Received: by 2002:adf:c454:: with SMTP id a20-v6mr15724402wrg.20.1534981529336; Wed, 22 Aug 2018 16:45:29 -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 x82-v6sm8184537wmd.11.2018.08.22.16.45.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:28 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:42 +0100 Message-Id: <20180822234514.10571-10-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180822234514.10571-1-sw@jkqxz.net> References: <20180822234514.10571-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v3 09/41] 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 9b5421d5a8..1aab3c60d7 100755 --- a/configure +++ b/configure @@ -2867,7 +2867,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" @@ -2921,7 +2921,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" @@ -2952,7 +2951,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" @@ -3335,7 +3333,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" @@ -3383,7 +3381,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" @@ -3396,7 +3394,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" @@ -3435,7 +3433,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" @@ -5909,13 +5907,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" @@ -6331,18 +6325,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