From: Scott D Phillips Date: Tue, 29 Nov 2016 03:14:20 +0000 (-0800) Subject: msdk: Add H.265 decoder X-Git-Tag: 1.19.3~507^2~5718 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f6903bf3e607aabdaab6d3141c6174516cd314b;p=platform%2Fupstream%2Fgstreamer.git msdk: Add H.265 decoder https://bugzilla.gnome.org/show_bug.cgi?id=775726 --- diff --git a/sys/msdk/Makefile.am b/sys/msdk/Makefile.am index 7ba1825..32d786a 100644 --- a/sys/msdk/Makefile.am +++ b/sys/msdk/Makefile.am @@ -3,6 +3,7 @@ plugin_LTLIBRARIES = libgstmsdk.la libgstmsdk_la_SOURCES = \ gstmsdkh264dec.c \ gstmsdkh264enc.c \ + gstmsdkh265dec.c \ gstmsdkh265enc.c \ gstmsdkmpeg2enc.c \ gstmsdkvp8enc.c \ @@ -17,6 +18,7 @@ noinst_HEADERS = \ msdk.h \ gstmsdkh264dec.h \ gstmsdkh264enc.h \ + gstmsdkh265dec.h \ gstmsdkh265enc.h \ gstmsdkmpeg2enc.h \ gstmsdkvp8enc.h \ diff --git a/sys/msdk/gstmsdk.c b/sys/msdk/gstmsdk.c index f533696..f5a7525 100644 --- a/sys/msdk/gstmsdk.c +++ b/sys/msdk/gstmsdk.c @@ -37,6 +37,7 @@ #include "gstmsdkh264dec.h" #include "gstmsdkh264enc.h" +#include "gstmsdkh265dec.h" #include "gstmsdkh265enc.h" #include "gstmsdkmpeg2enc.h" #include "gstmsdkvp8enc.h" @@ -45,6 +46,7 @@ GST_DEBUG_CATEGORY (gst_msdkdec_debug); GST_DEBUG_CATEGORY (gst_msdkenc_debug); GST_DEBUG_CATEGORY (gst_msdkh264dec_debug); GST_DEBUG_CATEGORY (gst_msdkh264enc_debug); +GST_DEBUG_CATEGORY (gst_msdkh265dec_debug); GST_DEBUG_CATEGORY (gst_msdkh265enc_debug); GST_DEBUG_CATEGORY (gst_msdkmpeg2enc_debug); GST_DEBUG_CATEGORY (gst_msdkvp8enc_debug); @@ -60,6 +62,8 @@ plugin_init (GstPlugin * plugin) "msdkh264dec"); GST_DEBUG_CATEGORY_INIT (gst_msdkh264enc_debug, "msdkh264enc", 0, "msdkh264enc"); + GST_DEBUG_CATEGORY_INIT (gst_msdkh265dec_debug, "msdkh265dec", 0, + "msdkh265dec"); GST_DEBUG_CATEGORY_INIT (gst_msdkh265enc_debug, "msdkh265enc", 0, "msdkh265enc"); GST_DEBUG_CATEGORY_INIT (gst_msdkmpeg2enc_debug, "msdkmpeg2enc", 0, @@ -76,6 +80,9 @@ plugin_init (GstPlugin * plugin) ret = gst_element_register (plugin, "msdkh264enc", GST_RANK_NONE, GST_TYPE_MSDKH264ENC); + ret = gst_element_register (plugin, "msdkh265dec", GST_RANK_NONE, + GST_TYPE_MSDKH265DEC); + ret = gst_element_register (plugin, "msdkh265enc", GST_RANK_NONE, GST_TYPE_MSDKH265ENC); diff --git a/sys/msdk/gstmsdkh265dec.c b/sys/msdk/gstmsdkh265dec.c new file mode 100644 index 0000000..8bf0a7a --- /dev/null +++ b/sys/msdk/gstmsdkh265dec.c @@ -0,0 +1,108 @@ +/* GStreamer Intel MSDK plugin + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif +#include + +#include "gstmsdkh265dec.h" + +GST_DEBUG_CATEGORY_EXTERN (gst_msdkh265dec_debug); +#define GST_CAT_DEFAULT gst_msdkh265dec_debug + +static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/x-h265, " + "framerate = (fraction) [0/1, MAX], " + "width = (int) [ 1, MAX ], height = (int) [ 1, MAX ], " + "stream-format = (string) byte-stream , alignment = (string) au , " + "profile = (string) main ") + ); + +#define gst_msdkh265dec_parent_class parent_class +G_DEFINE_TYPE (GstMsdkH265Dec, gst_msdkh265dec, GST_TYPE_MSDKDEC); + +static gboolean +gst_msdkh265dec_configure (GstMsdkDec * decoder) +{ + GstMsdkH265Dec *h265dec = GST_MSDKH265DEC (decoder); + mfxSession session; + mfxStatus status; + const mfxPluginUID *uid; + + session = msdk_context_get_session (decoder->context); + + if (decoder->hardware) + uid = &MFX_PLUGINID_HEVCD_HW; + else + uid = &MFX_PLUGINID_HEVCD_SW; + + status = MFXVideoUSER_Load (session, uid, 1); + if (status < MFX_ERR_NONE) { + GST_ERROR_OBJECT (h265dec, "Media SDK Plugin load failed (%s)", + msdk_status_to_string (status)); + return FALSE; + } else if (status > MFX_ERR_NONE) { + GST_WARNING_OBJECT (h265dec, "Media SDK Plugin load warning: %s", + msdk_status_to_string (status)); + } + + decoder->param.mfx.CodecId = MFX_CODEC_HEVC; + decoder->param.mfx.CodecProfile = MFX_PROFILE_HEVC_MAIN; + return TRUE; +} + +static void +gst_msdkh265dec_class_init (GstMsdkH265DecClass * klass) +{ + GstElementClass *element_class; + GstMsdkDecClass *decoder_class; + + element_class = GST_ELEMENT_CLASS (klass); + decoder_class = GST_MSDKDEC_CLASS (klass); + + decoder_class->configure = GST_DEBUG_FUNCPTR (gst_msdkh265dec_configure); + + gst_element_class_set_static_metadata (element_class, + "Intel MSDK H265 decoder", + "Codec/Decoder/Video", + "H265 video decoder based on Intel Media SDK", + "Scott D Phillips "); + + gst_element_class_add_static_pad_template (element_class, &sink_factory); +} + +static void +gst_msdkh265dec_init (GstMsdkH265Dec * thiz) +{ +} diff --git a/sys/msdk/gstmsdkh265dec.h b/sys/msdk/gstmsdkh265dec.h new file mode 100644 index 0000000..a7bddce --- /dev/null +++ b/sys/msdk/gstmsdkh265dec.h @@ -0,0 +1,67 @@ +/* GStreamer Intel MSDK plugin + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGDECE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __GST_MSDKH265DEC_H__ +#define __GST_MSDKH265DEC_H__ + +#include "gstmsdkdec.h" + +G_BEGIN_DECLS + +#define GST_TYPE_MSDKH265DEC \ + (gst_msdkh265dec_get_type()) +#define GST_MSDKH265DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKH265DEC,GstMsdkH265Dec)) +#define GST_MSDKH265DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKH265DEC,GstMsdkH265DecClass)) +#define GST_IS_MSDKH265DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKH265DEC)) +#define GST_IS_MSDKH265DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKH265DEC)) + +typedef struct _GstMsdkH265Dec GstMsdkH265Dec; +typedef struct _GstMsdkH265DecClass GstMsdkH265DecClass; + +struct _GstMsdkH265Dec +{ + GstMsdkDec base; +}; + +struct _GstMsdkH265DecClass +{ + GstMsdkDecClass parent_class; +}; + +GType gst_msdkh265dec_get_type (void); + +G_END_DECLS + +#endif /* __GST_MSDKH265DEC_H__ */ diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index a18fd4e..eaada6c 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -4,6 +4,7 @@ msdk_sources = [ 'gstmsdkenc.c', 'gstmsdkh264dec.c', 'gstmsdkh264enc.c', + 'gstmsdkh265dec.c', 'gstmsdkh265enc.c', 'gstmsdkmpeg2enc.c', 'gstmsdkvp8enc.c',