From patchwork Wed Jul 20 08:39:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36859 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp2255139pzb; Wed, 20 Jul 2022 01:41:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLlPlC57ZnGbpAEmq6R96ol5wLF5rED+UR9WPUD910yRAZgZ+BOjSuyxdlhYtiQx05wAb/ X-Received: by 2002:a05:6402:1914:b0:43a:d59b:5e79 with SMTP id e20-20020a056402191400b0043ad59b5e79mr48894896edz.124.1658306473596; Wed, 20 Jul 2022 01:41:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658306473; cv=none; d=google.com; s=arc-20160816; b=fKDjswal6zrgGiPmCdSPxps2+Xqo/aAql+u1bOsVamzvXkkpto1qaR+gj+HqWRG8fi Bn7QbLF70SfOLmWfO67h7COVKSFTMcRBY6ADtbQYOs5q2L63UwhtBtTURlL20d3Jj0xJ apqJ6ZCtTO2FLde+8sXC8n90CyAwVwAFHsv75HAkzceN5fv2JYykNqv5BtS6Jzc/LXZs C6cV9SrQntzO958dpeIdPhy9iDlZexhGMXXffS66+5RxwrJ/2NjtGddNlIchIbrH0zZI lc7EcnE4di24gD3jgGU12v4YzbntDVCm4JnaKY4ENcLqbLKa8erVYHc55T8BQm2Tazb/ eOPA== 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=Qo1pKjR7ogNzOLSmn3Oeb4fok5PIU+x7L/FaNr911h+cwR4NSrpib36JIRoDSO+uko w4Z77KNo4Zu2PRzoCikNmiBOijPXHbvASNlUdGCKxRcB55XPVw6Ltfj3rE53Vk4BJJSK 8kzyV7HKvJov9cCK6hLTGdRoI1kQQ4zmR1xSmEpONEjdgR4+ERq+MIUO3Gj0H/OtNaLe 5IrJGb5dwMj9/0xOy/EA0NRJ/HZb1uiVm9xeAAUr7JYnlSpOhK+CuTlLresK4CQdcTqO a4yUX+JdGV9ROz9gh3IEaC2nW5QpiFz5PLdZ9lHa+aLYaJ9kzXwXJOgiFvRTcyabyWHj fi+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=fNKomjWX; 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 ce7-20020a170906b24700b0072b3a874867si16170941ejb.874.2022.07.20.01.41.13; Wed, 20 Jul 2022 01:41:13 -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=fNKomjWX; 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 908ED68B6CC; Wed, 20 Jul 2022 11:40:40 +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 61D8668B75C for ; Wed, 20 Jul 2022 11:40: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=1658306438; x=1689842438; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=6T3q/ixzmvd37cl6Wq8idExBe1EPyKa3CgsePxX190Q=; b=fNKomjWXPHPPqg1E+4QvT9cSxEylfcCAy1k1+UoTokSyCRmbUXHQ+yal 3d9nQXk+DnjbeXlov6axn+jCbZl4mh3/LE4IdHjZ0GsFFMB+19xsizxnc MuqsLgoqjyRrCuFHs5y5fzX6JqknC3jeQlMeNV6fQyalVMVByqb4idsJ4 9EG9wThutW0lTUb5O/fNebxcm6ZlJ0njgRO/ETieZI1Bp7Bsk47sW+iht WpB9YIoI3RmWF1VI+Gw/V9TVzbfMvgDU79LNDJSq5pRlIsbwWqvK7HQcM 9rixpGvi+cLVFMP7b4HfFevQSpoW9oFAeO7AiapWKCNrHMPQbFPZTgIjR w==; X-IronPort-AV: E=McAfee;i="6400,9594,10413"; a="348412499" X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="348412499" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:28 -0700 X-IronPort-AV: E=Sophos;i="5.92,286,1650956400"; d="scan'208";a="625574651" Received: from xhh-dg164.sh.intel.com ([10.238.5.169]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jul 2022 01:40:27 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Jul 2022 16:39:57 +0800 Message-Id: <20220720084006.5033-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220720084006.5033-1-haihao.xiang@intel.com> References: <20220720084006.5033-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v11 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: cPhmbDw7ilWo 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;