msdk: Add mpeg2 decoder

https://bugzilla.gnome.org/show_bug.cgi?id=792260

diff --git a/sys/msdk/Makefile.am b/sys/msdk/Makefile.am
index f037bd7..20bbbbb 100644 (file)
--- a/sys/msdk/Makefile.am
+++ b/sys/msdk/Makefile.am
@@ -7,6 +7,7 @@ libgstmsdk_la_SOURCES = \
        gstmsdkh265enc.c \
        gstmsdkmjpegdec.c \
        gstmsdkmjpegenc.c \
+       gstmsdkmpeg2dec.c \
        gstmsdkmpeg2enc.c \
        gstmsdkvp8dec.c \
        gstmsdkvp8enc.c \
@@ -25,6 +26,7 @@ noinst_HEADERS = \
        gstmsdkh265enc.h \
        gstmsdkmjpegdec.h \
        gstmsdkmjpegenc.h \
+       gstmsdkmpeg2dec.h \
        gstmsdkmpeg2enc.h \
        gstmsdkvp8dec.h \
        gstmsdkvp8enc.h \

diff --git a/sys/msdk/gstmsdk.c b/sys/msdk/gstmsdk.c
index e1defd1..1c28f71 100644 (file)
--- a/sys/msdk/gstmsdk.c
+++ b/sys/msdk/gstmsdk.c
@@ -41,6 +41,7 @@
 #include "gstmsdkh265enc.h"
 #include "gstmsdkmjpegdec.h"
 #include "gstmsdkmjpegenc.h"
+#include "gstmsdkmpeg2dec.h"
 #include "gstmsdkmpeg2enc.h"
 #include "gstmsdkvp8dec.h"
 #include "gstmsdkvp8enc.h"
@@ -103,6 +104,9 @@ plugin_init (GstPlugin * plugin)
   ret = gst_element_register (plugin, "msdkmjpegenc", GST_RANK_NONE,
       GST_TYPE_MSDKMJPEGENC);
 
+  ret = gst_element_register (plugin, "msdkmpeg2dec", GST_RANK_NONE,
+      GST_TYPE_MSDKMPEG2DEC);
+
   ret = gst_element_register (plugin, "msdkmpeg2enc", GST_RANK_NONE,
       GST_TYPE_MSDKMPEG2ENC);
 

diff --git a/sys/msdk/gstmsdkmpeg2dec.c b/sys/msdk/gstmsdkmpeg2dec.c
new file mode 100644 (file)
index 0000000..897214e
--- /dev/null
+++ b/sys/msdk/gstmsdkmpeg2dec.c
@@ -0,0 +1,86 @@
+/* GStreamer Intel MSDK plugin
+ * Copyright (c) 2018, Intel Corporation
+ *
+ * Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * 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 <config.h>
+#endif
+
+#include "gstmsdkmpeg2dec.h"
+
+GST_DEBUG_CATEGORY_EXTERN (gst_msdkmpeg2dec_debug);
+#define GST_CAT_DEFAULT gst_msdkmpeg2dec_debug
+
+static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
+    GST_PAD_SINK,
+    GST_PAD_ALWAYS,
+    GST_STATIC_CAPS ("video/mpeg, "
+        "framerate = (fraction) [0/1, MAX], "
+        "width = (int) [ 1, MAX ], height = (int) [ 1, MAX ], "
+        "mpegversion = (int) 2, " "systemstream = (boolean) false")
+    );
+
+#define gst_msdkmpeg2dec_parent_class parent_class
+G_DEFINE_TYPE (GstMsdkMPEG2Dec, gst_msdkmpeg2dec, GST_TYPE_MSDKDEC);
+
+static gboolean
+gst_msdkmpeg2dec_configure (GstMsdkDec * decoder)
+{
+  decoder->param.mfx.CodecId = MFX_CODEC_MPEG2;
+  return TRUE;
+}
+
+static void
+gst_msdkmpeg2dec_class_init (GstMsdkMPEG2DecClass * 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_msdkmpeg2dec_configure);
+
+  gst_element_class_set_static_metadata (element_class,
+      "Intel MSDK MPEG2 decoder",
+      "Codec/Decoder/Video",
+      "MPEG2 video decoder based on Intel Media SDK",
+      "Sreerenj Balachandran <sreerenj.balachandran@intel.com>");
+
+  gst_element_class_add_static_pad_template (element_class, &sink_factory);
+}
+
+static void
+gst_msdkmpeg2dec_init (GstMsdkMPEG2Dec * thiz)
+{
+}

diff --git a/sys/msdk/gstmsdkmpeg2dec.h b/sys/msdk/gstmsdkmpeg2dec.h
new file mode 100644 (file)
index 0000000..ad9e49f
--- /dev/null
+++ b/sys/msdk/gstmsdkmpeg2dec.h
@@ -0,0 +1,69 @@
+/* GStreamer Intel MSDK plugin
+ * Copyright (c) 2018, Intel Corporation
+ * All rights reserved.
+ *
+ * Author: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
+ *
+ * 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_MSDKMPEG2DEC_H__
+#define __GST_MSDKMPEG2DEC_H__
+
+#include "gstmsdkdec.h"
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_MSDKMPEG2DEC \
+  (gst_msdkmpeg2dec_get_type())
+#define GST_MSDKMPEG2DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MSDKMPEG2DEC,GstMsdkMPEG2Dec))
+#define GST_MSDKMPEG2DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MSDKMPEG2DEC,GstMsdkMPEG2DecClass))
+#define GST_IS_MSDKMPEG2DEC(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MSDKMPEG2DEC))
+#define GST_IS_MSDKMPEG2DEC_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MSDKMPEG2DEC))
+
+typedef struct _GstMsdkMPEG2Dec GstMsdkMPEG2Dec;
+typedef struct _GstMsdkMPEG2DecClass GstMsdkMPEG2DecClass;
+
+struct _GstMsdkMPEG2Dec
+{
+  GstMsdkDec base;
+};
+
+struct _GstMsdkMPEG2DecClass
+{
+  GstMsdkDecClass parent_class;
+};
+
+GType gst_msdkmpeg2dec_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_MSDKMPEG2DEC_H__ */

diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build
index c47365a..338ae1d 100644 (file)
--- a/sys/msdk/meson.build
+++ b/sys/msdk/meson.build
@@ -8,6 +8,7 @@ msdk_sources = [
   'gstmsdkh265enc.c',
   'gstmsdkmjpegdec.c',
   'gstmsdkmjpegenc.c',
+  'gstmsdkmpeg2dec.c',
   'gstmsdkmpeg2enc.c',
   'gstmsdkvp8dec.c',
   'gstmsdkvp8enc.c',