From patchwork Thu Apr 28 09:23:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 35458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp3473465pzh; Thu, 28 Apr 2022 02:27:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNBVqpd4AjFrzUq3tmojoj3cyPWTYproFEZXjgzXy5PYJRn/G9ANvpyw5CF2ETy7iRfStI X-Received: by 2002:a05:6402:2813:b0:425:eedb:9b6 with SMTP id h19-20020a056402281300b00425eedb09b6mr19049120ede.139.1651138042401; Thu, 28 Apr 2022 02:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651138042; cv=none; d=google.com; s=arc-20160816; b=HQr2FXDjyBCjX0E5XeiSjs8RC45wWtTYq61w0DIwhBoBhDb9VClUHxefB4vfEexaTd wfOu8jEEd7kmXQCvUohLJUdL1AWQvcuOwsPVP+PUCGIhJUJQ4dA37bx0ZLIQZbhpC7XI flFRqTD58ZQyKVk+65gV7/4OQ4QuNOe2hy+AywAXWo5ww/X/U7GfGPiA58TTe16TAW10 L4LwkOA3jF5R81K/ox4xwoKqzwOgETxEIa1gLp3SYHgYN91YbY1o9oZoAjLhzCb5q3mp Vj+p4o91JMwvvwdnXbxe0fsUlJac8/dzvfYkqOWk2GuaS98ywiVxOftB2PTGoJ0L9Gmf xNyQ== 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=n0ur+YeMr3x8axhv+odWxVLk2uhzNvdI6hZ3SlbOc+U=; b=lmN9yKnPywDfHMLoOUgMxidLbXLhJ4EUeHenJTGzh880Nd7tJGm2aY4P+s+vnzrMbq vrFKikH1qEJLY0z1SNmXA/DagWfa1Od+F7jh1V/dpl19uW2vABf95DDTZW/r3ZK0ES4l EgLUmvy4kBNwEUzsWbZYRW9OQOkRt5940hjeH1zrMNj+GYMnfOqsNwpnJwVYSfOcZ0yg S8vqQkmFPUFd/5axLZkNBgMIC6ZFQ41kcAYpe8Zk1euscisnQgzldYtA8Sya84XjEeNa XXLdimgoVKIYiesp3py+ZppdqgRhq4RTAJFqjstoTViLhqQ3/lsrInxvXVA2OuoZEahK upaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="oF9Ce/Gf"; 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 io14-20020a17090780ce00b006f3c67436edsi3198304ejc.459.2022.04.28.02.27.22; Thu, 28 Apr 2022 02:27:22 -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=@intel.com header.s=Intel header.b="oF9Ce/Gf"; 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 9E84E68B22C; Thu, 28 Apr 2022 12:26:46 +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 89FC868B39C for ; Thu, 28 Apr 2022 12:26:39 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651138004; x=1682674004; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=IFGopMjoFo7l+vVNh51RaF/j51UQemf9b593/7lKKLo=; b=oF9Ce/GfQ1VHNaCq9HkSvy0Xz454R3fWrocElDvq+mJ+AxTJY56XTUUM ghnLAZWnvJfMekri8ItrXHPt//TZf5VqAUAY2uR1OTNj/ovmO5iMaEpvy PDWZ2CN48tygPClGHXuKIoFEWsWxKm3EsG70LIB26eTwo0g2Kw04JM5Sh JwD5qIgAtcH1K3APGRo7CWkcDu4uwc8fKglAFUQ2nmNq0czqLTlREuf3L DrDSw5HIfoHE+0onZUErcmyXx/A+Nznl+GlWh2z+3unH01nv7c8mEPFlS q8Xo/qvpY5Or+uPStBRicK/tDn5ssGYboA1ERz7SRbbyfi7bqwuVbDlMN w==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="266381410" X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="266381410" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2022 02:26:39 -0700 X-IronPort-AV: E=Sophos;i="5.90,295,1643702400"; d="scan'208";a="581176005" Received: from zhao12-mobl.ccr.corp.intel.com (HELO hxiang-desk.ccr.corp.intel.com) ([10.254.214.89]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2022 02:26:33 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Apr 2022 17:23:21 +0800 Message-Id: <20220428092327.16558-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220428092327.16558-1-haihao.xiang@intel.com> References: <20220428092327.16558-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v08 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: b8P8ANrY2k85 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 95e721566a..f66b388625 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) { @@ -343,6 +347,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; @@ -386,6 +391,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 49d5797fbc..4c1ccc7342 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;