From patchwork Thu Jun 2 03:41:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 36048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3803251pzj; Wed, 1 Jun 2022 20:42:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJiFqS6OLCjnWC+qfflpu21EcsAUPHlqyHIHXDZ7h1cjlWhwFk4jPcVd9+YElIVA6t4t63 X-Received: by 2002:a05:6402:388d:b0:42a:ba9f:f85c with SMTP id fd13-20020a056402388d00b0042aba9ff85cmr3174922edb.292.1654141362275; Wed, 01 Jun 2022 20:42:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654141362; cv=none; d=google.com; s=arc-20160816; b=g7fV5ZUv+PMYnc8IZoJeUhCu+drMN/vGWT8354oEBmo5WZRrj0dYvs3/V9TQBtbW/u GWJESMR9dqRZ8wZXGS80U8wunRB0WUPodru8Ww8E9CBjbIZo+nHsrdPxVm7Adk9dUKY0 KAFrtAkD6YZHo91gswjESdzszVJYoNI/L2+6bCMj3ch9TY/9i//DZqfI+ud3LHjLoWxC luAVHPib+kI9ARy9xJf1HlWfMDtg9QNu9vxXQ7jkLf+cLd5528Qdy4aRPpUb4i9dJ/n6 INgvPGLm0N7jQXq6mDcqKflhN92wSnXyFMhn5sOzrebFNXACL54kwIhZQkgoBtIhl8W/ g2qQ== 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=/UBGz3FgLNhPwT62BMHE84PFgHvMucJpDV63LGSndOI=; b=EPTQZFcqyhFEz0SeIivbD+SnT+utckcyTxZoD92kOQ+kWFpandIMzFn9iTlg7q781o nK123J1XwRXm0nvhggpOEGKnSTdgGVb8uOiieDqr8PxYQVlljjiX//ugaLAw+vy1g+Ud dMCsG01KBNRLVUj8wJf7/legP1an1EzAZsxY0yTTadBmDLJ5BGCRRcCwGdPFmewjMDbY UfKLFjPfeeYI+ANaU96tnQFn7GyY5FmFFShdDtsKsU7hTuBL+R74IcPLHtkkM3B3KUsr ErzOHt0xbEXJnrzkG7fuk/0VSfRnKG6lnfHa3fxYbtUjwXjpGJoxpLvx6BMbGgviSaBy Qj2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jQQ7ry6C; 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 hu8-20020a170907a08800b0070b8f04928bsi63439ejc.210.2022.06.01.20.42.41; Wed, 01 Jun 2022 20:42:42 -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=jQQ7ry6C; 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 8C9A568B804; Thu, 2 Jun 2022 06:42:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F395968B7FC for ; Thu, 2 Jun 2022 06:41:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654141325; x=1685677325; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ktfPp9J23gaaGGZowjjPwPMCNWwE7UT3TQ2iy9L16IE=; b=jQQ7ry6C4FCIGUJeoUVXIpWkw/yS7NuT8WaELvYJn/OKmPUiXwFk+m/1 ItuBDdJhLiKbhkUCYZUCnejUnMSMJcjp1vuMX2mhQRkN0T9KR2ElJ2eHF wWSODWSF6Vs6by2kcWyaBbP1hlRNeUbvtGo/Kj0qdECt/7k7lGVf4Lbu5 xySWr5xzB7nnEf1CH4Nw4Ylf2pcZMqUgmNe900Gmk+HP/zrUiUgYJmdMr aUzOHzhXP2b4x6zfyGTsDIJTc7b1jWela6OikzsYd19jcFvSDpaIRoVAt s/ei2LE51rEMZ1DyIe54jhJM9v2fHJhJNIu/zbbRv8kFh1a1WFfZ+pqfV Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="362181644" X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="362181644" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:53 -0700 X-IronPort-AV: E=Sophos;i="5.91,270,1647327600"; d="scan'208";a="552629563" Received: from xhh-dg164.sh.intel.com ([10.239.159.54]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 20:41:52 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jun 2022 11:41:12 +0800 Message-Id: <20220602034118.22447-5-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220602034118.22447-1-haihao.xiang@intel.com> References: <20220602034118.22447-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v9 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: AM5GBvWauhUg 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 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;