From: Hyunjun Ko Date: Mon, 30 Oct 2017 06:06:32 +0000 (+0900) Subject: msdk: adds msdkvp8dec X-Git-Tag: 1.19.3~507^2~4775 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd2dca627507f2b81a1348ad96eb59e3fecc548f;p=platform%2Fupstream%2Fgstreamer.git msdk: adds msdkvp8dec https://bugzilla.gnome.org/show_bug.cgi?id=789751 --- diff --git a/sys/msdk/Makefile.am b/sys/msdk/Makefile.am index 0af445f..731dddd 100644 --- a/sys/msdk/Makefile.am +++ b/sys/msdk/Makefile.am @@ -8,6 +8,7 @@ libgstmsdk_la_SOURCES = \ gstmsdkmjpegdec.c \ gstmsdkmjpegenc.c \ gstmsdkmpeg2enc.c \ + gstmsdkvp8dec.c \ gstmsdkvp8enc.c \ gstmsdkdec.c \ gstmsdkenc.c \ @@ -25,6 +26,7 @@ noinst_HEADERS = \ gstmsdkmjpegdec.h \ gstmsdkmjpegenc.h \ gstmsdkmpeg2enc.h \ + gstmsdkvp8dec.h \ gstmsdkvp8enc.h \ gstmsdkdec.h \ gstmsdkenc.h diff --git a/sys/msdk/gstmsdk.c b/sys/msdk/gstmsdk.c index b3b17f3..e1defd1 100644 --- a/sys/msdk/gstmsdk.c +++ b/sys/msdk/gstmsdk.c @@ -42,6 +42,7 @@ #include "gstmsdkmjpegdec.h" #include "gstmsdkmjpegenc.h" #include "gstmsdkmpeg2enc.h" +#include "gstmsdkvp8dec.h" #include "gstmsdkvp8enc.h" GST_DEBUG_CATEGORY (gst_msdkdec_debug); @@ -53,6 +54,7 @@ GST_DEBUG_CATEGORY (gst_msdkh265enc_debug); GST_DEBUG_CATEGORY (gst_msdkmjpegdec_debug); GST_DEBUG_CATEGORY (gst_msdkmjpegenc_debug); GST_DEBUG_CATEGORY (gst_msdkmpeg2enc_debug); +GST_DEBUG_CATEGORY (gst_msdkvp8dec_debug); GST_DEBUG_CATEGORY (gst_msdkvp8enc_debug); static gboolean @@ -76,6 +78,7 @@ plugin_init (GstPlugin * plugin) "msdkmjpegenc"); GST_DEBUG_CATEGORY_INIT (gst_msdkmpeg2enc_debug, "msdkmpeg2enc", 0, "msdkmpeg2enc"); + GST_DEBUG_CATEGORY_INIT (gst_msdkvp8dec_debug, "msdkvp8dec", 0, "msdkvp8dec"); GST_DEBUG_CATEGORY_INIT (gst_msdkvp8enc_debug, "msdkvp8enc", 0, "msdkvp8enc"); @@ -103,6 +106,9 @@ plugin_init (GstPlugin * plugin) ret = gst_element_register (plugin, "msdkmpeg2enc", GST_RANK_NONE, GST_TYPE_MSDKMPEG2ENC); + ret = gst_element_register (plugin, "msdkvp8dec", GST_RANK_NONE, + GST_TYPE_MSDKVP8DEC); + ret = gst_element_register (plugin, "msdkvp8enc", GST_RANK_NONE, GST_TYPE_MSDKVP8ENC); diff --git a/sys/msdk/gstmsdkvp8dec.c b/sys/msdk/gstmsdkvp8dec.c new file mode 100644 index 0000000..2276165 --- /dev/null +++ b/sys/msdk/gstmsdkvp8dec.c @@ -0,0 +1,108 @@ +/* GStreamer Intel MSDK plugin + * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017, Igalia S.L. + * 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 "gstmsdkvp8dec.h" +#include +#include + +GST_DEBUG_CATEGORY_EXTERN (gst_msdkvp8dec_debug); +#define GST_CAT_DEFAULT gst_msdkvp8dec_debug + +static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("video/x-vp8") + ); + +#define gst_msdkvp8dec_parent_class parent_class +G_DEFINE_TYPE (GstMsdkVP8Dec, gst_msdkvp8dec, GST_TYPE_MSDKDEC); + +static gboolean +gst_msdkvp8dec_configure (GstMsdkDec * decoder) +{ + GstMsdkVP8Dec *vp8dec = GST_MSDKVP8DEC (decoder); + mfxSession session; + mfxStatus status; + const mfxPluginUID *uid; + + session = msdk_context_get_session (decoder->context); + + uid = &MFX_PLUGINID_VP8D_HW; + + status = MFXVideoUSER_Load (session, uid, 1); + if (status < MFX_ERR_NONE) { + GST_ERROR_OBJECT (vp8dec, "Media SDK Plugin load failed (%s)", + msdk_status_to_string (status)); + return FALSE; + } else if (status > MFX_ERR_NONE) { + GST_WARNING_OBJECT (vp8dec, "Media SDK Plugin load warning: %s", + msdk_status_to_string (status)); + } + + decoder->param.mfx.CodecId = MFX_CODEC_VP8; + /* Replaced with width and height rounded up to 16 */ + decoder->param.mfx.FrameInfo.Width = + GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.CropW); + decoder->param.mfx.FrameInfo.Height = + GST_ROUND_UP_16 (decoder->param.mfx.FrameInfo.CropH); + + return TRUE; +} + +static void +gst_msdkvp8dec_class_init (GstMsdkVP8DecClass * 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_msdkvp8dec_configure); + + gst_element_class_set_static_metadata (element_class, + "Intel MSDK VP8 decoder", + "Codec/Decoder/Video", + "VP8 video decoder based on Intel Media SDK", + "Hyunjun Ko "); + + gst_element_class_add_static_pad_template (element_class, &sink_factory); +} + +static void +gst_msdkvp8dec_init (GstMsdkVP8Dec * thiz) +{ +} diff --git a/sys/msdk/gstmsdkvp8dec.h b/sys/msdk/gstmsdkvp8dec.h new file mode 100644 index 0000000..a0880a0 --- /dev/null +++ b/sys/msdk/gstmsdkvp8dec.h @@ -0,0 +1,68 @@ +/* GStreamer Intel MSDK plugin + * Copyright (c) 2017, Intel Corporation + * Copyright (c) 2017, Igalia S.L. + * 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_MSDKVP8DEC_H__ +#define __GST_MSDKVP8DEC_H__ + +#include "gstmsdkdec.h" + +G_BEGIN_DECLS + +#define GST_TYPE_MSDKVP8DEC \ + (gst_msdkvp8dec_get_type()) +#define GST_MSDKVP8DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKVP8DEC,GstMsdkVP8Dec)) +#define GST_MSDKVP8DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKVP8DEC,GstMsdkVP8DecClass)) +#define GST_IS_MSDKVP8DEC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKVP8DEC)) +#define GST_IS_MSDKVP8DEC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKVP8DEC)) + +typedef struct _GstMsdkVP8Dec GstMsdkVP8Dec; +typedef struct _GstMsdkVP8DecClass GstMsdkVP8DecClass; + +struct _GstMsdkVP8Dec +{ + GstMsdkDec base; +}; + +struct _GstMsdkVP8DecClass +{ + GstMsdkDecClass parent_class; +}; + +GType gst_msdkvp8dec_get_type (void); + +G_END_DECLS + +#endif /* __GST_MSDKVP8DEC_H__ */ diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build index db66bb7..c47365a 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build @@ -9,6 +9,7 @@ msdk_sources = [ 'gstmsdkmjpegdec.c', 'gstmsdkmjpegenc.c', 'gstmsdkmpeg2enc.c', + 'gstmsdkvp8dec.c', 'gstmsdkvp8enc.c', 'msdk.c', ]