From patchwork Fri Mar 11 08:16:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 34669 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1484769nkb; Fri, 11 Mar 2022 00:17:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuLLeoGKjfWTliGyzZpIbzcnDStIfMXgp9zirOeAac5jiSHpqYflr2RqIIt7gRHfs8xNmn X-Received: by 2002:a17:906:848f:b0:6cf:7234:8ae with SMTP id m15-20020a170906848f00b006cf723408aemr7742639ejx.620.1646986662242; Fri, 11 Mar 2022 00:17:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646986662; cv=none; d=google.com; s=arc-20160816; b=F5a8uPf1n4WXKbPGKbP9r2T3+mgq7wJvJLOzrDDiGLf+Wek5sAwHMi7XejUK1+4joi Pb6HSKFRLUKLRy6kmUTBaiGySfshcKo5jZFrWWsAtp3E1hL/3HMC2i05NvwQSw/wJvLW xBdNwdPtvkx/vOGNA6Euc/Hc8syzQ55HU0hHP6AbXqK2rnV4lVQp0yjqUMC2cyh2PRWv dUrvycT1LHxwSP/kQsSWnO5lqbhGlNUyRvP9FOQBTIHKA3Mv0D2SziFpTsnLT/tvulZC i6R4/x6rIXzNGHhcvwJ7P7K2YTqEBV5ouGbuvZitXqQVzmBzVSzBpToPJqcs0lRiQfkA sNMw== 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:dkim-signature:delivered-to; bh=aG1858o7ySB8sCLVObyZMWGvtLTTxWIBxa837e++L78=; b=jnjPfC5d2MKcTbRMsSQNfX0N29y9X5d2joHvuF48Hp3JOiaMqZ8oQsrYsDCJ+x85d/ tKKLzGnlQQhHLNunssBuIxEcbmve52eh+2MzxdRZbNuMYAE6UtxDR8msJRPNZnCMzoib KV7FRI4nGUmdxb0x1Ku0r7KNqYF0sjz8WosHNpefONeSQt4hfJwKsGJb9mdb6OMMpdXL EX2/40jZM1YW5HDdVfAZ1CEgugqHFWnkEJYDGuW1kkim3KuXN1z4jhenIs3IWUjrPmUy 3cymukavF9fZ9MvoEJ6Vgk51VB6lOKgNzutdszsqPPl2wjXuNV3XiXK2g8pzFlY/q6LV 3Htw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=KttwH6i1; 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 sc35-20020a1709078a2300b006d055cf07dfsi4615511ejc.574.2022.03.11.00.17.41; Fri, 11 Mar 2022 00:17:42 -0800 (PST) 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=@intel.com header.s=Intel header.b=KttwH6i1; 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 18F0668B1D9; Fri, 11 Mar 2022 10:17:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80CC568B1E1 for ; Fri, 11 Mar 2022 10:16:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646986623; x=1678522623; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=C8qi3CFLm0mx7Um1kfmQLb6r4HOkTTw7mBD+WQCLPuk=; b=KttwH6i1FxZvS9i6x07k4uUma2XmCvzBE2VrWS2eZuiXCHuaQAEPn8Nt +9VuSAD2801eFgOQHRAutLh/caAdST9I8VDZPSD/VYCC+P/1Glr05xy7b MVUoOieG2iPoK9gGxayScunTxet+1Gl2oKjoMgnfktbcyLHWcnT+ovGQ1 Rb0YydFgeGF6bijGCAZOCrqpUVrEMsR0FnEPiwm0qO0BON4ork+2aLLKc GqUXbUTnp+8sYixjK27na6uhkB1o8SAw63DCOMTvesaJNr7lzcNLs7aNX WIV0+NWDQdJVs+zBM2dQds+B3r/OBK25YvfHK3+SOlZpGvUJxOQtGpa70 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="237700134" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="237700134" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:53 -0800 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="688997028" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 00:16:52 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 16:16:24 +0800 Message-Id: <20220311081630.21927-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311081630.21927-1-haihao.xiang@intel.com> References: <20220311081630.21927-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v7 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: 3kODwdsMYBjg From: Haihao Xiang 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/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 f749e77d3a..0eb0d83ac0 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) { @@ -307,6 +311,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; @@ -350,6 +355,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 09fc76f6c4..6d6a6eb239 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -62,6 +62,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;