From patchwork Thu Jun 7 23:42:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9285 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp192388jad; Thu, 7 Jun 2018 16:43:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIoSPU7JRdBo3m+M84TlEU5TQnPKIYrZthAgcBfsNnB8r+aoD8zAUw9+tzhhp9HeabiDn16 X-Received: by 2002:a1c:928c:: with SMTP id u134-v6mr2782481wmd.106.1528415037296; Thu, 07 Jun 2018 16:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415037; cv=none; d=google.com; s=arc-20160816; b=mm4uJKWNPVkRgzawDznF+51oZU/JWrl6yOBeek/WCEMB3lztFrR7vvvcbHRJeDpEBT 10muBqCazJC+kyyEjSdZ6nMBrLeN62HB25g8allcxxcpIw3Wvw0gQVyvcdRTiuR5pw55 qGHFdonYDENoD72xynBdWnjxuc3iX92mu5yEWMiyXKZ7hKkRpx745VzihO4VNDeWdPO8 UQfXqf8eeXRSif5AybiS05CeODyY4uZddi5GUR5PZ0PMoXoqNxKXZzhFsFFvzByQsaMl uTmpRGHeURqYSK3f6qR4YWJKHU1V6b+9sQBBR26hzajvBRu1AOvdY8iBlRe8vXHrHSbm tmyw== 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=ZsEdREtuzXgLA9d017DEM9Zdc3PGxE9s3EtZQCeBvaw=; b=kg5MlnaqJfYz6e0LP/dCR7MnaaHwm9lnPXjXVftMZYfxVaa1U8Is6/FAPVKnlkU8L2 Egh+aRNMirxbqQJPy3b0X3c8mwcmdFIFndiQ2ryXolONRhbwcZjEomSTaDGOGXHolXM4 GKVyYpDWyRRxRd2M0bBjX7hkUaVBTW9esfCnjUg9JmE0Ts8C0yxSNawqcCJlt73OISrx SAC56hcodFGWm5u2WzAKIabBOX/iaPdPBdVBuq8S8OUfP31tBxpcm6rnJgTpUg+qcsEa vSnYfuLhEn2Nfs02meX6vJ+uauk8w0ZSPD9JFkFnBtp32nVAhPywJ6HiyJUBcB6f42+8 4tzg== 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=teGhhUPA; 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 i6-v6si62447wmi.219.2018.06.07.16.43.56; Thu, 07 Jun 2018 16:43:57 -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=teGhhUPA; 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 0D17668A677; Fri, 8 Jun 2018 02:42:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 785A268A607 for ; Fri, 8 Jun 2018 02:42:52 +0300 (EEST) Received: by mail-wr0-f180.google.com with SMTP id l41-v6so11522239wre.7 for ; Thu, 07 Jun 2018 16:43:40 -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=WyeOCcW/hCm9HMD6wdrtJFZv6QdmS9mLtqJUvY2QzsY=; b=teGhhUPAxqRDEkBhHWZZghiA7wkqSFMvix68qV83VEBLGw0ok5CyFsueUNMWcofy74 dGczUlna1lVintQp23crwTFsnG0P4TvFIsMRpapze7D3Bd3PJU6OGSlYeMI+yx22Bb8K 9of+igI4yLWnT3BupIuxDugImucRwnss4QQ7VZJk0HkMAFDju5ARwzfGQz6nDlMDLLfX Yt/SiEGE5UbISUY2KPfgmJHTp1MYBMTUvLyfNFNiH5c1T3LPq7Bifxh/REz3DHrK0aWz MhUkl6C3xvahqnWkUk6A/1++oCr07F/ZCVjPncVzG6ZdE6XgymUYpIyOTBz11nDaSGjp l9bg== 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=WyeOCcW/hCm9HMD6wdrtJFZv6QdmS9mLtqJUvY2QzsY=; b=i/lainicQeNmFTnrYpHv22BFmS0tCkKXhaGwKZeZ4eCXUNfnnqQltUQpmx4ji9+XvW Z0kNoFfMjUoXxL3T2AAwyqX+lW5TbAO9lDlTDdLP0eRybfOZwtsDAsqZXLwipN4fAdId 2vPfFIBwn6u6GZ9Q89ByYhhVLajVNub56XBS1Ksg/xqn7WRGKuASi+zIWgfMoHxuZVMt 4qCecLNQIdXuFoGyyKxHfK/iDXS/tHxeZTG1o+Z0Pa470oruioLV0FE0tysbuQP1bj7H RKoQklMknrC5HQManE3F1FNmIm36pq9hanzW/EFO1RMogq6rhz7RSjYyNEUu3f7s/UW4 KGBA== X-Gm-Message-State: APt69E3WZEeYuExvjVTcBZMd3niNU8C9lRBtRCWlwSEcvPtdIL3QKjSo ifDrxiF5xAywt9xRQBIlzqLK6hgH X-Received: by 2002:a5d:4503:: with SMTP id s3-v6mr3214975wrq.191.1528415019520; Thu, 07 Jun 2018 16:43:39 -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 r2-v6sm18640545wrq.55.2018.06.07.16.43.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:38 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:42:56 +0100 Message-Id: <20180607234331.32139-2-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 01/36] 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 is the version in Ubuntu 14.04 LTS - I don't think it's worth keeping support for anything older now. configure | 25 ++++++++----------------- libavcodec/vaapi_decode.c | 2 -- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 53224f0ed5..790f55be14 100755 --- a/configure +++ b/configure @@ -2862,7 +2862,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" @@ -2916,7 +2916,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" @@ -2947,7 +2946,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" @@ -3326,7 +3324,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" drawtext_filter_deps="libfreetype" drawtext_filter_suggest="libfontconfig libfribidi" @@ -3370,7 +3368,7 @@ perspective_filter_deps="gpl" phase_filter_deps="gpl" pp7_filter_deps="gpl" pp_filter_deps="gpl postproc" -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" @@ -3382,7 +3380,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" @@ -3419,7 +3417,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" @@ -5891,13 +5889,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" @@ -6310,14 +6304,11 @@ 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 + check_pkg_config vaapi_drm "libva-drm" "va/va_drm.h" vaGetDisplayDRM + check_pkg_config vaapi_x11 "libva-x11" "va/va_x11.h" vaGetDisplay fi enabled vaapi && 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