From patchwork Mon Aug 16 07:33:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29551 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1799321iov; Mon, 16 Aug 2021 00:33:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAOUMclq1C2lXGSaAKBdN8L0qf8a+RccixvNCZm4KWFVWPG68ogSYJ8qR0gGX1kYLCh31M X-Received: by 2002:a17:907:1b06:: with SMTP id mp6mr15057884ejc.188.1629099234285; Mon, 16 Aug 2021 00:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629099234; cv=none; d=google.com; s=arc-20160816; b=vUffKcVN5/wt9pbIaku1xnUwaSV8uOZHb2rc4zE8dcTRZ7iiY0rkia0ovcVkzCYOYu AECulMsaH1hYpLo2Bwi44+RXuO5JKzQJE+kjbljMQ3+4U7LvSMtZq2m4xzrVpsIb+9B7 TKTmvAouB+3lJxgjW6xrLTR/HdzZOv6YtBvtYZJoOTZ5/2eHs6/ALfORaN5qzUw2rh6b GyCwNNFroPJKk1MNLHxdJtBrG9qg6A/xGCLO/yOz51QEepRFFXxRBiGl7K6RrDTamSFy tk4AmSkJxAlif9KxyWx6/cI1Ole5FLUde6jHWgjSljo50K4ijavjsqKAfEsWrbbtViu2 akWA== 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:cc: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:delivered-to; bh=XaeDIlG29UPXqCN1cbX2rUiHxI/3MN9DbyuLSIRE5+c=; b=rGZbw2kYfxIS2k9QkEyjyOeD1zVPaE5wswdx5pnKy4wrmH1+bqCtDI1DmloY+NQQ60 giXLFCihrnDKkrolP45Umclr8vqAn70LDcZ6K7eEqbJgWZ6WYzdctATckK5AIqRpeInT pSJsnaKef+bjxfIkUgXkkjZDWna1o/C3b3XvIA6e9E2NxndQ5bMqJ0JGYPlrXRW8oPZB 8YETSbeE/XI8smmwPQaIi0h+sNm6osXXyLLjAksMSrb3DwJGSS1qheyeGUUtn7YjfWaH gP40p9m96O3R+VoYYOq/BLY3AjfGrbFXjN01Vjc3F5axQ+jP+kr0jzF4R4SllvEQli9K 5KEA== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hg14si8983460ejc.653.2021.08.16.00.33.53; Mon, 16 Aug 2021 00:33:54 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B84768A539; Mon, 16 Aug 2021 10:33:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2F3568092F for ; Mon, 16 Aug 2021 10:33:42 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10077"; a="203011855" X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="203011855" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 00:33:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,324,1620716400"; d="scan'208";a="519461820" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2021 00:33:39 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Aug 2021 15:33:16 +0800 Message-Id: <20210816073325.27020-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210816073325.27020-1-haihao.xiang@intel.com> References: <20210816073325.27020-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v2 01/10] configure: ensure --enable-libmfx uses libmfx 1.x 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 Cc: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3E0JNka/WaBK Intel's oneVPL is a successor to MediaSDK, but removed some obsolete features of MediaSDK[1]. Some early versions of oneVPL still uses libmfx as library name[2], however some of obsolete features, including OPAQUE memory, multi-frame encode, user plugins and LA_EXT rate control mode etc, have been enabled in QSV, so user can not use --enable-libmfx to enable QSV if using an early version of oneVPL SDK. In order to make sure user builds FFmpeg against a right version of libmfx, this patch added a check for the version of libmfx and warning message about the used obsolete features. [1] https://spec.oneapi.io/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html [2] https://github.com/oneapi-src/oneVPL --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index af8a934af9..4bdb8bac18 100755 --- a/configure +++ b/configure @@ -6436,8 +6436,11 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_ # Media SDK or Intel Media Server Studio, these don't come with # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. -enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } +enabled libmfx && { { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit || + { require "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } && + warn "build FFmpeg against libmfx 1.x, obsolete features of libmfx such as OPAQUE memory,\n"\ + "multi-frame encode, user plugins and LA_EXT rate control mode are enabled"; } + if enabled libmfx; then check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9" fi