From patchwork Tue Jul 12 06:27:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6da0:b0:8b:e47:9dbf with SMTP id wl32csp1811625pzb; Mon, 11 Jul 2022 23:28:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v7Ush+14qhP74BoNNANtwY/d21XATlZ8JfnKdcQx781Me//zJA+awgWf9ROcH8aDiuEX5I X-Received: by 2002:a17:907:8a21:b0:728:7984:76d with SMTP id sc33-20020a1709078a2100b007287984076dmr22905288ejc.189.1657607339620; Mon, 11 Jul 2022 23:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657607339; cv=none; d=google.com; s=arc-20160816; b=x7OlSYVqUOJyPD27/Y/TZgRshzZXDM0ivYGx77IwKAQg6Pn2KS1E3ZMEUdG4ooC2bT /CIs4UwdipBb5FVloSWblJd/C8pHn2R71RnFbeJM8gUwS6BM67Z5rd2ka1wpdl25QOp6 n8dip2Vp2Lrw6LXBAsPxN8xNLinNDjJRsYF+gk62A95fFdy6XBfSX5Dy229uNKueWLJE eBAJd78y2JBfqh4fpW4k6wXDLTMBZucNpBG53WWJukuOG2AeGMnc9ziVh3qHmjKQdfsM uV12ELUsYt5IKpyfm1kGmztjSBoh+c15oxI9ByYnI61K7idfO+4Wuc+s7ADiS13dnHMF UaXw== 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=AnwdXoqeq+gGMKX3JXkusg4oX3usHY0A/1vG+GLLbGs=; b=kx7p6OGwZ1pTu1YtfeMIMcfHz2cu89c/VuaBGrk6T7nqYP1vHfzxGvZbLx2NbZmK1V D8r1LN65oSZvapqlFtH7Q5BQ5jExYKmGXjMFnCBeobSQ+5eF0kCP/78GjmG+gI7sPOxm 3Z6UlMHGB5BNNsbIcXS8mlNFPEihhvbrya55X9IKTbW72+OGjqEd6iHNdZMbo65897US 6IVUF1oQM5lvWxSD9aVYFUJcqtM2Rcpu8pgpsfO2bW4pxfurFKOhv5jqtz6dg5NaXfoK c09AgfHeSnOBv342Mn6ynRwsap5tIGPrZL5GEWW6w/WvAJ8vYmzLSifJs2F3Qy+Tf0ox cE1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=GfYAYSEC; 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 z20-20020a05640240d400b0043a8fb8c0a9si15840027edb.452.2022.07.11.23.28.59; Mon, 11 Jul 2022 23:28:59 -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=GfYAYSEC; 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 5737768B89E; Tue, 12 Jul 2022 09:28:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADC9468B7E8 for ; Tue, 12 Jul 2022 09:28:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657607319; x=1689143319; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=6T3q/ixzmvd37cl6Wq8idExBe1EPyKa3CgsePxX190Q=; b=GfYAYSEC4946LxwOAjAq3ETEfbroPl6kruZrk1qYIHzS3PpfQezhZoef L9cmCsx09SnNvUVzWoMq4XGjMu6ge39MSieN86XVOsdiiol6J78ioYvl5 9nene1XPBYB26r8paIZ0ya/CtTBWIU+KgUQS/wmZFSNmR/42klME+2Gpf c5x6WTANfhmqX/BR51vCbzqZ6uQn5jTCvE6iyaDbJwvOJXB+SrUr/8wUR jf0fIKx81MXEkHpsUcj8CVrv5xvsE+bQEhId42mXTcwO+x9T3niRjQSM2 GaSwmLsWiXUUWU3wUiWb73nG+KysKTlFLY09J1x4bFQQU19f6Yt0j6elc w==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="346534434" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="346534434" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:12 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="622381993" Received: from xhh-dg164.sh.intel.com ([10.239.159.146]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2022 23:28:11 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jul 2022 14:27:26 +0800 Message-Id: <20220712062735.20339-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220712062735.20339-1-haihao.xiang@intel.com> References: <20220712062735.20339-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v10 04/13] 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: JzAK903hIXzR 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 25331ccce8..74fc8ff18e 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -19,7 +19,6 @@ */ #include -#include #include #include @@ -37,9 +36,14 @@ #include "qsv_internal.h" #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl)) +#define QSV_HAVE_USER_PLUGIN !QSV_ONEVPL #include "mfxvp8.h" +#if QSV_HAVE_USER_PLUGIN +#include +#endif + int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id) { switch (codec_id) { @@ -323,6 +327,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; @@ -366,6 +371,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 cb1e55ae30..949955bda0 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -65,6 +65,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;