mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
msdk: Adjust the plugin and factories description based on MFX_VERSION.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2485>
This commit is contained in:
parent
846cf3b20c
commit
580ac55194
19 changed files with 40 additions and 34 deletions
|
@ -193,5 +193,5 @@ plugin_init (GstPlugin * plugin)
|
|||
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
|
||||
GST_VERSION_MINOR,
|
||||
msdk,
|
||||
"Intel Media SDK based elements",
|
||||
"MFX API (" MFX_API_SDK ") based elements",
|
||||
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkav1dec
|
||||
* @short_description: Intel MSDK AV1 decoder
|
||||
*
|
||||
* AV1 video decoder based on Intel Media SDK
|
||||
* AV1 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -118,7 +118,7 @@ gst_msdkav1dec_class_init (GstMsdkAV1DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK AV1 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"AV1 video decoder based on Intel Media SDK",
|
||||
"AV1 video decoder based on " MFX_API_SDK,
|
||||
"Haihao Xiang <haihao.xiang@intel.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &sink_factory);
|
||||
|
|
|
@ -384,7 +384,7 @@ gst_msdkdec_init_decoder (GstMsdkDec * thiz)
|
|||
FrameInfo.ChromaFormat : MFX_CHROMAFORMAT_YUV420;
|
||||
|
||||
session = gst_msdk_context_get_session (thiz->context);
|
||||
/* validate parameters and allow the Media SDK to make adjustments */
|
||||
/* validate parameters and allow MFX to make adjustments */
|
||||
status = MFXVideoDECODE_Query (session, &thiz->param, &thiz->param);
|
||||
if (status < MFX_ERR_NONE) {
|
||||
GST_ERROR_OBJECT (thiz, "Video Decode Query failed (%s)",
|
||||
|
|
|
@ -575,7 +575,7 @@ gst_msdkenc_init_encoder (GstMsdkEnc * thiz)
|
|||
break;
|
||||
}
|
||||
|
||||
/* validate parameters and allow the Media SDK to make adjustments */
|
||||
/* validate parameters and allow MFX to make adjustments */
|
||||
status = MFXVideoVPP_Query (session, &thiz->vpp_param, &thiz->vpp_param);
|
||||
if (status < MFX_ERR_NONE) {
|
||||
GST_ERROR_OBJECT (thiz, "Video VPP Query failed (%s)",
|
||||
|
@ -738,7 +738,7 @@ gst_msdkenc_init_encoder (GstMsdkEnc * thiz)
|
|||
thiz->param.ExtParam = thiz->extra_params;
|
||||
}
|
||||
|
||||
/* validate parameters and allow the Media SDK to make adjustments */
|
||||
/* validate parameters and allow MFX to make adjustments */
|
||||
status = MFXVideoENCODE_Query (session, &thiz->param, &thiz->param);
|
||||
if (status < MFX_ERR_NONE) {
|
||||
GST_ERROR_OBJECT (thiz, "Video Encode Query failed (%s)",
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkh264dec
|
||||
* @short_description: Intel MSDK H264 decoder
|
||||
*
|
||||
* H264 video decoder based on Intel Media SDK
|
||||
* H264 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -171,7 +171,7 @@ gst_msdkh264dec_class_init (GstMsdkH264DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK H264 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"H264 video decoder based on Intel Media SDK",
|
||||
"H264 video decoder based on " MFX_API_SDK,
|
||||
"Scott D Phillips <scott.d.phillips@intel.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkh264enc
|
||||
* @short_description: Intel MSDK H264 encoder
|
||||
*
|
||||
* H264 video encoder based on Intel Media SDK
|
||||
* H264 video encoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -807,7 +807,7 @@ gst_msdkh264enc_class_init (GstMsdkH264EncClass * klass)
|
|||
|
||||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK H264 encoder", "Codec/Encoder/Video/Hardware",
|
||||
"H264 video encoder based on Intel Media SDK",
|
||||
"H264 video encoder based on " MFX_API_SDK,
|
||||
"Josep Torra <jtorra@oblong.com>");
|
||||
gst_element_class_add_static_pad_template (element_class, &src_factory);
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkh265dec
|
||||
* @short_description: Intel MSDK H265 decoder
|
||||
*
|
||||
* H265 video decoder based on Intel Media SDK
|
||||
* H265 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -193,7 +193,7 @@ gst_msdkh265dec_class_init (GstMsdkH265DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK H265 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"H265 video decoder based on Intel Media SDK",
|
||||
"H265 video decoder based on " MFX_API_SDK,
|
||||
"Scott D Phillips <scott.d.phillips@intel.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkh265enc
|
||||
* @short_description: Intel MSDK H265 encoder
|
||||
*
|
||||
* H265 video encoder based on Intel Media SDK
|
||||
* H265 video encoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -843,7 +843,7 @@ gst_msdkh265enc_class_init (GstMsdkH265EncClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK H265 encoder",
|
||||
"Codec/Encoder/Video/Hardware",
|
||||
"H265 video encoder based on Intel Media SDK",
|
||||
"H265 video encoder based on " MFX_API_SDK,
|
||||
"Josep Torra <jtorra@oblong.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &sink_factory);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkmjpegdec
|
||||
* @short_description: Intel MSDK MJPEG decoder
|
||||
*
|
||||
* MJPEG video decoder based on Intel Media SDK
|
||||
* MJPEG video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -125,7 +125,7 @@ gst_msdkmjpegdec_class_init (GstMsdkMJPEGDecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK MJPEG decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"MJPEG video decoder based on Intel Media SDK",
|
||||
"MJPEG video decoder based on " MFX_API_SDK,
|
||||
"Scott D Phillips <scott.d.phillips@intel.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &sink_factory);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkmjpegenc
|
||||
* @short_description: Intel MSDK MJPEG encoder
|
||||
*
|
||||
* MJPEG video encoder based on Intel Media SDK
|
||||
* MJPEG video encoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -193,7 +193,7 @@ gst_msdkmjpegenc_class_init (GstMsdkMJPEGEncClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK MJPEG encoder",
|
||||
"Codec/Encoder/Video/Hardware",
|
||||
"MJPEG video encoder based on Intel Media SDK",
|
||||
"MJPEG video encoder based on " MFX_API_SDK,
|
||||
"Scott D Phillips <scott.d.phillips@intel.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &src_factory);
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
* @title: msdkmpeg2dec
|
||||
* @short_description: Intel MSDK MPEG2 decoder
|
||||
*
|
||||
* MPEG2 video decoder based on Intel Media SDK
|
||||
* MPEG2 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -145,7 +145,7 @@ gst_msdkmpeg2dec_class_init (GstMsdkMPEG2DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK MPEG2 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"MPEG2 video decoder based on Intel Media SDK",
|
||||
"MPEG2 video decoder based on " MFX_API_SDK,
|
||||
"Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkmpeg2enc
|
||||
* @short_description: Intel MSDK MPEG2 encoder
|
||||
*
|
||||
* MPEG2 video encoder based on Intel Media SDK
|
||||
* MPEG2 video encoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -210,7 +210,7 @@ gst_msdkmpeg2enc_class_init (GstMsdkMPEG2EncClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK MPEG2 encoder",
|
||||
"Codec/Encoder/Video/Hardware",
|
||||
"MPEG2 video encoder based on Intel Media SDK",
|
||||
"MPEG2 video encoder based on " MFX_API_SDK,
|
||||
"Josep Torra <jtorra@oblong.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &src_factory);
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
* @title: msdkvc1dec
|
||||
* @short_description: Intel MSDK VC1 decoder
|
||||
*
|
||||
* VC1/WMV video decoder based on Intel Media SDK
|
||||
* VC1/WMV video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -203,7 +203,7 @@ gst_msdkvc1dec_class_init (GstMsdkVC1DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK VC1 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"VC1/WMV video decoder based on Intel Media SDK",
|
||||
"VC1/WMV video decoder based on " MFX_API_SDK,
|
||||
"Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
* @title: msdkvp8dec
|
||||
* @short_description: Intel MSDK VP8 decoder
|
||||
*
|
||||
* VP8 video decoder based on Intel Media SDK
|
||||
* VP8 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -190,7 +190,7 @@ gst_msdkvp8dec_class_init (GstMsdkVP8DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK VP8 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"VP8 video decoder based on Intel Media SDK",
|
||||
"VP8 video decoder based on " MFX_API_SDK,
|
||||
"Hyunjun Ko <zzoon@igalia.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
* @title: msdkvp9dec
|
||||
* @short_description: Intel MSDK VP9 decoderr
|
||||
*
|
||||
* VP9 video decoder based on Intel Media SDK
|
||||
* VP9 video decoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -185,7 +185,7 @@ gst_msdkvp9dec_class_init (GstMsdkVP9DecClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK VP9 decoder",
|
||||
"Codec/Decoder/Video/Hardware",
|
||||
"VP9 video decoder based on Intel Media SDK",
|
||||
"VP9 video decoder based on " MFX_API_SDK,
|
||||
"Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
|
||||
|
||||
gst_msdkdec_prop_install_output_oder_property (gobject_class);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
* @title: msdkvp9enc
|
||||
* @short_description: Intel MSDK VP9 encoder
|
||||
*
|
||||
* VP9 video encoder based on Intel Media SDK
|
||||
* VP9 video encoder based on Intel MFX
|
||||
*
|
||||
* ## Example launch line
|
||||
* ```
|
||||
|
@ -280,7 +280,7 @@ gst_msdkvp9enc_class_init (GstMsdkVP9EncClass * klass)
|
|||
gst_element_class_set_static_metadata (element_class,
|
||||
"Intel MSDK VP9 encoder",
|
||||
"Codec/Encoder/Video/Hardware",
|
||||
"VP9 video encoder based on Intel Media SDK",
|
||||
"VP9 video encoder based on " MFX_API_SDK,
|
||||
"Haihao Xiang <haihao.xiang@intel.com>");
|
||||
|
||||
gst_element_class_add_static_pad_template (element_class, &sink_factory);
|
||||
|
|
|
@ -1228,7 +1228,7 @@ gst_msdkvpp_initialize (GstMsdkVPP * thiz)
|
|||
thiz->param.ExtParam = thiz->extra_params;
|
||||
}
|
||||
|
||||
/* validate parameters and allow the Media SDK to make adjustments */
|
||||
/* validate parameters and allow MFX to make adjustments */
|
||||
status = MFXVideoVPP_Query (session, &thiz->param, &thiz->param);
|
||||
if (status < MFX_ERR_NONE) {
|
||||
GST_ERROR_OBJECT (thiz, "Video VPP Query failed (%s)",
|
||||
|
@ -1674,10 +1674,10 @@ gst_msdkvpp_class_init (GstMsdkVPPClass * klass)
|
|||
&gst_msdkvpp_sink_factory);
|
||||
|
||||
gst_element_class_set_static_metadata (element_class,
|
||||
"MSDK Video Postprocessor",
|
||||
"Intel MSDK Video Postprocessor",
|
||||
"Filter/Converter/Video;Filter/Converter/Video/Scaler;"
|
||||
"Filter/Effect/Video;Filter/Effect/Video/Deinterlace",
|
||||
"A MediaSDK Video Postprocessing Filter",
|
||||
"Video Postprocessing Filter based on " MFX_API_SDK,
|
||||
"Sreerenj Balachandrn <sreerenj.balachandran@intel.com>");
|
||||
|
||||
trans_class->start = GST_DEBUG_FUNCPTR (gst_msdkvpp_start);
|
||||
|
|
|
@ -291,7 +291,7 @@ msdk_init_msdk_session (mfxIMPL impl, mfxVersion * pver,
|
|||
mfxSession session = NULL;
|
||||
mfxInitParam init_par = { impl, *pver };
|
||||
|
||||
GST_INFO ("Use the Intel Media SDK to create MFX session");
|
||||
GST_INFO ("Use the " MFX_API_SDK " to create MFX session");
|
||||
|
||||
#if (MFX_VERSION >= 1025)
|
||||
init_par.GPUCopy = 1;
|
||||
|
|
|
@ -59,6 +59,12 @@ static const char MFX_PLUGINID_VP9E_HW;
|
|||
static const char MFX_PLUGINID_VP9D_HW;
|
||||
#endif
|
||||
|
||||
#if (MFX_VERSION >= 2000)
|
||||
#define MFX_API_SDK "Intel(R) oneVPL"
|
||||
#else
|
||||
#define MFX_API_SDK "Intel(R) Media SDK"
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GST_MSDK_CAPS_MAKE(format) \
|
||||
|
|
Loading…
Reference in a new issue