From patchwork Sat Sep 18 02:29:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 30330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2752594iov; Fri, 17 Sep 2021 19:31:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOsNNeuhJTWl96Unnl2mPhM8fjVsD5+NLDQGN4oxGA+WwMCHgyZtSso7xtMFaP+n8cEHME X-Received: by 2002:a17:906:184e:: with SMTP id w14mr15691123eje.526.1631932276686; Fri, 17 Sep 2021 19:31:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631932276; cv=none; d=google.com; s=arc-20160816; b=LtptTAABYR0rwssqkSZKZjR/AjRiFf359nzAf1YaOCD1lFHns1g3nPhwzDwLYPqcZF lgkziZExinMcFePn0ND6YY8MIvGymxNq91jon9v6aRViqD6wLQe2D+VAb61gRd8h++SB I4SMlN5eC7i8zDG4vUmjv0B+khg0UjVH25SZ2HQa0kg4/cXnLTj7sdmR2vKl0veLwHrh /2Agx0GsgMnmYCEQghOOBSjynJNodITtWsCoZO6E2svhcMFrZ3X7vAaELsL5VMpOjWdF DvzAh9qP5TKwROCEhUzNAH+6vGfJVNV7iS7Fh26WZrizF3HDTc2XG9U4Y8poJAJgAJ8y DUwA== 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=5Uq4gE/kBi0clrb/QRKhlqqynbVTLel4gG+dD7gHPcA=; b=NESf81iQQAj/6wP1yyybtyivAkf+yMyZCMO4xVQ4UZ5l8weuJ7h9bd3Jf4Tcr60BhX D8NC9AT9Aqdh5jAY9WJsnc4iWp0tkPy2KO8TMsPTGrZdyQC9tnbZ0298HYKl30YXrzqf bqrPOEAI2MG4lty/W3WdPo0qdGG6NoWO9nQF+AaqJZ0Fyk/BJ3i8cyXyV/++HbkBwkB8 fgJyRjJ4A2935GVEnKWu0/2cwnbYU+y1LrLSau/ZtFVgz7g3ge98MhZ3x5J9HpY8YZVP m6/pgNjB31TYTnjvmsdliXsxYO/ZhEnqC8LQqCgL2is2ItEZCGAlskTQMplmb6IhGn3z YxMg== 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 v1si11169257ejd.643.2021.09.17.19.31.16; Fri, 17 Sep 2021 19:31:16 -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 05DBF68B180; Sat, 18 Sep 2021 05:30:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F01D68B179 for ; Sat, 18 Sep 2021 05:30:33 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10110"; a="222563142" X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="222563142" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 19:30:28 -0700 X-IronPort-AV: E=Sophos;i="5.85,303,1624345200"; d="scan'208";a="473303705" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2021 19:30:27 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Sep 2021 10:29:59 +0800 Message-Id: <20210918023005.30128-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210918023005.30128-1-haihao.xiang@intel.com> References: <20210918023005.30128-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v3 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: 3GvCHogzIxrE 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 dbaeed503c..fc2bf6b85d 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;