From patchwork Fri Oct 15 13:39:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 31123 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp379025ioa; Fri, 15 Oct 2021 06:40:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLKKz1HFXI2F1uGQ+F5ivetM+goR4KtN0zRbN+r1nKpINgBapSMvQn4H5/1I3u+WDFkKGp X-Received: by 2002:a17:906:48ce:: with SMTP id d14mr7203690ejt.336.1634305223670; Fri, 15 Oct 2021 06:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634305223; cv=none; d=google.com; s=arc-20160816; b=H81pAVBmhn852lSt4cP4wbR24p0FD5FNne0tl6cO5IxPwt1ezvznPDQ17IPvlHOnWn YtmyxAFQtepypY0ZDrKgtI0UykR/sKfIVw0Y53SkfUrpOLdn9ecBQE1CJVuhbiuxBJkb 1slJHpvSHK4oy8WPMSmyqTRzzoXMh/hxP4ZKnVCY+69Uu68HFrTlJzgou39gTa0z8du0 WnxP+0hscT/d1OtjHb+Gply6Aisi8WHsON4DkNjnd41L0bVtP9AqUWMulJUMXMmCrX8w umGd1k1cLyWc2MaAYz/sYVLiOQofBLkclkGWfHS1wwViQPI7H6o0s1MDvmIGyCl3gZgs pkCA== 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=oVJZmpxPf3chIli/qzwN1CMMiC/754nzmZ72JB6KNkA=; b=z2tRJCXdad60LnHRpqlma3ZWLi5rAdlmL21GtcZmyLSuWj999IGGUeGH0+oAdhO9f8 yxOzcv3WWJVC3GS+B0P2d5k7IY+b4egGSoUpxtN+5ZTHnCC+6lacdaPSyiIVSyhkcIeg o3dGGJe8OaE1GbpQuNpng4PdTnN4VFccv9CkQDsIgTUy+zCbm4xin08gl8OXNX9/Efnn mDEdwvbt7Y2wIn8frJkH2xrBECHvZXqIbvvJikQU0vuNnJBjIWqaOLQmRPHPC1z2Ihc7 erM5aJVtpguLWlv/gJ/h4fCdfQbCIpBelAi5ITXS5XzfCjq1vsdW5vwIcxiVB9MUWYIO V+6w== 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 p2si7719756ejo.366.2021.10.15.06.40.23; Fri, 15 Oct 2021 06:40:23 -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 AAAB368A9D3; Fri, 15 Oct 2021 16:39:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D056368A9C0 for ; Fri, 15 Oct 2021 16:39:37 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="226686981" X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="226686981" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:32 -0700 X-IronPort-AV: E=Sophos;i="5.85,375,1624345200"; d="scan'208";a="442524781" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2021 06:39:31 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Oct 2021 21:39:09 +0800 Message-Id: <20211015133915.13624-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211015133915.13624-1-haihao.xiang@intel.com> References: <20211015133915.13624-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v6 04/10] qsv: load user plugin for MFX_VERSION < 2.0 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: R3J6D+BP3V9g User plugin isn't supported for MFX_VERSION >= 2.0[1][2]. This is in preparation for oneVPL Support [1]: https://spec.oneapi.io/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html#msdk-full-name-feature-removals [2]: https://github.com/oneapi-src/oneVPL --- libavcodec/qsv.c | 8 +++++++- libavcodec/qsv_internal.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 84f0401b0f..83056e5976 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -19,7 +19,6 @@ */ #include -#include #include #include @@ -37,11 +36,16 @@ #include "qsv_internal.h" #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) +#define QSV_HAVE_USER_PLUGIN !QSV_ONEVPL #if QSV_VERSION_ATLEAST(1, 12) #include "mfxvp8.h" #endif +#if QSV_HAVE_USER_PLUGIN +#include +#endif + int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) { switch (codec_id) { @@ -291,6 +295,7 @@ enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type) static int qsv_load_plugins(mfxSession session, const char *load_plugins, void *logctx) { +#if QSV_HAVE_USER_PLUGIN if (!load_plugins || !*load_plugins) return 0; @@ -334,6 +339,7 @@ load_plugin_fail: if (err < 0) return err; } +#endif return 0; diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 24c3e9307e..659417ded8 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -60,6 +60,8 @@ ((MFX_VERSION.Major > (MAJOR)) || \ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR))) +#define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0) + typedef struct QSVMid { AVBufferRef *hw_frames_ref; mfxHDLPair *handle_pair;