From: Haihao Xiang Date: Tue, 4 Aug 2020 04:53:35 +0000 (+0800) Subject: msdk: don't load user plugins for MFX version 2.0+ X-Git-Tag: 1.19.3~507^2~407 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=967c835ea6849867affc67d03a3c08bfba0a665b;p=platform%2Fupstream%2Fgstreamer.git msdk: don't load user plugins for MFX version 2.0+ MFX version 2.0+ no longer supports user plugins, please refer to the links for details https://spec.oneapi.com/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html#msdk-full-name-feature-removals https://github.com/oneapi-src/oneVPL This is in preparation for oneVPL support Part-of: --- diff --git a/sys/msdk/msdk.c b/sys/msdk/msdk.c index df7fd75..d085991 100644 --- a/sys/msdk/msdk.c +++ b/sys/msdk/msdk.c @@ -492,6 +492,7 @@ gboolean gst_msdk_load_plugin (mfxSession session, const mfxPluginUID * uid, mfxU32 version, const gchar * plugin) { +#if (MFX_VERSION < 2000) mfxStatus status; status = MFXVideoUSER_Load (session, uid, version); @@ -506,6 +507,7 @@ gst_msdk_load_plugin (mfxSession session, const mfxPluginUID * uid, GST_WARNING ("Media SDK Plugin for %s load warning: %s", plugin, msdk_status_to_string (status)); } +#endif return TRUE; } diff --git a/sys/msdk/msdk.h b/sys/msdk/msdk.h index 87867f6..8f11d80 100644 --- a/sys/msdk/msdk.h +++ b/sys/msdk/msdk.h @@ -43,7 +43,19 @@ #include #include + +#if (MFX_VERSION < 2000) #include +#else +#define mfxPluginUID char +static const char MFX_PLUGINID_HEVCD_SW; +static const char MFX_PLUGINID_HEVCD_HW; +static const char MFX_PLUGINID_HEVCE_SW; +static const char MFX_PLUGINID_HEVCE_HW; +static const char MFX_PLUGINID_VP8D_HW; +static const char MFX_PLUGINID_VP9E_HW; +static const char MFX_PLUGINID_VP9D_HW; +#endif G_BEGIN_DECLS