Merge ~alfonsosanchezbeato/ubuntu/+source/gst-plugins-bad1.0:mirsink into ~ubuntu-desktop/ubuntu/+source/gst-plugins-bad1.0:master

[Alfonso Sanchez-Beato]

New desktop mirsink and rename of the old one to hybrissink

New desktop mirsink and rename of the old one to hybrissink

[Jim Hodapp (jhodapp)]

Several comments, questions and things to change inline below.

review: Needs Fixing (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Comments addressed and branch refreshed.

[Jim Hodapp (jhodapp)]

Looks very good, thanks!

review: Approve (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

@jhodapp thanks for the review! Re: how mir_display_config_get_output works I will try to find out in the mir channel.

[Iain Lane (laney)]

Cheers.

I made some trivial tweaks and uploaded. Thanks for forwarding upstream; please do keep on working with them to get it merged there.

review: Approve

[Jim Hodapp (jhodapp)]

Thanks Iain. I'm pretty confident that they'll take our changes. They provided two quality code reviews of the new mirsink just a few hours after Alfonso proposed it as a patch upstream.

diff --git a/debian/build-deps b/debian/build-deps
index 13195ec..6725eb0 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -36,10 +36,10 @@ libexif-dev (>= 0.6.16)
 libfaad-dev (>= 2.7)
 libfluidsynth-dev (>= 1.0)
 libgirepository1.0-dev (>= 0.9.12-4~)
-libgl1-mesa-dev [!armhf]
+libgl1-mesa-dev [!armhf !arm64]
 libgles2-mesa-dev
 libglib2.0-dev (>= 2.40)
-libglu1-mesa-dev [!armhf]
+libglu1-mesa-dev [!armhf !arm64]
 libgme-dev
 libgnutls28-dev (>= 2.11.3)
 libgsm1-dev
@@ -49,8 +49,8 @@ libgtk-3-dev (>= 3.15.0)
 libiptcdata0-dev (>= 1.0.2)
 libkate-dev (>= 0.1.7)
 liblilv-dev (>= 0.16)
-libmedia-dev (>= 0.1.0+git20131207+e452e83-0ubuntu3) [i386 armhf]
-libmirclient-dev [i386 armhf]
+libmedia-dev (>= 0.1.0+git20151016+6d424c9-0ubuntu23) [i386 armhf arm64]
+libmirclient-dev [i386 amd64 armhf arm64]
 libmjpegtools-dev
 libmms-dev (>= 0.4)
 libmodplug-dev
@@ -62,7 +62,7 @@ libopenexr-dev
 libopenjp2-7-dev
 libopus-dev (>= 0.9.4)
 liborc-0.4-dev (>= 1:0.4.17)
-libplatform-api1-dev [i386 armhf]
+libplatform-api1-dev [i386 armhf arm64]
 libpng-dev
 librsvg2-dev (>= 2.36.2)
 librtmp-dev
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 4a558b6..1556e31 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -38,9 +38,9 @@ libx11-dev
 libass-dev (>= 0.10.4)
 libmodplug-dev
 libkate-dev (>= 0.1.7)
-libmedia-dev (>= 0.1.0+git20131207+e452e83-0ubuntu3) [i386 armhf]
-libplatform-api1-dev [i386 armhf]
-libmirclient-dev [i386 armhf]
+libmedia-dev (>= 0.1.0+git20131207+e452e83-0ubuntu3) [i386 armhf arm64]
+libplatform-api1-dev [i386 armhf arm64]
+libmirclient-dev [i386 amd64 armhf arm64]
 libgme-dev
 librsvg2-dev (>= 2.36.2)
 libcairo2-dev
@@ -59,10 +59,10 @@ libopenal-dev (>= 1:1.14)
 libzvbi-dev
 libspandsp-dev
 libopus-dev (>= 0.9.4)
-libgl1-mesa-dev [!armhf]
+libgl1-mesa-dev [!armhf !arm64]
 libegl1-mesa-dev
 libgles2-mesa-dev
-libglu1-mesa-dev [!armhf]
+libglu1-mesa-dev [!armhf !arm64]
 libxml2-dev (>= 2.8)
 libfluidsynth-dev (>= 1.0)
 libsrtp0-dev
diff --git a/debian/changelog b/debian/changelog
index 3673062..5deeba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+gst-plugins-bad1.0 (1.10.3-1ubuntu4) zesty; urgency=medium
+
+  * [ Łukasz 'sil2100' Zemczak <[e-mail]> ]
+  * debian/control*, debian/rules, debian/build-deps*:
+    - Build gstreamer1.0-hybris for arm64, bump the required version of
+      libmedia-dev to a one that has a working arm64 linker in hybris.
+  * debian/rules:
+    - For arm64 force using HYBRIS_ANDROID_SDK_VERSION=23 as there is no jb
+      linker built in hybris for this architecture.
+
+  [ Alfonso Sanchez-Beato (email Canonical) ]
+  * Rename old mirsink to hybrissink to better reflect its nature
+  * Create new mirsink for desktop
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Wed, 22 Feb 2017 17:02:05 +0100
+
+gst-plugins-bad1.0 (1.10.3-1ubuntu3) zesty; urgency=medium
+
+  * No-change rebuild against libx265-110.
+
+ -- Mattia Rizzolo <[e-mail]>  Sun, 19 Feb 2017 16:58:32 +0100
+
+gst-plugins-bad1.0 (1.10.3-1ubuntu2) zesty; urgency=medium
+
+  * No-change rebuild against libx265-102.
+
+ -- Mattia Rizzolo <[e-mail]>  Tue, 31 Jan 2017 22:45:53 +0100
+
 gst-plugins-bad1.0 (1.10.3-1ubuntu1) zesty; urgency=medium
 
   * Merge with Debian unstable; remaining changes:
diff --git a/debian/control b/debian/control
index 6a85000..fe00eb4 100644
--- a/debian/control
+++ b/debian/control
@@ -51,10 +51,10 @@ Build-Depends: autoconf (>= 2.69),
                libfaad-dev (>= 2.7),
                libfluidsynth-dev (>= 1.0),
                libgirepository1.0-dev (>= 0.9.12-4~),
-               libgl1-mesa-dev [!armhf],
+               libgl1-mesa-dev [!armhf !arm64],
                libgles2-mesa-dev,
                libglib2.0-dev (>= 2.40),
-               libglu1-mesa-dev [!armhf],
+               libglu1-mesa-dev [!armhf !arm64],
                libgme-dev,
                libgnutls28-dev (>= 2.11.3),
                libgsm1-dev,
@@ -64,8 +64,8 @@ Build-Depends: autoconf (>= 2.69),
                libiptcdata0-dev (>= 1.0.2),
                libkate-dev (>= 0.1.7),
                liblilv-dev (>= 0.16),
-               libmedia-dev (>= 0.1.0+git20131207+e452e83-0ubuntu3) [i386 armhf],
-               libmirclient-dev [i386 armhf],
+               libmedia-dev (>= 0.1.0+git20151016+6d424c9-0ubuntu23) [i386 armhf arm64],
+               libmirclient-dev [i386 amd64 armhf arm64],
                libmjpegtools-dev,
                libmms-dev (>= 0.4),
                libmodplug-dev,
@@ -77,7 +77,7 @@ Build-Depends: autoconf (>= 2.69),
                libopenjp2-7-dev,
                libopus-dev (>= 0.9.4),
                liborc-0.4-dev (>= 1:0.4.17),
-               libplatform-api1-dev [i386 armhf],
+               libplatform-api1-dev [i386 armhf arm64],
                libpng-dev,
                librsvg2-dev (>= 2.36.2),
                librtmp-dev,
@@ -130,7 +130,7 @@ Description: GStreamer documentation for plugins from the "bad" set
  This package contains the documentation for plugins from the "bad" set.
 
 Package: gstreamer1.0-hybris
-Architecture: i386 armhf
+Architecture: i386 armhf arm64
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -255,7 +255,7 @@ Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: gstreamer1.0-hybris (= ${binary:Version}) [i386 armhf],
+Depends: gstreamer1.0-hybris (= ${binary:Version}) [i386 armhf arm64],
          gstreamer1.0-plugins-bad (= ${binary:Version}),
          ${misc:Depends}
 Replaces: gstreamer1.0-plugins-base-dbg (<< 0.11.94), gstreamer1.0-plugins-good (<< 1.1.2)
diff --git a/debian/control.in b/debian/control.in
index 2c3ce0b..aae5c96 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -36,7 +36,7 @@ Description: GStreamer documentation for plugins from the "bad" set
  This package contains the documentation for plugins from the "bad" set.
 
 Package: @GST_PKGNAME@-hybris
-Architecture: i386 armhf
+Architecture: i386 armhf arm64
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -161,7 +161,7 @@ Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: @GST_PKGNAME@-hybris (= ${binary:Version}) [i386 armhf],
+Depends: @GST_PKGNAME@-hybris (= ${binary:Version}) [i386 armhf arm64],
          @GST_PKGNAME@-plugins-bad (= ${binary:Version}),
          ${misc:Depends}
 Replaces: gstreamer1.0-plugins-base-dbg (<< 0.11.94), gstreamer1.0-plugins-good (<< 1.1.2)
diff --git a/debian/gstreamer-hybris.install b/debian/gstreamer-hybris.install
index ce83264..7b78f5d 100644
--- a/debian/gstreamer-hybris.install
+++ b/debian/gstreamer-hybris.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstandroidmedia.so
-debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmirsink.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsthybrissink.so
diff --git a/debian/gstreamer-plugins-bad.install b/debian/gstreamer-plugins-bad.install
index 13730a1..e1aea24 100644
--- a/debian/gstreamer-plugins-bad.install
+++ b/debian/gstreamer-plugins-bad.install
@@ -48,6 +48,7 @@ debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstladspa.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlibde265.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlv2.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmidi.so
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmirsink.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmms.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmodplug.so
 debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstmpeg2enc.so
diff --git a/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch b/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
index c54121e..05e0b37 100644
--- a/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
+++ b/debian/patches/adding-mirsink-and-android-media-over-hybris-support.patch
@@ -1,10 +1,11 @@
-From: Jim Hodapp <[e-mail]>
+From: Alfonso Sanchez-Beato <[e-mail]>
 Date: Tue, 14 Jul 2015 10:41:17 +0000
 Subject: Add mirsink and androidmedia-hybris support
 
 Add mirsink and androidmedia over hybris for hardware accelerated
 decoding using libstagefright and the hybris compat layer.
 
+From: Jim Hodapp <[e-mail]>
 From: Alfonso Sanchez-Beato <[e-mail]>
 From: Ratchanan Srirattanamet <[e-mail]> (LP: #1452386, LP: #1653373)
 Origin: vendor
@@ -12,11 +13,11 @@ Forwarded: no
 ---
  configure.ac                               |   15 +
  ext/Makefile.am                            |    8 +
- ext/mir/Makefile.am                        |   17 +
- ext/mir/gstmirsink.c                       |  854 ++++++++++
- ext/mir/gstmirsink.h                       |  134 ++
- ext/mir/mirpool.c                          |  434 +++++
- ext/mir/mirpool.h                          |   91 ++
+ ext/hybris/Makefile.am                     |   17 +
+ ext/hybris/gsthybrissink.c                 |  854 ++++++++++
+ ext/hybris/gsthybrissink.h                 |  134 ++
+ ext/hybris/mirpool.c                       |  434 +++++
+ ext/hybris/mirpool.h                       |   91 ++
  gst-libs/gst/Makefile.am                   |    8 +-
  gst-libs/gst/mir/Makefile.am               |   26 +
  gst-libs/gst/mir/gstmircontext.c           |  155 ++
@@ -36,11 +37,11 @@ Forwarded: no
  tests/check/pipelines/gstamcvideodec.c     |  538 +++++++
  tests/check/pipelines/gstamcvideodec_egl.c |   56 +
  25 files changed, 8791 insertions(+), 7 deletions(-)
- create mode 100644 ext/mir/Makefile.am
- create mode 100644 ext/mir/gstmirsink.c
- create mode 100644 ext/mir/gstmirsink.h
- create mode 100644 ext/mir/mirpool.c
- create mode 100644 ext/mir/mirpool.h
+ create mode 100644 ext/hybris/Makefile.am
+ create mode 100644 ext/hybris/gsthybrissink.c
+ create mode 100644 ext/hybris/gsthybrissink.h
+ create mode 100644 ext/hybris/mirpool.c
+ create mode 100644 ext/hybris/mirpool.h
  create mode 100644 gst-libs/gst/mir/Makefile.am
  create mode 100644 gst-libs/gst/mir/gstmircontext.c
  create mode 100644 gst-libs/gst/mir/gstmircontext.h
@@ -52,11 +53,11 @@ Forwarded: no
  create mode 100644 tests/check/pipelines/gstamcvideodec.c
  create mode 100644 tests/check/pipelines/gstamcvideodec_egl.c
 
-Index: b/configure.ac
-===================================================================
+diff --git a/configure.ac b/configure.ac
+index f2c63a1..7444429 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1784,6 +1784,18 @@
+@@ -1784,6 +1784,18 @@ AG_GST_CHECK_FEATURE(ANDROID_MEDIA, [Android Media], androidmedia, [
    esac
  ])
  
@@ -75,7 +76,7 @@ Index: b/configure.ac
  dnl *** AppleMedia (OS X and iOS) ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_APPLE_MEDIA, true)
  HAVE_APPLE_MEDIA="no"
-@@ -3464,6 +3476,7 @@
+@@ -3464,6 +3476,7 @@ AM_CONDITIONAL(DECKLINK_OSX, false)
  AM_CONDITIONAL(USE_DIRECTFB, false)
  AM_CONDITIONAL(USE_WAYLAND, false)
  AM_CONDITIONAL(USE_DAALA, false)
@@ -83,7 +84,7 @@ Index: b/configure.ac
  AM_CONDITIONAL(USE_DTS, false)
  AM_CONDITIONAL(USE_EXIF, false)
  AM_CONDITIONAL(USE_RESINDVD, false)
-@@ -3703,6 +3716,7 @@
+@@ -3703,6 +3716,7 @@ gst-libs/gst/gl/egl/Makefile
  gst-libs/gst/gl/wayland/Makefile
  gst-libs/gst/gl/win32/Makefile
  gst-libs/gst/gl/x11/Makefile
@@ -91,76 +92,78 @@ Index: b/configure.ac
  gst-libs/gst/insertbin/Makefile
  gst-libs/gst/interfaces/Makefile
  gst-libs/gst/codecparsers/Makefile
-@@ -3786,6 +3800,7 @@
+@@ -3786,6 +3800,7 @@ ext/dc1394/Makefile
  ext/directfb/Makefile
  ext/wayland/Makefile
  ext/daala/Makefile
-+ext/mir/Makefile
++ext/hybris/Makefile
  ext/dts/Makefile
  ext/gl/Makefile
  ext/gtk/Makefile
-Index: b/ext/Makefile.am
-===================================================================
+diff --git a/ext/Makefile.am b/ext/Makefile.am
+index bae25c2..709bdb2 100644
 --- a/ext/Makefile.am
 +++ b/ext/Makefile.am
-@@ -70,6 +70,12 @@
+@@ -70,6 +70,12 @@ else
  DAALA_DIR=
  endif
  
 +if USE_ANDROID_MEDIA_HYBRIS
-+MIR_DIR=mir
++HYBRIS_DIR=hybris
 +else
-+MIR_DIR=
++HYBRIS_DIR=
 +endif
 +
  if USE_DTS
  DTS_DIR=dts
  else
-@@ -457,6 +463,7 @@
+@@ -457,6 +463,7 @@ SUBDIRS=\
  	$(LIBDE265_DIR) \
  	$(LIBMMS_DIR) \
  	$(LIBVISUAL_DIR) \
-+	$(MIR_DIR) \
++	$(HYBRIS_DIR) \
  	$(MODPLUG_DIR) \
  	$(MPEG2ENC_DIR) \
  	$(MIMIC_DIR) \
-@@ -508,6 +515,7 @@
+@@ -508,6 +515,7 @@ DIST_SUBDIRS = \
  	dc1394 \
  	directfb \
  	wayland \
-+	mir \
++	hybris \
  	faac \
  	faad \
  	fdkaac \
-Index: b/ext/mir/Makefile.am
-===================================================================
+diff --git a/ext/hybris/Makefile.am b/ext/hybris/Makefile.am
+new file mode 100644
+index 0000000..31c2576
 --- /dev/null
-+++ b/ext/mir/Makefile.am
++++ b/ext/hybris/Makefile.am
 @@ -0,0 +1,17 @@
-+plugin_LTLIBRARIES = libgstmirsink.la
++plugin_LTLIBRARIES = libgsthybrissink.la
 +
-+libgstmirsink_la_SOURCES = gstmirsink.c mirpool.c
-+libgstmirsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
++libgsthybrissink_la_SOURCES = gsthybrissink.c mirpool.c
++libgsthybrissink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 +                               $(UBUNTU_PLATFORM_CFLAGS) \
 +                               $(MIR_CFLAGS) \
 +                               -I../../gst-libs/
-+libgstmirsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
++libgsthybrissink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
 +                               -lgstvideo-$(GST_API_VERSION) \
 +                               $(top_builddir)/gst-libs/gst/mir/libgstmiralloc-$(GST_API_VERSION).la \
 +                               -lmedia \
 +                               $(EGL_LIBS) $(EGLGLES_LIBS) \
 +                               $(MIR_LIBS)
-+libgstmirsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-+libgstmirsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
-+include_HEADERS = mirpool.h gstmirsink.h
++libgsthybrissink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgsthybrissink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
++include_HEADERS = mirpool.h gsthybrissink.h
 +noinst_HEADERS =
-Index: b/ext/mir/gstmirsink.c
-===================================================================
+diff --git a/ext/hybris/gsthybrissink.c b/ext/hybris/gsthybrissink.c
+new file mode 100644
+index 0000000..d64eee0
 --- /dev/null
-+++ b/ext/mir/gstmirsink.c
++++ b/ext/hybris/gsthybrissink.c
 @@ -0,0 +1,854 @@
 +/*
-+ * GStreamer Mir video sink
++ * GStreamer Hybris/Mir video sink
 + * Copyright (C) 2013 Canonical Ltd
 + *
 + * This library is free software; you can redistribute it and/or
@@ -180,17 +183,17 @@ Index: b/ext/mir/gstmirsink.c
 + */
 +
 +/**
-+ * SECTION:element-mirsink
++ * SECTION:element-hybrissink
 + *
-+ *  The mirsink creates its own window and renders the decoded video frames there.
++ *  The hybrissink creates its own window and renders the decoded video frames there.
 + *  Setup the Mir environment as described in
 + *  <ulink url="http://mir.freedesktop.org/building.html">Mir</ulink> home page.
 + *
 + * <refsect2>
 + * <title>Example pipeline</title>
 + * |[
-+ * gst-launch -v filesrc ! qtdemux ! h264parse ! queue ! amcviddec-omxtiducati1videodecoder ! mirsink
-+ * ]| test the video rendering with mirsink
++ * gst-launch -v filesrc ! qtdemux ! h264parse ! queue ! amcviddec-omxtiducati1videodecoder ! hybrissink
++ * ]| test the video rendering with hybrissink
 + * </refsect2>
 + */
 +
@@ -198,7 +201,7 @@ Index: b/ext/mir/gstmirsink.c
 +#include <config.h>
 +#endif
 +
-+#include "gstmirsink.h"
++#include "gsthybrissink.h"
 +#include "mirpool.h"
 +
 +#include <gst/mir/mirallocator.h>
@@ -227,24 +230,24 @@ Index: b/ext/mir/gstmirsink.c
 +  PROP_MIR_VIDEO_WIDTH
 +};
 +
-+GST_DEBUG_CATEGORY (gstmir_debug);
-+#define GST_CAT_DEFAULT gstmir_debug
++GST_DEBUG_CATEGORY (gsthybris_debug);
++#define GST_CAT_DEFAULT gsthybris_debug
 +
 +#if 0
-+static const char gst_mirsink_sink_caps_str[] =
++static const char gst_hybrissink_sink_caps_str[] =
 +GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_MIR_IMAGE,
 +    GST_VIDEO_FORMATS_ALL) ";"
 +    GST_VIDEO_CAPS_MAKE_WITH_FEATURES
 +    (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META,
 +    GST_VIDEO_FORMATS_ALL);
 +
-+     static GstStaticPadTemplate gst_mirsink_sink_caps_template =
++     static GstStaticPadTemplate gst_hybrissink_sink_caps_template =
 +         GST_STATIC_PAD_TEMPLATE ("sink",
 +    GST_PAD_SINK,
 +    GST_PAD_ALWAYS,
-+    GST_STATIC_CAPS (gst_mirsink_sink_caps_str));
++    GST_STATIC_CAPS (gst_hybrissink_sink_caps_str));
 +#else
-+static GstStaticPadTemplate gst_mirsink_sink_caps_template =
++static GstStaticPadTemplate gst_hybrissink_sink_caps_template =
 +GST_STATIC_PAD_TEMPLATE ("sink",
 +    GST_PAD_SINK,
 +    GST_PAD_ALWAYS,
@@ -260,28 +263,28 @@ Index: b/ext/mir/gstmirsink.c
 +static guint surface_texture_client_set_signal = 0;
 +
 +/* Fixme: Add more interfaces */
-+#define gst_mir_sink_parent_class parent_class
-+G_DEFINE_TYPE (GstMirSink, gst_mir_sink, GST_TYPE_VIDEO_SINK);
++#define gst_hybris_sink_parent_class parent_class
++G_DEFINE_TYPE (GstHybrisSink, gst_hybris_sink, GST_TYPE_VIDEO_SINK);
 +
-+static void gst_mir_sink_get_property (GObject * object,
++static void gst_hybris_sink_get_property (GObject * object,
 +    guint prop_id, GValue * value, GParamSpec * pspec);
-+static void gst_mir_sink_set_property (GObject * object,
++static void gst_hybris_sink_set_property (GObject * object,
 +    guint prop_id, const GValue * value, GParamSpec * pspec);
-+static void gst_mir_sink_finalize (GObject * object);
-+static void gst_mir_sink_set_context (GstElement * element,
++static void gst_hybris_sink_finalize (GObject * object);
++static void gst_hybris_sink_set_context (GstElement * element,
 +    GstContext * context);
-+static GstCaps *gst_mir_sink_get_caps (GstBaseSink * bsink, GstCaps * filter);
-+static gboolean gst_mir_sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
-+static gboolean gst_mir_sink_start (GstBaseSink * bsink);
-+static gboolean gst_mir_sink_stop (GstBaseSink * bsink);
-+static gboolean gst_mir_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer);
++static GstCaps *gst_hybris_sink_get_caps (GstBaseSink * bsink, GstCaps * filter);
++static gboolean gst_hybris_sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
++static gboolean gst_hybris_sink_start (GstBaseSink * bsink);
++static gboolean gst_hybris_sink_stop (GstBaseSink * bsink);
++static gboolean gst_hybris_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer);
 +static gboolean
-+gst_mir_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query);
-+static gboolean gst_mir_sink_render (GstBaseSink * bsink, GstBuffer * buffer);
-+static gboolean gst_mir_sink_query (GstBaseSink * bsink, GstQuery * query);
++gst_hybris_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query);
++static gboolean gst_hybris_sink_render (GstBaseSink * bsink, GstBuffer * buffer);
++static gboolean gst_hybris_sink_query (GstBaseSink * bsink, GstQuery * query);
 +
 +static void
-+gst_mir_sink_class_init (GstMirSinkClass * klass)
++gst_hybris_sink_class_init (GstHybrisSinkClass * klass)
 +{
 +  GObjectClass *gobject_class;
 +  GstElementClass *gstelement_class;
@@ -291,27 +294,27 @@ Index: b/ext/mir/gstmirsink.c
 +  gstelement_class = (GstElementClass *) klass;
 +  gstbasesink_class = (GstBaseSinkClass *) klass;
 +
-+  gobject_class->set_property = gst_mir_sink_set_property;
-+  gobject_class->get_property = gst_mir_sink_get_property;
-+  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_mir_sink_finalize);
-+  gstelement_class->set_context = gst_mir_sink_set_context;
++  gobject_class->set_property = gst_hybris_sink_set_property;
++  gobject_class->get_property = gst_hybris_sink_get_property;
++  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_hybris_sink_finalize);
++  gstelement_class->set_context = gst_hybris_sink_set_context;
 +
 +  gst_element_class_add_pad_template (gstelement_class,
-+      gst_static_pad_template_get (&gst_mirsink_sink_caps_template));
++      gst_static_pad_template_get (&gst_hybrissink_sink_caps_template));
 +
 +  gst_element_class_set_static_metadata (gstelement_class,
-+      "Mir video sink", "Sink/Video",
-+      "Output to Mir surface", "Jim Hodapp <[e-mail]>");
-+
-+  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_mir_sink_get_caps);
-+  gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_mir_sink_set_caps);
-+  gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_mir_sink_start);
-+  gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_mir_sink_stop);
-+  gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_mir_sink_preroll);
++      "Hybris/Mir video sink", "Sink/Video",
++      "Output to hybris/Mir surface", "Jim Hodapp <[e-mail]>");
++
++  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_hybris_sink_get_caps);
++  gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_hybris_sink_set_caps);
++  gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_hybris_sink_start);
++  gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_hybris_sink_stop);
++  gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_hybris_sink_preroll);
 +  gstbasesink_class->propose_allocation =
-+      GST_DEBUG_FUNCPTR (gst_mir_sink_propose_allocation);
-+  gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_mir_sink_render);
-+  gstbasesink_class->query = GST_DEBUG_FUNCPTR (gst_mir_sink_query);
++      GST_DEBUG_FUNCPTR (gst_hybris_sink_propose_allocation);
++  gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_hybris_sink_render);
++  gstbasesink_class->query = GST_DEBUG_FUNCPTR (gst_hybris_sink_query);
 +
 +  /* This signal is for being notified when a frame is ready to be rendered. This
 +   * is useful for anything outside of the sink that needs to know when each frame
@@ -319,13 +322,13 @@ Index: b/ext/mir/gstmirsink.c
 +  frame_ready_signal =
 +      g_signal_new ("frame-ready", G_TYPE_FROM_CLASS (klass),
 +      G_SIGNAL_RUN_LAST,
-+      G_STRUCT_OFFSET (GstMirSinkClass, frame_ready_changed), NULL, NULL,
++      G_STRUCT_OFFSET (GstHybrisSinkClass, frame_ready_changed), NULL, NULL,
 +      g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 0);
 +
 +  surface_texture_client_set_signal =
 +      g_signal_new ("surface-texture-client", G_TYPE_FROM_CLASS (klass),
 +      G_SIGNAL_RUN_LAST,
-+      G_STRUCT_OFFSET (GstMirSinkClass, surface_texture_client_changed), NULL,
++      G_STRUCT_OFFSET (GstHybrisSinkClass, surface_texture_client_changed), NULL,
 +      NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
 +
 +  g_object_class_install_property (gobject_class, PROP_MIR_TEXTURE_ID,
@@ -345,19 +348,19 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static void
-+gst_mir_sink_init (GstMirSink * sink)
++gst_hybris_sink_init (GstHybrisSink * sink)
 +{
-+  GST_DEBUG_OBJECT (sink, "Initializing mirsink");
++  GST_DEBUG_OBJECT (sink, "Initializing hybrissink");
 +  sink->pool = NULL;
 +
 +  g_mutex_init (&sink->mir_lock);
 +}
 +
 +static void
-+gst_mir_sink_get_property (GObject * object,
++gst_hybris_sink_get_property (GObject * object,
 +    guint prop_id, GValue * value, GParamSpec * pspec)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (object);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (object);
 +
 +  switch (prop_id) {
 +    case PROP_MIR_TEXTURE_ID:
@@ -376,16 +379,16 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static void
-+gst_mir_sink_create_surface_texture (GObject * object)
++gst_hybris_sink_create_surface_texture (GObject * object)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (object);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (object);
 +
 +  /* Create a new SurfaceTextureClientHybris instance from a texture ID */
 +  sink->surface_texture_client =
 +      surface_texture_client_create_by_id (sink->texture_id);
 +  GST_DEBUG_OBJECT (sink, "Created new SurfaceTextureClientHybris instance: %p",
 +      sink->surface_texture_client);
-+  /* Because mirsink is being loaded, we are definitely doing
++  /* Because hybrissink is being loaded, we are definitely doing
 +   * hardware rendering.
 +   */
 +  surface_texture_client_set_hardware_rendering (sink->surface_texture_client,
@@ -397,16 +400,16 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static void
-+gst_mir_sink_set_property (GObject * object,
++gst_hybris_sink_set_property (GObject * object,
 +    guint prop_id, const GValue * value, GParamSpec * pspec)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (object);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (object);
 +
 +  switch (prop_id) {
 +    case PROP_MIR_TEXTURE_ID:
 +      sink->texture_id = g_value_get_uint (value);
 +      GST_WARNING_OBJECT (object, "texture_id: %d", sink->texture_id);
-+      gst_mir_sink_create_surface_texture (object);
++      gst_hybris_sink_create_surface_texture (object);
 +      break;
 +    default:
 +      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -447,9 +450,9 @@ Index: b/ext/mir/gstmirsink.c
 +#endif
 +
 +static void
-+gst_mir_sink_finalize (GObject * object)
++gst_hybris_sink_finalize (GObject * object)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (object);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (object);
 +
 +  GST_DEBUG_OBJECT (sink, "Finalizing the sink..");
 +
@@ -474,9 +477,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static void
-+gst_mir_sink_set_context (GstElement * element, GstContext * context)
++gst_hybris_sink_set_context (GstElement * element, GstContext * context)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (element);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (element);
 +  SurfaceTextureClientHybris stc;
 +
 +  GST_DEBUG_OBJECT (element, "%s", __PRETTY_FUNCTION__);
@@ -490,9 +493,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static gboolean
-+gst_mir_sink_query (GstBaseSink * bsink, GstQuery * query)
++gst_hybris_sink_query (GstBaseSink * bsink, GstQuery * query)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (bsink);
 +
 +  GST_INFO_OBJECT (sink, "query type %s", GST_QUERY_TYPE_NAME (query));
 +
@@ -581,7 +584,7 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static void
-+create_window (GstMirSink * sink, struct display *display, int width,
++create_window (GstHybrisSink * sink, struct display *display, int width,
 +    int height)
 +{
 +  struct window *window;
@@ -598,7 +601,7 @@ Index: b/ext/mir/gstmirsink.c
 +  window->height = height;
 +
 +  window->properties = ua_ui_window_properties_new_for_normal_window ();
-+  ua_ui_window_properties_set_titlen (window->properties, "MirSinkWindow", 13);
++  ua_ui_window_properties_set_titlen (window->properties, "HybrisSinkWindow", 13);
 +
 +  ua_ui_window_properties_set_role (window->properties, 1);
 +  ua_ui_window_properties_set_input_cb_and_ctx (window->properties, NULL, NULL);
@@ -624,12 +627,12 @@ Index: b/ext/mir/gstmirsink.c
 +#endif
 +
 +static GstCaps *
-+gst_mir_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
++gst_hybris_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
 +{
-+  GstMirSink *sink;
++  GstHybrisSink *sink;
 +  GstCaps *caps;
 +
-+  sink = GST_MIR_SINK (bsink);
++  sink = GST_HYBRIS_SINK (bsink);
 +
 +  GST_DEBUG_OBJECT (sink, "%s", __PRETTY_FUNCTION__);
 +
@@ -646,9 +649,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static gboolean
-+gst_mir_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
++gst_hybris_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (bsink);
 +  GstBufferPool *newpool, *oldpool;
 +  GstMirBufferPool *m_pool;
 +  GstVideoInfo info;
@@ -658,7 +661,7 @@ Index: b/ext/mir/gstmirsink.c
 +  };
 +  guint size;
 +
-+  sink = GST_MIR_SINK (bsink);
++  sink = GST_HYBRIS_SINK (bsink);
 +
 +  GST_DEBUG_OBJECT (sink, "set caps %" GST_PTR_FORMAT, caps);
 +
@@ -727,9 +730,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static gboolean
-+gst_mir_sink_start (GstBaseSink * bsink)
++gst_hybris_sink_start (GstBaseSink * bsink)
 +{
-+  GstMirSink *sink = (GstMirSink *) bsink;
++  GstHybrisSink *sink = (GstHybrisSink *) bsink;
 +
 +  GST_DEBUG_OBJECT (sink, "start");
 +
@@ -738,7 +741,7 @@ Index: b/ext/mir/gstmirsink.c
 +   */
 +  if (!sink->surface_texture_client && sink->texture_id > 0) {
 +    GST_DEBUG_OBJECT (sink, "Creating new SurfaceTextureClientHybris instance");
-+    gst_mir_sink_create_surface_texture (G_OBJECT (bsink));
++    gst_hybris_sink_create_surface_texture (G_OBJECT (bsink));
 +  }
 +#if 0
 +  /* If we are using a texture_id, there's no need to use the Ubuntu
@@ -784,9 +787,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static gboolean
-+gst_mir_sink_stop (GstBaseSink * bsink)
++gst_hybris_sink_stop (GstBaseSink * bsink)
 +{
-+  GstMirSink *sink = (GstMirSink *) bsink;
++  GstHybrisSink *sink = (GstHybrisSink *) bsink;
 +
 +  GST_DEBUG_OBJECT (sink, "stop");
 +
@@ -806,9 +809,9 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static gboolean
-+gst_mir_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
++gst_hybris_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (bsink);
 +  GstBufferPool *pool;
 +  GstStructure *config;
 +  GstCaps *caps;
@@ -916,16 +919,16 @@ Index: b/ext/mir/gstmirsink.c
 +}
 +
 +static GstFlowReturn
-+gst_mir_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
++gst_hybris_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
 +{
 +  GST_DEBUG_OBJECT (bsink, "preroll buffer %p", buffer);
-+  return gst_mir_sink_render (bsink, buffer);
++  return gst_hybris_sink_render (bsink, buffer);
 +}
 +
 +static GstFlowReturn
-+gst_mir_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
++gst_hybris_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
 +{
-+  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstHybrisSink *sink = GST_HYBRIS_SINK (bsink);
 +  //GstVideoRectangle src, dst, res;
 +  GstBuffer *to_render;
 +  GstMirMeta *meta;
@@ -1002,21 +1005,22 @@ Index: b/ext/mir/gstmirsink.c
 +static gboolean
 +plugin_init (GstPlugin * plugin)
 +{
-+  GST_DEBUG_CATEGORY_INIT (gstmir_debug, "mirsink", 0, " mir video sink");
++  GST_DEBUG_CATEGORY_INIT (gsthybris_debug, "hybrissink", 0, " hybris video sink");
 +
-+  return gst_element_register (plugin, "mirsink", GST_RANK_MARGINAL,
-+      GST_TYPE_MIR_SINK);
++  return gst_element_register (plugin, "hybrissink", GST_RANK_MARGINAL,
++      GST_TYPE_HYBRIS_SINK);
 +}
 +
 +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
 +    GST_VERSION_MINOR,
-+    mirsink,
-+    "Mir Video Sink", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
++    hybrissink,
++    "Hybris Video Sink", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
 +    GST_PACKAGE_ORIGIN)
-Index: b/ext/mir/gstmirsink.h
-===================================================================
+diff --git a/ext/hybris/gsthybrissink.h b/ext/hybris/gsthybrissink.h
+new file mode 100644
+index 0000000..c5e5353
 --- /dev/null
-+++ b/ext/mir/gstmirsink.h
++++ b/ext/hybris/gsthybrissink.h
 @@ -0,0 +1,134 @@
 +/*
 + * GStreamer Mir video sink
@@ -1038,8 +1042,8 @@ Index: b/ext/mir/gstmirsink.h
 + * Boston, MA 02110-1301 USA.
 + */
 +
-+#ifndef __GST_MIR_VIDEO_SINK_H__
-+#define __GST_MIR_VIDEO_SINK_H__
++#ifndef __GST_HYBRIS_VIDEO_SINK_H__
++#define __GST_HYBRIS_VIDEO_SINK_H__
 +
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -1067,21 +1071,21 @@ Index: b/ext/mir/gstmirsink.h
 +#include <hybris/media/surface_texture_client_hybris.h>
 +//#include <gst/mir/gstmircontext.h>
 +
-+#define GST_TYPE_MIR_SINK \
-+        (gst_mir_sink_get_type())
-+#define GST_MIR_SINK(obj) \
-+        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIR_SINK,GstMirSink))
-+#define GST_MIR_SINK_CLASS(klass) \
-+        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIR_SINK,GstMirSinkClass))
-+#define GST_IS_MIR_SINK(obj) \
-+        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIR_SINK))
-+#define GST_IS_MIR_SINK_CLASS(klass) \
-+        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIR_SINK))
-+#define GST_MIR_SINK_GET_CLASS(inst) \
-+        (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_MIR_SINK, GstMirSinkClass))
-+
-+typedef struct _GstMirSink GstMirSink;
-+typedef struct _GstMirSinkClass GstMirSinkClass;
++#define GST_TYPE_HYBRIS_SINK \
++        (gst_hybris_sink_get_type())
++#define GST_HYBRIS_SINK(obj) \
++        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_HYBRIS_SINK,GstHybrisSink))
++#define GST_HYBRIS_SINK_CLASS(klass) \
++        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_HYBRIS_SINK,GstHybrisSinkClass))
++#define GST_IS_HYBRIS_SINK(obj) \
++        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_HYBRIS_SINK))
++#define GST_IS_HYBRIS_SINK_CLASS(klass) \
++        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_HYBRIS_SINK))
++#define GST_HYBRIS_SINK_GET_CLASS(inst) \
++        (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_HYBRIS_SINK, GstHybrisSinkClass))
++
++typedef struct _GstHybrisSink GstHybrisSink;
++typedef struct _GstHybrisSinkClass GstHybrisSinkClass;
 +
 +#include "mirpool.h"
 +
@@ -1119,7 +1123,7 @@ Index: b/ext/mir/gstmirsink.h
 +  EGLNativeWindowType egl_native_window;
 +};
 +
-+struct _GstMirSink
++struct _GstHybrisSink
 +{
 +  GstVideoSink parent;
 +
@@ -1139,23 +1143,24 @@ Index: b/ext/mir/gstmirsink.h
 +  gint video_height;
 +};
 +
-+struct _GstMirSinkClass
++struct _GstHybrisSinkClass
 +{
 +  GstVideoSinkClass parent;
 +
-+  void (*frame_ready_changed) (GstMirSink *sink, gpointer renderer);
-+  void (*surface_texture_client_changed) (GstMirSink *sink, gpointer surface_texture_client, gpointer renderer);
++  void (*frame_ready_changed) (GstHybrisSink *sink, gpointer renderer);
++  void (*surface_texture_client_changed) (GstHybrisSink *sink, gpointer surface_texture_client, gpointer renderer);
 +};
 +
-+GType gst_mir_sink_get_type (void) G_GNUC_CONST;
++GType gst_hybris_sink_get_type (void) G_GNUC_CONST;
 +
 +G_END_DECLS
 +
-+#endif /* __GST_MIR_VIDEO_SINK_H__ */
-Index: b/ext/mir/mirpool.c
-===================================================================
++#endif /* __GST_HYBRIS_VIDEO_SINK_H__ */
+diff --git a/ext/hybris/mirpool.c b/ext/hybris/mirpool.c
+new file mode 100644
+index 0000000..77c5368
 --- /dev/null
-+++ b/ext/mir/mirpool.c
++++ b/ext/hybris/mirpool.c
 @@ -0,0 +1,434 @@
 +/*
 + * GStreamer Mir buffer pool
@@ -1182,7 +1187,7 @@ Index: b/ext/mir/mirpool.c
 +#endif
 +
 +/* Object header */
-+#include "gstmirsink.h"
++#include "gsthybrissink.h"
 +#include "mirpool.h"
 +
 +#include <gst/mir/mirallocator.h>
@@ -1305,7 +1310,7 @@ Index: b/ext/mir/mirpool.c
 +gst_buffer_add_mir_meta (GstBuffer * buffer, GstMirBufferPool * mpool)
 +{
 +  GstMirMeta *mmeta;
-+  GstMirSink *sink;
++  GstHybrisSink *sink;
 +  guint stride = 0;
 +  guint size = 0;
 +
@@ -1501,15 +1506,15 @@ Index: b/ext/mir/mirpool.c
 +}
 +
 +GstBufferPool *
-+gst_mir_buffer_pool_new (GstMirSink * mirsink)
++gst_mir_buffer_pool_new (GstHybrisSink * hybrissink)
 +{
 +  GstMirBufferPool *m_pool;
 +
 +  GST_WARNING ("%s", __PRETTY_FUNCTION__);
 +
-+  g_return_val_if_fail (GST_IS_MIR_SINK (mirsink), NULL);
++  g_return_val_if_fail (GST_IS_HYBRIS_SINK (hybrissink), NULL);
 +  m_pool = g_object_new (GST_TYPE_MIR_BUFFER_POOL, NULL);
-+  m_pool->sink = gst_object_ref (mirsink);
++  m_pool->sink = gst_object_ref (hybrissink);
 +
 +  return GST_BUFFER_POOL_CAST (m_pool);
 +}
@@ -1591,10 +1596,11 @@ Index: b/ext/mir/mirpool.c
 +
 +  G_OBJECT_CLASS (gst_mir_buffer_pool_parent_class)->finalize (object);
 +}
-Index: b/ext/mir/mirpool.h
-===================================================================
+diff --git a/ext/hybris/mirpool.h b/ext/hybris/mirpool.h
+new file mode 100644
+index 0000000..d18844e
 --- /dev/null
-+++ b/ext/mir/mirpool.h
++++ b/ext/hybris/mirpool.h
 @@ -0,0 +1,91 @@
 +/*
 + * GStreamer Mir buffer pool
@@ -1621,7 +1627,7 @@ Index: b/ext/mir/mirpool.h
 +
 +G_BEGIN_DECLS
 +
-+#include "gstmirsink.h"
++#include "gsthybrissink.h"
 +#include <hybris/media/media_codec_layer.h>
 +#include <hybris/media/surface_texture_client_hybris.h>
 +typedef struct _GstMirMeta GstMirMeta;
@@ -1639,7 +1645,7 @@ Index: b/ext/mir/mirpool.h
 +struct _GstMirMeta {
 +  GstMeta meta;
 +
-+  GstMirSink *sink;
++  GstHybrisSink *sink;
 +
 +  size_t size;
 +  /* Are we doing hardware rendering? */
@@ -1656,7 +1662,7 @@ Index: b/ext/mir/mirpool.h
 +{
 +  GstBufferPool bufferpool;
 +
-+  GstMirSink *sink;
++  GstHybrisSink *sink;
 +
 +  /*Fixme: keep all these in GstMirBufferPoolPrivate*/
 +  GstCaps *caps;
@@ -1678,7 +1684,7 @@ Index: b/ext/mir/mirpool.h
 +
 +GType gst_mir_buffer_pool_get_type (void);
 +
-+GstBufferPool *gst_mir_buffer_pool_new (GstMirSink * mirsink);
++GstBufferPool *gst_mir_buffer_pool_new (GstHybrisSink * hybrissink);
 +void gst_mir_buffer_pool_set_surface_texture_client (GstBufferPool * pool, SurfaceTextureClientHybris sfc);
 +void gst_mir_buffer_pool_set_hardware_rendering (GstBufferPool * pool, gboolean do_hardware_rendering);
 +gboolean gst_mir_buffer_pool_get_hardware_rendering (GstMirBufferPool * mpool);
@@ -1687,11 +1693,11 @@ Index: b/ext/mir/mirpool.h
 +G_END_DECLS
 +
 +#endif /*__GST_MIR_BUFFER_POOL_H__*/
-Index: b/gst-libs/gst/Makefile.am
-===================================================================
+diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
+index 7d0b309..81bfeb3 100644
 --- a/gst-libs/gst/Makefile.am
 +++ b/gst-libs/gst/Makefile.am
-@@ -6,12 +6,16 @@
+@@ -6,12 +6,16 @@ if USE_GLES2
  GL_DIR = gl
  endif
  
@@ -1709,7 +1715,7 @@ Index: b/gst-libs/gst/Makefile.am
  
  noinst_HEADERS = gst-i18n-plugin.h gettext.h glib-compat-private.h
  DIST_SUBDIRS = uridownloader adaptivedemux interfaces gl basecamerabinsrc \
-@@ -24,7 +28,7 @@
+@@ -24,7 +28,7 @@ adaptivedemux: uridownloader
  
  INDEPENDENT_SUBDIRS = \
  	interfaces basecamerabinsrc codecparsers insertbin uridownloader \
@@ -1718,8 +1724,9 @@ Index: b/gst-libs/gst/Makefile.am
  
  .PHONY: independent-subdirs $(INDEPENDENT_SUBDIRS)
  
-Index: b/gst-libs/gst/mir/Makefile.am
-===================================================================
+diff --git a/gst-libs/gst/mir/Makefile.am b/gst-libs/gst/mir/Makefile.am
+new file mode 100644
+index 0000000..a2bfe9b
 --- /dev/null
 +++ b/gst-libs/gst/mir/Makefile.am
 @@ -0,0 +1,26 @@
@@ -1749,8 +1756,9 @@ Index: b/gst-libs/gst/mir/Makefile.am
 +	$(GST_LIB_LDFLAGS) \
 +	$(GST_ALL_LDFLAGS) \
 +	$(GST_LT_LDFLAGS)
-Index: b/gst-libs/gst/mir/gstmircontext.c
-===================================================================
+diff --git a/gst-libs/gst/mir/gstmircontext.c b/gst-libs/gst/mir/gstmircontext.c
+new file mode 100644
+index 0000000..c4ba833
 --- /dev/null
 +++ b/gst-libs/gst/mir/gstmircontext.c
 @@ -0,0 +1,155 @@
@@ -1909,8 +1917,9 @@ Index: b/gst-libs/gst/mir/gstmircontext.c
 +
 +  return NULL;
 +}
-Index: b/gst-libs/gst/mir/gstmircontext.h
-===================================================================
+diff --git a/gst-libs/gst/mir/gstmircontext.h b/gst-libs/gst/mir/gstmircontext.h
+new file mode 100644
+index 0000000..2226684
 --- /dev/null
 +++ b/gst-libs/gst/mir/gstmircontext.h
 @@ -0,0 +1,43 @@
@@ -1957,8 +1966,9 @@ Index: b/gst-libs/gst/mir/gstmircontext.h
 +G_END_DECLS
 +
 +#endif /* __GST_MIR_COMMON_H__ */
-Index: b/gst-libs/gst/mir/mirallocator.c
-===================================================================
+diff --git a/gst-libs/gst/mir/mirallocator.c b/gst-libs/gst/mir/mirallocator.c
+new file mode 100644
+index 0000000..ac6e766
 --- /dev/null
 +++ b/gst-libs/gst/mir/mirallocator.c
 @@ -0,0 +1,272 @@
@@ -2234,8 +2244,9 @@ Index: b/gst-libs/gst/mir/mirallocator.c
 +
 +  return GST_MEMORY_CAST (mem);
 +}
-Index: b/gst-libs/gst/mir/mirallocator.h
-===================================================================
+diff --git a/gst-libs/gst/mir/mirallocator.h b/gst-libs/gst/mir/mirallocator.h
+new file mode 100644
+index 0000000..efe3fe0
 --- /dev/null
 +++ b/gst-libs/gst/mir/mirallocator.h
 @@ -0,0 +1,69 @@
@@ -2308,11 +2319,11 @@ Index: b/gst-libs/gst/mir/mirallocator.h
 +    gpointer user_data, GDestroyNotify user_data_destroy);
 +
 +#endif /* __GST_MIR_ALLOCATOR_H__ */
-Index: b/sys/Makefile.am
-===================================================================
+diff --git a/sys/Makefile.am b/sys/Makefile.am
+index 5365316..23215eb 100644
 --- a/sys/Makefile.am
 +++ b/sys/Makefile.am
-@@ -10,6 +10,12 @@
+@@ -10,6 +10,12 @@ else
  ANDROID_MEDIA_DIR=
  endif
  
@@ -2325,8 +2336,8 @@ Index: b/sys/Makefile.am
  if USE_APPLE_MEDIA
  APPLE_MEDIA_DIR=applemedia
  else
-Index: b/sys/androidmedia/Makefile.am
-===================================================================
+diff --git a/sys/androidmedia/Makefile.am b/sys/androidmedia/Makefile.am
+index cb194f1..6507e85 100644
 --- a/sys/androidmedia/Makefile.am
 +++ b/sys/androidmedia/Makefile.am
 @@ -1,6 +1,12 @@
@@ -2343,7 +2354,7 @@ Index: b/sys/androidmedia/Makefile.am
  	gstahcsrc.c \
  	gstahssrc.c \
  	gstamcaudiodec.c \
-@@ -13,6 +19,7 @@
+@@ -13,6 +19,7 @@ libgstandroidmedia_la_SOURCES = \
  	gst-android-hardware-camera.c \
  	gst-android-hardware-sensor.c \
  	gstjniutils.c
@@ -2351,7 +2362,7 @@ Index: b/sys/androidmedia/Makefile.am
  
  noinst_HEADERS = \
  	gstahcsrc.h \
-@@ -33,9 +40,11 @@
+@@ -33,9 +40,11 @@ noinst_HEADERS = \
  libgstandroidmedia_la_CFLAGS = \
  	-I$(top_srcdir)/gst-libs \
  	-I$(top_builddir)/gst-libs \
@@ -2363,7 +2374,7 @@ Index: b/sys/androidmedia/Makefile.am
  	$(ORC_CFLAGS) \
  	-DGST_USE_UNSTABLE_API
  
-@@ -43,20 +52,24 @@
+@@ -43,15 +52,19 @@ libgstandroidmedia_la_LIBADD = \
  	$(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
  	$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \
  	$(GST_PLUGINS_BASE_LIBS) \
@@ -2373,7 +2384,7 @@ Index: b/sys/androidmedia/Makefile.am
  	-lgstvideo-@GST_API_VERSION@ \
 +	-lmedia \
  	$(GST_BASE_LIBS) \
--	$(GST_LIBS) \
+ 	$(GST_LIBS) \
 -	$(ORC_LIBS)
 +	$(ORC_LIBS) \
 +	$(top_builddir)/gst-libs/gst/mir/libgstmiralloc-@GST_API_VERSION@.la
@@ -2384,17 +2395,16 @@ Index: b/sys/androidmedia/Makefile.am
  androidmedia_java_classesdir = $(datadir)/gst-android/ndk-build/androidmedia/
  androidmedia_java_classes_DATA = \
  	org/freedesktop/gstreamer/androidmedia/GstAhcCallback.java \
- 	org/freedesktop/gstreamer/androidmedia/GstAhsCallback.java \
- 	org/freedesktop/gstreamer/androidmedia/GstAmcOnFrameAvailableListener.java
-+endif
+@@ -60,3 +73,4 @@ androidmedia_java_classes_DATA = \
  
  # Make sure the .java files end up in the tarball
  EXTRA_DIST = $(androidmedia_java_classes_DATA)
-Index: b/sys/androidmedia/gstamc-constants.h
-===================================================================
++endif
+diff --git a/sys/androidmedia/gstamc-constants.h b/sys/androidmedia/gstamc-constants.h
+index cc43f61..8ef701f 100644
 --- a/sys/androidmedia/gstamc-constants.h
 +++ b/sys/androidmedia/gstamc-constants.h
-@@ -92,7 +92,10 @@
+@@ -92,7 +92,10 @@ enum
    COLOR_Format18BitBGR666 = 41,
    COLOR_Format24BitARGB6666 = 42,
    COLOR_Format24BitABGR6666 = 43,
@@ -2405,7 +2415,7 @@ Index: b/sys/androidmedia/gstamc-constants.h
    COLOR_TI_FormatYUV420PackedSemiPlanar = 0x7f000100,
    COLOR_INTEL_FormatYUV420PackedSemiPlanar = 0x7fa00e00,
    COLOR_INTEL_FormatYUV420PackedSemiPlanar_Tiled = 0x7fa00f00,
-@@ -112,8 +115,15 @@
+@@ -112,8 +115,15 @@ enum
     * FIXME: Not actually implemented in the video decoder, it will just error out
     * The format seems to be equiv to V4L2_PIX_FMT_NV12MT_16X16 */
    COLOR_OMX_SEC_FormatNV12Tiled = 0x7fc00002,
@@ -2421,8 +2431,8 @@ Index: b/sys/androidmedia/gstamc-constants.h
  };
  
  enum
-Index: b/sys/androidmedia/gstamc.h
-===================================================================
+diff --git a/sys/androidmedia/gstamc.h b/sys/androidmedia/gstamc.h
+index 383eb42..dc5f459 100644
 --- a/sys/androidmedia/gstamc.h
 +++ b/sys/androidmedia/gstamc.h
 @@ -24,12 +24,67 @@
@@ -2494,7 +2504,7 @@ Index: b/sys/androidmedia/gstamc.h
  typedef struct _GstAmcCodecInfo GstAmcCodecInfo;
  typedef struct _GstAmcCodecType GstAmcCodecType;
  typedef struct _GstAmcCodec GstAmcCodec;
-@@ -59,16 +114,29 @@
+@@ -59,16 +114,29 @@ struct _GstAmcCodecInfo {
  };
  
  struct _GstAmcFormat {
@@ -2524,7 +2534,7 @@ Index: b/sys/androidmedia/gstamc.h
  };
  
  struct _GstAmcBufferInfo {
-@@ -83,7 +151,15 @@
+@@ -83,7 +151,15 @@ extern GQuark gst_amc_codec_info_quark;
  GstAmcCodec * gst_amc_codec_new (const gchar *name, GError **err);
  void gst_amc_codec_free (GstAmcCodec * codec);
  
@@ -2540,7 +2550,7 @@ Index: b/sys/androidmedia/gstamc.h
  GstAmcFormat * gst_amc_codec_get_output_format (GstAmcCodec * codec, GError **err);
  
  gboolean gst_amc_codec_start (GstAmcCodec * codec, GError **err);
-@@ -91,18 +167,33 @@
+@@ -91,18 +167,33 @@ gboolean gst_amc_codec_stop (GstAmcCodec * codec, GError **err);
  gboolean gst_amc_codec_flush (GstAmcCodec * codec, GError **err);
  gboolean gst_amc_codec_release (GstAmcCodec * codec, GError **err);
  
@@ -2559,9 +2569,9 @@ Index: b/sys/androidmedia/gstamc.h
  
  gboolean gst_amc_codec_queue_input_buffer (GstAmcCodec * codec, gint index, const GstAmcBufferInfo *info, GError **err);
 +#ifdef HAVE_ANDROID_MEDIA_HYBRIS
-+gboolean gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index, gboolean render, GError **err);
-+#else
  gboolean gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index, gboolean render, GError **err);
++#else
++gboolean gst_amc_codec_release_output_buffer (GstAmcCodec * codec, gint index, gboolean render, GError **err);
 +#endif
  
  
@@ -2574,7 +2584,7 @@ Index: b/sys/androidmedia/gstamc.h
  void gst_amc_format_free (GstAmcFormat * format);
  
  gchar * gst_amc_format_to_string (GstAmcFormat * format, GError **err);
-@@ -118,6 +209,10 @@
+@@ -118,6 +209,10 @@ gboolean gst_amc_format_set_string (GstAmcFormat *format, const gchar *key, cons
  gboolean gst_amc_format_get_buffer (GstAmcFormat *format, const gchar *key, guint8 **data, gsize *size, GError **err);
  gboolean gst_amc_format_set_buffer (GstAmcFormat *format, const gchar *key, guint8 *data, gsize size, GError **err);
  
@@ -2585,11 +2595,11 @@ Index: b/sys/androidmedia/gstamc.h
  GstVideoFormat gst_amc_color_format_to_video_format (const GstAmcCodecInfo * codec_info, const gchar * mime, gint color_format);
  gint gst_amc_video_format_to_color_format (const GstAmcCodecInfo * codec_info, const gchar * mime, GstVideoFormat video_format);
  
-Index: b/sys/androidmedia/gstamcaudiodec.h
-===================================================================
+diff --git a/sys/androidmedia/gstamcaudiodec.h b/sys/androidmedia/gstamcaudiodec.h
+index 04e9734..72d68fc 100644
 --- a/sys/androidmedia/gstamcaudiodec.h
 +++ b/sys/androidmedia/gstamcaudiodec.h
-@@ -51,6 +51,10 @@
+@@ -51,6 +51,10 @@ struct _GstAmcAudioDec
  
    /* < private > */
    GstAmcCodec *codec;
@@ -2600,7 +2610,7 @@ Index: b/sys/androidmedia/gstamcaudiodec.h
  
    GstCaps *input_caps;
    GList *codec_datas;
-@@ -81,6 +85,10 @@
+@@ -81,6 +85,10 @@ struct _GstAmcAudioDec
    gboolean draining;
    /* TRUE if the component is drained currently */
    gboolean drained;
@@ -2611,8 +2621,9 @@ Index: b/sys/androidmedia/gstamcaudiodec.h
  
    GstFlowReturn downstream_flow_ret;
  };
-Index: b/sys/androidmedia/gstamcaudiodechybris.c
-===================================================================
+diff --git a/sys/androidmedia/gstamcaudiodechybris.c b/sys/androidmedia/gstamcaudiodechybris.c
+new file mode 100644
+index 0000000..f361418
 --- /dev/null
 +++ b/sys/androidmedia/gstamcaudiodechybris.c
 @@ -0,0 +1,1291 @@
@@ -3907,8 +3918,9 @@ Index: b/sys/androidmedia/gstamcaudiodechybris.c
 +
 +  return ret;
 +}
-Index: b/sys/androidmedia/gstamchybris.c
-===================================================================
+diff --git a/sys/androidmedia/gstamchybris.c b/sys/androidmedia/gstamchybris.c
+new file mode 100644
+index 0000000..f01a873
 --- /dev/null
 +++ b/sys/androidmedia/gstamchybris.c
 @@ -0,0 +1,2189 @@
@@ -6101,8 +6113,8 @@ Index: b/sys/androidmedia/gstamchybris.c
 +    "Android Media Hybris plugin",
 +    plugin_init,
 +    PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-Index: b/sys/androidmedia/gstamcvideodec.h
-===================================================================
+diff --git a/sys/androidmedia/gstamcvideodec.h b/sys/androidmedia/gstamcvideodec.h
+index 039a785..9dd60f5 100644
 --- a/sys/androidmedia/gstamcvideodec.h
 +++ b/sys/androidmedia/gstamcvideodec.h
 @@ -22,12 +22,20 @@
@@ -6128,7 +6140,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
  
  G_BEGIN_DECLS
  
-@@ -62,10 +70,19 @@
+@@ -62,10 +70,19 @@ struct _GstAmcVideoDec
    /* < private > */
    GstAmcCodec *codec;
    GstAmcCodecConfig codec_config;
@@ -6148,7 +6160,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
    /* Output format of the codec */
    GstVideoFormat format;
    GstAmcColorFormatInfo color_format_info;
-@@ -81,6 +98,10 @@
+@@ -81,6 +98,10 @@ struct _GstAmcVideoDec
    gboolean started;
    gboolean flushing;
  
@@ -6159,7 +6171,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
    GstClockTime last_upstream_ts;
  
    /* Draining state */
-@@ -90,21 +111,30 @@
+@@ -90,21 +111,30 @@ struct _GstAmcVideoDec
    gboolean draining;
    /* TRUE if the component is drained currently */
    gboolean drained;
@@ -6190,7 +6202,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
    GError *gl_error;
    GMutex gl_lock;
    GCond gl_cond;
-@@ -113,6 +143,16 @@
+@@ -113,6 +143,16 @@ struct _GstAmcVideoDec
    guint gl_ready_frame_count;  /* n buffers ready for GL access */
    guint gl_released_frame_count;  /* n buffers released */
    GQueue *gl_queue;
@@ -6207,8 +6219,9 @@ Index: b/sys/androidmedia/gstamcvideodec.h
  };
  
  struct _GstAmcVideoDecClass
-Index: b/sys/androidmedia/gstamcvideodechybris.c
-===================================================================
+diff --git a/sys/androidmedia/gstamcvideodechybris.c b/sys/androidmedia/gstamcvideodechybris.c
+new file mode 100644
+index 0000000..5a97e88
 --- /dev/null
 +++ b/sys/androidmedia/gstamcvideodechybris.c
 @@ -0,0 +1,2408 @@
@@ -6252,7 +6265,7 @@ Index: b/sys/androidmedia/gstamcvideodechybris.c
 +#include <string.h>
 +
 +#include <gst/mir/mirallocator.h>
-+#include <ext/mir/mirpool.h>
++#include <ext/hybris/mirpool.h>
 +
 +#ifdef HAVE_ORC
 +#include <orc/orc.h>
@@ -8620,11 +8633,11 @@ Index: b/sys/androidmedia/gstamcvideodechybris.c
 +
 +  return TRUE;
 +}
-Index: b/tests/check/Makefile.am
-===================================================================
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 39f5aba..24051d8 100644
 --- a/tests/check/Makefile.am
 +++ b/tests/check/Makefile.am
-@@ -217,6 +217,12 @@
+@@ -217,6 +217,12 @@ else
  check_gl=
  endif
  
@@ -8637,7 +8650,7 @@ Index: b/tests/check/Makefile.am
  VALGRIND_TO_FIX = \
  	elements/mpeg2enc \
  	elements/mplex    \
-@@ -282,6 +288,7 @@
+@@ -282,6 +288,7 @@ check_PROGRAMS = \
  	elements/rtponviftimestamp \
  	elements/id3mux \
  	pipelines/mxf \
@@ -8645,8 +8658,9 @@ Index: b/tests/check/Makefile.am
  	$(check_mimic) \
  	libs/mpegvideoparser \
  	libs/mpegts \
-Index: b/tests/check/pipelines/gstamcvideodec.c
-===================================================================
+diff --git a/tests/check/pipelines/gstamcvideodec.c b/tests/check/pipelines/gstamcvideodec.c
+new file mode 100644
+index 0000000..eb6d9e9
 --- /dev/null
 +++ b/tests/check/pipelines/gstamcvideodec.c
 @@ -0,0 +1,538 @@
@@ -9188,8 +9202,9 @@ Index: b/tests/check/pipelines/gstamcvideodec.c
 +}
 +
 +GST_CHECK_MAIN (gstamcvideodec);
-Index: b/tests/check/pipelines/gstamcvideodec_egl.c
-===================================================================
+diff --git a/tests/check/pipelines/gstamcvideodec_egl.c b/tests/check/pipelines/gstamcvideodec_egl.c
+new file mode 100644
+index 0000000..56b70ed
 --- /dev/null
 +++ b/tests/check/pipelines/gstamcvideodec_egl.c
 @@ -0,0 +1,56 @@
diff --git a/debian/patches/desktop-mirsink.patch b/debian/patches/desktop-mirsink.patch
new file mode 100644
index 0000000..c1ff0c7
--- /dev/null
+++ b/debian/patches/desktop-mirsink.patch
@@ -0,0 +1,1355 @@
+From: =?utf-8?q?Alfonso_S=C3=A1nchez-Beato?= <[e-mail]>
+Date: Tue, 14 Feb 2017 16:39:12 +0100
+Subject: New mirsink for desktop usage
+
+The mirsink works in two modes: if "export-buffers" property is set, it
+exports dma buffers that are sent to the client by posting a GstMessage.
+If not, it creates its own rendering Mir window.
+
+From: Alfonso Sanchez-Beato <[e-mail]>
+Origin: vendor
+Forwarded: no
+---
+ configure.ac         |   13 +
+ ext/Makefile.am      |    8 +
+ ext/mir/Makefile.am  |   14 +
+ ext/mir/gstmirsink.c | 1113 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ ext/mir/gstmirsink.h |  117 ++++++
+ 5 files changed, 1265 insertions(+)
+ create mode 100644 ext/mir/Makefile.am
+ create mode 100644 ext/mir/gstmirsink.c
+ create mode 100644 ext/mir/gstmirsink.h
+
+diff --git a/configure.ac b/configure.ac
+index 7444429..54b1891 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1796,6 +1796,17 @@ AG_GST_CHECK_FEATURE(ANDROID_MEDIA_HYBRIS, [Android Media Hybris], androidmediah
+       )], HAVE_ANDROID_MEDIA_HYBRIS="no")
+ ])
+ 
++dnl *** A mir-based Platform ***
++translit(dnm, m, l) AM_CONDITIONAL(USE_MIR, true)
++HAVE_MIR="no"
++dnl Check for the presence of Mir client library
++AG_GST_CHECK_FEATURE(MIR, [Mir Server], mir, [
++      PKG_CHECK_MODULES(MIR, mirclient,
++              [HAVE_MIR="yes"],
++              [HAVE_MIR="no"]
++      )
++])
++
+ dnl *** AppleMedia (OS X and iOS) ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_APPLE_MEDIA, true)
+ HAVE_APPLE_MEDIA="no"
+@@ -3477,6 +3488,7 @@ AM_CONDITIONAL(USE_DIRECTFB, false)
+ AM_CONDITIONAL(USE_WAYLAND, false)
+ AM_CONDITIONAL(USE_DAALA, false)
+ AM_CONDITIONAL(USE_ANDROID_MEDIA_HYBRIS, false)
++AM_CONDITIONAL(USE_MIR, false)
+ AM_CONDITIONAL(USE_DTS, false)
+ AM_CONDITIONAL(USE_EXIF, false)
+ AM_CONDITIONAL(USE_RESINDVD, false)
+@@ -3818,6 +3830,7 @@ ext/libde265/Makefile
+ ext/libmms/Makefile
+ ext/libvisual/Makefile
+ ext/Makefile
++ext/mir/Makefile
+ ext/modplug/Makefile
+ ext/mpeg2enc/Makefile
+ ext/mimic/Makefile
+diff --git a/ext/Makefile.am b/ext/Makefile.am
+index 709bdb2..3ff2fc9 100644
+--- a/ext/Makefile.am
++++ b/ext/Makefile.am
+@@ -76,6 +76,12 @@ else
+ HYBRIS_DIR=
+ endif
+ 
++if USE_MIR
++MIR_DIR=mir
++else
++MIR_DIR=
++endif
++
+ if USE_DTS
+ DTS_DIR=dts
+ else
+@@ -464,6 +470,7 @@ SUBDIRS=\
+ 	$(LIBMMS_DIR) \
+ 	$(LIBVISUAL_DIR) \
+ 	$(HYBRIS_DIR) \
++	$(MIR_DIR) \
+ 	$(MODPLUG_DIR) \
+ 	$(MPEG2ENC_DIR) \
+ 	$(MIMIC_DIR) \
+@@ -516,6 +523,7 @@ DIST_SUBDIRS = \
+ 	directfb \
+ 	wayland \
+ 	hybris \
++	mir \
+ 	faac \
+ 	faad \
+ 	fdkaac \
+diff --git a/ext/mir/Makefile.am b/ext/mir/Makefile.am
+new file mode 100644
+index 0000000..c691e7a
+--- /dev/null
++++ b/ext/mir/Makefile.am
+@@ -0,0 +1,14 @@
++plugin_LTLIBRARIES = libgstmirsink.la
++
++libgstmirsink_la_SOURCES = gstmirsink.c
++libgstmirsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
++                               $(MIR_CFLAGS) \
++                               -I../../gst-libs/
++libgstmirsink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
++                               -lgstvideo-$(GST_API_VERSION) \
++                               $(GL_LIBS) $(EGL_LIBS) $(EGLGLES_LIBS) \
++                               $(MIR_LIBS)
++libgstmirsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
++libgstmirsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
++include_HEADERS = gstmirsink.h
++noinst_HEADERS =
+diff --git a/ext/mir/gstmirsink.c b/ext/mir/gstmirsink.c
+new file mode 100644
+index 0000000..533ae67
+--- /dev/null
++++ b/ext/mir/gstmirsink.c
+@@ -0,0 +1,1113 @@
++/*
++ * GStreamer Mir video sink
++ * Copyright (C) 2017 Canonical Ltd
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 3 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA.
++ */
++
++/**
++ * SECTION:element-mirsink
++ *
++ *  The mirsink works in two modes: if "export-buffers" property is set, it
++ *  exports dma buffers that are sent to the client by posting a GstMessage.
++ *  If not, it creates its own rendering window.
++ *  TODO: a third mode where the rendering surface is provided by the client.
++ *
++ * <refsect2>
++ * <title>Example pipeline</title>
++ * |[
++ * gst-launch-1.0 filesrc location=<video_file> ! qtdemux ! queue ! \
++ *                h264parse ! avdec_h264 ! mirsink
++ * ]| test the video rendering with mirsink
++ * </refsect2>
++ */
++
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
++#include "gstmirsink.h"
++
++/* signals */
++enum
++{
++  SIGNAL_0,
++  LAST_SIGNAL
++};
++
++/* Properties */
++enum
++{
++  PROP_0,
++  PROP_MIR_EXPORT_BUFFERS,
++  PROP_MIR_VIDEO_HEIGHT,
++  PROP_MIR_VIDEO_WIDTH
++};
++
++GST_DEBUG_CATEGORY (gstmir_debug);
++#define GST_CAT_DEFAULT gstmir_debug
++
++static GstStaticPadTemplate gst_mirsink_sink_caps_template =
++  GST_STATIC_PAD_TEMPLATE ("sink",
++    GST_PAD_SINK,
++    GST_PAD_ALWAYS,
++    GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
++        ("{ BGRx, BGRA, RGBx, xBGR, xRGB, RGBA, ABGR, ARGB, RGB, BGR, "
++            "RGB16, BGR16, YUY2, YVYU, UYVY, AYUV, NV12, NV21, NV16, "
++            "YUV9, YVU9, Y41B, I420, YV12, Y42B, v308 }"))
++    );
++
++#define gst_mir_sink_parent_class parent_class
++G_DEFINE_TYPE (GstMirSink, gst_mir_sink, GST_TYPE_VIDEO_SINK);
++
++static void gst_mir_sink_get_property (GObject * object,
++    guint prop_id, GValue * value, GParamSpec * pspec);
++static void gst_mir_sink_set_property (GObject * object,
++    guint prop_id, const GValue * value, GParamSpec * pspec);
++static void gst_mir_sink_finalize (GObject * object);
++static void gst_mir_sink_set_context (GstElement * element,
++    GstContext * context);
++static GstCaps *gst_mir_sink_get_caps (GstBaseSink * bsink, GstCaps * filter);
++static gboolean gst_mir_sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
++static gboolean gst_mir_sink_start (GstBaseSink * bsink);
++static gboolean gst_mir_sink_stop (GstBaseSink * bsink);
++static gboolean gst_mir_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer);
++static gboolean
++gst_mir_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query);
++static gboolean gst_mir_sink_render (GstBaseSink * bsink, GstBuffer * buffer);
++static gboolean gst_mir_sink_query (GstBaseSink * bsink, GstQuery * query);
++
++static void
++gst_mir_sink_class_init (GstMirSinkClass * klass)
++{
++  GObjectClass *gobject_class;
++  GstElementClass *gstelement_class;
++  GstBaseSinkClass *gstbasesink_class;
++
++  gobject_class = (GObjectClass *) klass;
++  gstelement_class = (GstElementClass *) klass;
++  gstbasesink_class = (GstBaseSinkClass *) klass;
++
++  gobject_class->set_property = gst_mir_sink_set_property;
++  gobject_class->get_property = gst_mir_sink_get_property;
++  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_mir_sink_finalize);
++
++  gst_element_class_add_pad_template (gstelement_class,
++      gst_static_pad_template_get (&gst_mirsink_sink_caps_template));
++
++  gst_element_class_set_static_metadata (gstelement_class,
++      "Mir video sink", "Sink/Video",
++      "Output to Mir surface",
++      "Alfonso Sanchez-Beato <[e-mail]>");
++
++  //gstelement_class->change_state =
++  //    GST_DEBUG_FUNCPTR (gst_mir_sink_change_state);
++  gstelement_class->set_context = GST_DEBUG_FUNCPTR (gst_mir_sink_set_context);
++
++  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_mir_sink_get_caps);
++  gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_mir_sink_set_caps);
++  gstbasesink_class->start = GST_DEBUG_FUNCPTR (gst_mir_sink_start);
++  gstbasesink_class->stop = GST_DEBUG_FUNCPTR (gst_mir_sink_stop);
++  gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_mir_sink_preroll);
++  gstbasesink_class->propose_allocation =
++      GST_DEBUG_FUNCPTR (gst_mir_sink_propose_allocation);
++  gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_mir_sink_render);
++  gstbasesink_class->query = GST_DEBUG_FUNCPTR (gst_mir_sink_query);
++
++  g_object_class_install_property (gobject_class, PROP_MIR_EXPORT_BUFFERS,
++      g_param_spec_boolean ("export-buffers", "Export buffers flag",
++          "If set, dma_buf fds with decoded video are exported", FALSE,
++          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
++
++  g_object_class_install_property (gobject_class, PROP_MIR_VIDEO_HEIGHT,
++      g_param_spec_uint ("height", "Video Height",
++          "Height of each video frame", 0,
++          UINT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
++
++  g_object_class_install_property (gobject_class, PROP_MIR_VIDEO_WIDTH,
++      g_param_spec_uint ("width", "Video Width",
++          "Width of each video frame", 0,
++          UINT_MAX, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
++}
++
++static void
++gst_mir_sink_init (GstMirSink * sink)
++{
++  GST_DEBUG_OBJECT (sink, "Initializing mirsink");
++  sink->pool = NULL;
++
++  sink->export_buffers = FALSE;
++
++  g_mutex_init (&sink->mir_lock);
++}
++
++static void
++gst_mir_sink_get_property (GObject * object,
++    guint prop_id, GValue * value, GParamSpec * pspec)
++{
++  GstMirSink *sink = GST_MIR_SINK (object);
++
++  switch (prop_id) {
++    case PROP_MIR_EXPORT_BUFFERS:
++      g_value_set_boolean (value, sink->export_buffers);
++      break;
++    case PROP_MIR_VIDEO_HEIGHT:
++      g_value_set_uint (value, sink->video_height);
++      break;
++    case PROP_MIR_VIDEO_WIDTH:
++      g_value_set_uint (value, sink->video_width);
++      break;
++    default:
++      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++      break;
++  }
++}
++
++static void
++gst_mir_sink_set_property (GObject * object,
++    guint prop_id, const GValue * value, GParamSpec * pspec)
++{
++  GstMirSink *sink = GST_MIR_SINK (object);
++
++  switch (prop_id) {
++    case PROP_MIR_EXPORT_BUFFERS:
++      sink->export_buffers = g_value_get_boolean (value);
++      GST_INFO_OBJECT (object, "export_buffers set: %d", sink->export_buffers);
++      break;
++    default:
++      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
++      break;
++  }
++}
++
++static void
++gst_mir_sink_finalize (GObject * object)
++{
++  GstMirSink *sink = GST_MIR_SINK (object);
++
++  GST_DEBUG_OBJECT (sink, "Finalizing the sink..");
++
++  g_mutex_clear (&sink->mir_lock);
++
++  G_OBJECT_CLASS (parent_class)->finalize (object);
++}
++
++static void
++gst_mir_sink_set_context (GstElement * element, GstContext * context)
++{
++  /* TODO Will handle reception of mir rendering window */
++  GST_INFO_OBJECT (element, "%s", __PRETTY_FUNCTION__);
++}
++
++static gboolean
++gst_mir_sink_query (GstBaseSink * bsink, GstQuery * query)
++{
++  GstMirSink *sink = GST_MIR_SINK (bsink);
++
++  GST_INFO_OBJECT (sink, "query type %s", GST_QUERY_TYPE_NAME (query));
++
++  switch (GST_QUERY_TYPE (query)) {
++    case GST_QUERY_CONTEXT:
++    default:
++      goto base_class;
++      break;
++  }
++
++base_class:
++  return GST_BASE_SINK_CLASS (parent_class)->query (bsink, query);
++}
++
++static GstCaps *
++gst_mir_sink_get_caps (GstBaseSink * bsink, GstCaps * filter)
++{
++  GstMirSink *sink;
++  GstCaps *caps;
++
++  sink = GST_MIR_SINK (bsink);
++
++  GST_DEBUG_OBJECT (sink, "%s", __PRETTY_FUNCTION__);
++
++  caps = gst_pad_get_pad_template_caps (GST_VIDEO_SINK_PAD (sink));
++  if (filter) {
++    GstCaps *intersection;
++
++    intersection =
++        gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
++    gst_caps_unref (caps);
++    caps = intersection;
++  }
++  return caps;
++}
++
++static gboolean
++gst_mir_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
++{
++  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstVideoInfo info;
++  GstStructure *structure;
++  GstBufferPool *newpool;
++
++  sink = GST_MIR_SINK (bsink);
++
++  GST_DEBUG_OBJECT (sink, "set caps %" GST_PTR_FORMAT, caps);
++
++  if (!gst_video_info_from_caps (&info, caps))
++    goto invalid_format;
++
++  sink->video_width = info.width;
++  sink->video_height = info.height;
++  sink->video_format = (info.finfo)->format;
++
++  GST_DEBUG_OBJECT (sink, "sink->video_width: %u", sink->video_width);
++  GST_DEBUG_OBJECT (sink, "sink->video_height: %u", sink->video_height);
++  GST_DEBUG_OBJECT (sink, "Format %s (%s, %d)", (info.finfo)->description,
++      (info.finfo)->name, sink->video_format);
++  GST_DEBUG_OBJECT (sink, "Default allocator at 0x%p",
++      gst_allocator_find (NULL));
++
++  /* Create a new pool for the new configuration */
++  GST_DEBUG_OBJECT (sink, "Creating new GstBufferPool");
++  newpool = gst_video_buffer_pool_new ();
++  if (!newpool)
++    goto pool_failed;
++
++  structure = gst_buffer_pool_get_config (newpool);
++  /* Allocate a minimum of 2 buffers and an unlimited maximum (max=0) */
++  gst_buffer_pool_config_set_params (structure, caps, info.size, 2, 0);
++  /* Using default allocator for decoded buffers */
++  gst_buffer_pool_config_set_allocator (structure, gst_allocator_find (NULL),
++      NULL);
++  if (!gst_buffer_pool_set_config (newpool, structure))
++    goto config_failed;
++
++  gst_object_replace ((GstObject **) & sink->pool, (GstObject *) newpool);
++  gst_object_unref (newpool);
++
++  GST_DEBUG_OBJECT (sink, "Finishing up set_caps");
++
++  return TRUE;
++
++invalid_format:
++  {
++    GST_DEBUG_OBJECT (sink,
++        "Could not locate image format from caps %" GST_PTR_FORMAT, caps);
++    return FALSE;
++  }
++pool_failed:
++  {
++    GST_DEBUG_OBJECT (sink, "Failed to create new pool");
++    return FALSE;
++  }
++config_failed:
++  {
++    GST_DEBUG_OBJECT (bsink, "failed setting config");
++    gst_object_unref (newpool);
++    return FALSE;
++  }
++}
++
++/* vertex shader */
++static const char vshadersrc[] =
++  "attribute vec4 attrpos;\n"
++  "attribute vec2 attrcordY;\n"
++  "attribute vec2 attrcordU;\n"
++  "attribute vec2 attrcordV;\n"
++  "varying vec2 cordY;\n"
++  "varying vec2 cordU;\n"
++  "varying vec2 cordV;\n"
++  "\n"
++  "void main ()\n"
++  "{\n"
++  "  cordY = attrcordY;\n"
++  "  cordU = attrcordU;\n"
++  "  cordV = attrcordV;\n"
++  "  gl_Position = attrpos;\n"
++  "}\n";
++
++/* fragment shader */
++static const char fshadersrc[] =
++  "precision mediump float;\n"
++  "uniform sampler2D sampY;\n"
++  "uniform sampler2D sampU;\n"
++  "uniform sampler2D sampV;\n"
++  "uniform mat4 yuvmat;\n"
++  "varying vec2 cordY;\n"
++  "varying vec2 cordU;\n"
++  "varying vec2 cordV;\n"
++  "\n"
++  "/* Convert YV12 to RGB */\n"
++  "void main()\n"
++  "{\n"
++  "  vec4 yuv, rgb;\n"
++  "\n"
++  "  yuv.rgba = vec4(texture2D(sampY, cordY).r,\n"
++  "                  texture2D(sampU, cordU).r - 0.5,\n"
++  "                  texture2D(sampV, cordV).r - 0.5,\n"
++  "                  1.0);\n"
++  "\n"
++  "  rgb = yuvmat * yuv;\n"
++  "  gl_FragColor = rgb;\n"
++  "}\n";
++
++/* YUV to RGB conversion matrix */
++static GLfloat yuv_coef_bt601[4][4] =
++{
++  { 1.0f,      1.0f,     1.0f,     0.0f },
++  { 0.0f,     -0.344f,   1.773f,   0.0f },
++  { 1.403f,   -0.714f,   0.0f,     0.0f },
++  { 0.0f,      0.0f,     0.0f,     1.0f }
++};
++
++/* Set vertex coordinates to (-1,1), (1,1), (1,-1), (-1,-1), so we fill all
++ * the virtual device surface.
++ */
++static GLfloat dest_vert[4][2] =
++{ { -1.f, 1.f }, { 1.f, 1.f }, { 1.f, -1.f }, { -1.f, -1.f } };
++
++/* Set texture coordinates to (0,0), (1,0), (1,1), (0,1) so we cover fully the
++ * drawn surface. Note that texture coordinates have a [0,1] range.
++ */
++static GLfloat tex_vert[3][4][2] =
++{
++  { { 0.f, 0.f }, { 1.f, 0.f }, { 1.f, 1.f }, { 0.f, 1.f } },
++  { { 0.f, 0.f }, { 1.f, 0.f }, { 1.f, 1.f }, { 0.f, 1.f } },
++  { { 0.f, 0.f }, { 1.f, 0.f }, { 1.f, 1.f }, { 0.f, 1.f } },
++};
++
++static gboolean
++gl_error(GstMirSink *sink)
++{
++  GLenum err;
++  gboolean is_gl_err = FALSE;
++
++  while((err = glGetError()) != GL_NO_ERROR) {
++    GST_ERROR_OBJECT (sink, "OpenGL error %d (0x%X)", err, err);
++    is_gl_err = TRUE;
++  }
++
++  return is_gl_err;
++}
++
++static GLuint
++load_shader (GstMirSink *sink, const char *src, GLenum type)
++{
++  GLuint shader = glCreateShader (type);
++  GLint compiled;
++
++  if (!shader)
++    goto exit;
++
++  glShaderSource (shader, 1, &src, NULL);
++  glCompileShader (shader);
++  glGetShaderiv (shader, GL_COMPILE_STATUS, &compiled);
++
++  if (!compiled) {
++    GLchar log[1024];
++
++    glGetShaderInfoLog (shader, sizeof log - 1, NULL, log);
++    log[sizeof log - 1] = '\0';
++    GST_ERROR_OBJECT (sink, "load_shader compile failed: %s", log);
++    glDeleteShader (shader);
++    shader = 0;
++  }
++
++exit:
++  return shader;
++}
++
++static gboolean
++create_shaders (GstMirSink *sink)
++{
++  GLint linked;
++  int i;
++
++  sink->vshader = load_shader (sink, vshadersrc, GL_VERTEX_SHADER);
++  if (!sink->vshader) {
++    GST_ERROR_OBJECT (sink, "Cannot create vertex shader for mirsink");
++    goto error;
++  }
++  sink->fshader = load_shader (sink, fshadersrc, GL_FRAGMENT_SHADER);
++  if (!sink->fshader) {
++    GST_ERROR_OBJECT (sink, "Cannot create fragment shader for mirsink");
++    goto error;
++  }
++  sink->prog = glCreateProgram ();
++  if (!sink->prog) {
++    GST_ERROR_OBJECT (sink, "Cannot create GLSL program");
++    goto error;
++  }
++  glAttachShader (sink->prog, sink->vshader);
++  glAttachShader (sink->prog, sink->fshader);
++  glLinkProgram (sink->prog);
++
++  glGetProgramiv (sink->prog, GL_LINK_STATUS, &linked);
++  if (!linked) {
++    GLchar log[1024];
++    glGetProgramInfoLog (sink->prog, sizeof log - 1, NULL, log);
++    log[sizeof log - 1] = '\0';
++    GST_ERROR_OBJECT (sink, "Link failed: %s", log);
++    goto error;
++  }
++
++  glUseProgram (sink->prog);
++
++  sink->attrpos = glGetAttribLocation (sink->prog, "attrpos");
++  sink->attrcordYUV[0] = glGetAttribLocation (sink->prog, "attrcordY");
++  sink->attrcordYUV[1] = glGetAttribLocation (sink->prog, "attrcordU");
++  sink->attrcordYUV[2] = glGetAttribLocation (sink->prog, "attrcordV");
++  sink->sampYUV[0] = glGetUniformLocation (sink->prog, "sampY");
++  sink->sampYUV[1] = glGetUniformLocation (sink->prog, "sampU");
++  sink->sampYUV[2] = glGetUniformLocation (sink->prog, "sampV");
++  sink->yuvmat = glGetUniformLocation (sink->prog, "yuvmat");
++
++  /* Set shader variables */
++
++  glUniformMatrix4fv (sink->yuvmat, 1, GL_FALSE, &yuv_coef_bt601[0][0]);
++
++  /* Missing components filled by specification with (0,0,0,1) */
++  glVertexAttribPointer (sink->attrpos, 2, GL_FLOAT, GL_FALSE, 0, dest_vert);
++  glEnableVertexAttribArray (sink->attrpos);
++
++  for (i = 0; i < G_N_ELEMENTS (sink->attrcordYUV); ++i) {
++    glVertexAttribPointer (sink->attrcordYUV[i], 2, GL_FLOAT,
++        GL_FALSE, 0, tex_vert[i]);
++    glEnableVertexAttribArray (sink->attrcordYUV[i]);
++  }
++
++  /* Create textures for YUV planes */
++  glGenTextures (G_N_ELEMENTS (sink->text_id), sink->text_id);
++
++  for (i = 0; i < G_N_ELEMENTS (sink->attrcordYUV); ++i) {
++    /* GL_TEXTUREi = GL_TEXTURE0 + i is guaranteed */
++    /* Looks like OGLES selects the first free texture anyway, so calling
++     * glActiveTexture here is not a must. But it is needed when rendering. */
++    glActiveTexture (GL_TEXTURE0 + i);
++    glBindTexture (GL_TEXTURE_2D, sink->text_id[i]);
++    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++    glUniform1i (sink->sampYUV[i], i);
++  }
++
++  if (gl_error (sink))
++    goto error;
++
++  return TRUE;
++
++error:
++  glDeleteTextures (G_N_ELEMENTS (sink->text_id), sink->text_id);
++  /* So we know they do not exist anymore */
++  memset (sink->text_id, 0, sizeof sink->text_id);
++
++  glDisableVertexAttribArray (sink->attrpos);
++  sink->attrpos = 0;
++  for (i = 0; i < G_N_ELEMENTS (sink->attrcordYUV); ++i)
++    glDisableVertexAttribArray (sink->attrcordYUV[i]);
++  /* So we know they do not exist anymore */
++  memset (sink->attrcordYUV, 0, sizeof sink->attrcordYUV);
++
++  glDeleteShader (sink->vshader);
++  glDeleteShader (sink->fshader);
++  glDeleteProgram (sink->prog);
++  sink->vshader = 0;
++  sink->fshader = 0;
++  sink->prog = 0;
++
++  return FALSE;
++}
++
++static void
++mir_eglapp_handle_event (MirWindow *surface, MirEvent const *ev, void *ctx)
++{
++  GstMirSink *sink = ctx;
++
++  switch (mir_event_get_type (ev)) {
++  case mir_event_type_input:
++  case mir_event_type_surface:
++  case mir_event_type_resize:
++    break;
++  case mir_event_type_close_surface:
++    /* TODO Stop streaming if this happens. Handle locking. */
++    GST_DEBUG_OBJECT (sink, "Received close event from server");
++    break;
++  default:
++    break;
++  }
++}
++
++static const MirOutput *
++find_active_output (const MirDisplayConfig *conf)
++{
++  int num_outputs = mir_display_config_get_num_outputs (conf);
++  int i;
++
++  for (i = 0; i < num_outputs; ++i) {
++    MirOutput const *output = mir_display_config_get_output (conf, i);
++    MirOutputConnectionState state = mir_output_get_connection_state (output);
++
++    if (state == mir_output_connection_state_connected &&
++        mir_output_is_enabled (output))
++      return output;
++  }
++
++  return NULL;
++}
++
++static EGLSurface
++create_window (GstMirSink *sink, EGLConfig eglconfig)
++{
++  MirEGLNativeWindowType mir_window;
++  MirDisplayConfig *display_config = NULL;
++  const MirOutput *display_output;
++  const MirOutputMode *display_mode;
++  int pos_x, pos_y;
++  MirWindowSpec *spec = NULL;
++  MirPixelFormat pixel_format;
++  int width, height;
++  MirBufferStream *buff_stream;
++
++  pixel_format = mir_connection_get_egl_pixel_format (sink->conn,
++      sink->egldisplay, eglconfig);
++
++  GST_DEBUG_OBJECT (sink, "Mir chose format %d", pixel_format);
++  /* As we are opaque then it's OK to switch pixel format slightly,
++   * to enable bypass/overlays to work. Otherwise the presence of an
++   * alpha channel would prevent them from being used.
++   * It would be really nice if Mesa just gave us the right answer in
++   * the first place though. (LP: #1480755)
++   */
++  if (pixel_format == mir_pixel_format_abgr_8888)
++    pixel_format = mir_pixel_format_xbgr_8888;
++  else if (pixel_format == mir_pixel_format_argb_8888)
++    pixel_format = mir_pixel_format_xrgb_8888;
++  GST_DEBUG_OBJECT (sink, "Selected format is %d", pixel_format);
++
++  display_config = mir_connection_create_display_configuration (sink->conn);
++  display_output = find_active_output (display_config);
++  if (!display_output) {
++    GST_ERROR_OBJECT (sink, "There is no active output");
++    goto error;
++  }
++
++  display_mode = mir_output_get_current_mode (display_output);
++  if (!display_mode) {
++    GST_ERROR_OBJECT (sink, "No default mode for output");
++    goto error;
++  }
++
++  pos_x = mir_output_get_position_x (display_output);
++  pos_y = mir_output_get_position_y (display_output);
++
++  width  = mir_output_mode_get_width (display_mode);
++  height = mir_output_mode_get_height (display_mode);
++
++  GST_DEBUG_OBJECT (sink, "Current active output is %dx%d %+d%+d\n",
++      width, height, pos_x, pos_y);
++
++  mir_display_config_release (display_config);
++
++  spec = mir_create_normal_window_spec (sink->conn, width, height);
++  mir_window_spec_set_pixel_format (spec, pixel_format);
++  mir_window_spec_set_name (spec, "mirsink");
++
++  sink->window = mir_create_window_sync (spec);
++  mir_window_spec_release (spec);
++
++  if (!mir_window_is_valid (sink->window)) {
++    GST_ERROR_OBJECT (sink, "Cannot create valid window");
++    goto error;
++  }
++
++  mir_window_set_event_handler (sink->window, mir_eglapp_handle_event, sink);
++
++  buff_stream = mir_window_get_buffer_stream (sink->window);
++  mir_window = mir_buffer_stream_get_egl_native_window (buff_stream);
++
++  return eglCreateWindowSurface (sink->egldisplay, eglconfig,
++      (EGLNativeWindowType) mir_window, NULL);
++
++error:
++  if (sink->window) {
++    mir_window_release_sync (sink->window);
++    sink->window = NULL;
++  }
++  if (display_config)
++    mir_display_config_release (display_config);
++
++  return EGL_NO_SURFACE;
++}
++
++static gboolean
++gst_mir_sink_start (GstBaseSink * bsink)
++{
++  GstMirSink *sink = (GstMirSink *) bsink;
++
++  GST_DEBUG_OBJECT (sink, "start");
++
++  return TRUE;
++}
++
++static gboolean
++gst_mir_sink_stop (GstBaseSink * bsink)
++{
++  GstMirSink *sink = (GstMirSink *) bsink;
++  int i;
++
++  GST_DEBUG_OBJECT (sink, "stop");
++
++  /* Clean up GL stuff */
++
++  if (sink->buf_fd) {
++    close (sink->buf_fd);
++    sink->buf_fd = 0;
++  }
++
++  glDeleteFramebuffers(1, &sink->fbo);
++  sink->fbo = 0;
++  glDeleteTextures (1, &sink->render_tex);
++  sink->render_tex = 0;
++
++  glDeleteTextures (G_N_ELEMENTS (sink->text_id), sink->text_id);
++  memset (sink->text_id, 0, sizeof sink->text_id);
++
++  glDisableVertexAttribArray (sink->attrpos);
++  sink->attrpos = 0;
++  for (i = 0; i < G_N_ELEMENTS (sink->attrcordYUV); ++i)
++    glDisableVertexAttribArray (sink->attrcordYUV[i]);
++  memset (sink->attrcordYUV, 0, sizeof sink->attrcordYUV);
++
++  glDeleteShader (sink->vshader);
++  glDeleteShader (sink->fshader);
++  glDeleteProgram (sink->prog);
++  sink->vshader = 0;
++  sink->fshader = 0;
++  sink->prog = 0;
++
++  /* Clean up EGL stuff */
++
++  if (sink->egldisplay != EGL_NO_DISPLAY) {
++    if (sink->eglsurface != EGL_NO_SURFACE) {
++      eglDestroySurface (sink->egldisplay, sink->eglsurface);
++      sink->eglsurface = EGL_NO_SURFACE;
++    }
++    if (sink->eglctx != EGL_NO_CONTEXT) {
++      eglDestroyContext (sink->egldisplay, sink->eglctx);
++      sink->eglctx = EGL_NO_CONTEXT;
++    }
++    eglTerminate (sink->egldisplay);
++    sink->egldisplay = EGL_NO_DISPLAY;
++  }
++
++  /* Clean up Mir stuff */
++
++  if (sink->window) {
++    mir_window_release_sync (sink->window);
++    sink->window = NULL;
++  }
++  if (sink->conn) {
++    mir_connection_release (sink->conn);
++    sink->conn = NULL;
++  }
++
++  /* The pool is not re-used so must be destroyed here */
++  if (sink->pool) {
++    gst_object_unref (sink->pool);
++    sink->pool = NULL;
++  }
++
++  return TRUE;
++}
++
++static gboolean
++gst_mir_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
++{
++  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstStructure *config;
++  guint size, min_bufs, max_bufs;
++
++  GST_DEBUG_OBJECT (sink, "Proposing ALLOCATION params");
++
++  config = gst_buffer_pool_get_config (sink->pool);
++  gst_buffer_pool_config_get_params (config, NULL, &size, &min_bufs, &max_bufs);
++
++  /* we do have a pool for sure (created in set_caps),
++   * so let's propose it anyway, but also propose the allocator on its own
++   */
++  gst_query_add_allocation_pool (query, sink->pool, size, min_bufs, max_bufs);
++  gst_query_add_allocation_param (query, gst_allocator_find (NULL), NULL);
++
++  gst_structure_free (config);
++
++  return TRUE;
++}
++
++static GstFlowReturn
++gst_mir_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
++{
++  GST_DEBUG_OBJECT (bsink, "preroll buffer %p", buffer);
++  return gst_mir_sink_render (bsink, buffer);
++}
++
++static PFNEGLCREATEIMAGEKHRPROC _eglCreateImageKHR;
++static PFNEGLDESTROYIMAGEKHRPROC _eglDestroyImageKHR;
++static PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC _eglExportDMABUFImageQueryMESA;
++static PFNEGLEXPORTDMABUFIMAGEMESAPROC _eglExportDMABUFImageMESA;
++
++static gboolean
++find_extension (const char *extensions, const char *ext)
++{
++    const char *found = strstr (extensions, ext);
++    int name_len = strlen (ext);
++
++    for (; found; found = strstr (found + name_len, ext)) {
++      if (found[name_len] == ' ' || found[name_len] == '\0')
++        return TRUE;
++    }
++
++    return FALSE;
++}
++
++static gboolean
++import_egl_extensions (GstMirSink *sink)
++{
++  /* EGL_KHR_image_base: for eglCreateImageKHR/eglDestroyImageKHR
++   * EGL_MESA_image_dma_buf_export: for eglExportDMABUFImage*MESA
++   * EGL_KHR_surfaceless_context: to render without a surface
++   */
++  static const char *ext_str[] = { "EGL_KHR_image_base",
++                                   "EGL_MESA_image_dma_buf_export",
++                                   "EGL_KHR_surfaceless_context"};
++  const char *extensions;
++  int i;
++
++  extensions = eglQueryString (sink->egldisplay, EGL_EXTENSIONS);
++  if (!extensions)
++    return FALSE;
++
++  for (i = 0; i < G_N_ELEMENTS (ext_str); ++i) {
++    if (!find_extension (extensions, ext_str[i])) {
++      GST_ERROR_OBJECT (sink, "EGL extension %s not found", ext_str[i]);
++      return FALSE;
++    }
++  }
++
++  _eglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)
++      eglGetProcAddress("eglCreateImageKHR");
++  _eglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)
++      eglGetProcAddress("eglDestroyImageKHR");
++  _eglExportDMABUFImageQueryMESA = (PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC)
++      eglGetProcAddress("eglExportDMABUFImageQueryMESA");
++  _eglExportDMABUFImageMESA = (PFNEGLEXPORTDMABUFIMAGEMESAPROC)
++      eglGetProcAddress("eglExportDMABUFImageMESA");
++
++  if (!_eglCreateImageKHR || !_eglDestroyImageKHR ||
++      !_eglExportDMABUFImageQueryMESA || !_eglExportDMABUFImageMESA) {
++    GST_ERROR_OBJECT (sink, "Cannot load EGL extensions");
++    return FALSE;
++  }
++
++  return TRUE;
++}
++
++static gboolean
++export_buffers (GstMirSink *sink)
++{
++  EGLImageKHR egl_image = EGL_NO_IMAGE_KHR;
++  EGLint image_attrs[] = {
++    EGL_GL_TEXTURE_LEVEL_KHR, 0, /* mip map level to reference */
++    EGL_IMAGE_PRESERVED_KHR, EGL_FALSE,
++    EGL_NONE
++  };
++  EGLBoolean ok;
++  int fourcc, num_planes;
++  EGLuint64KHR modifiers;
++  EGLint stride, offset;
++
++  if (!import_egl_extensions (sink))
++    goto error;
++
++  /* Create and configure rendering texture */
++  glGenTextures (1, &sink->render_tex);
++  glActiveTexture (GL_TEXTURE3);
++  glBindTexture (GL_TEXTURE_2D, sink->render_tex);
++  glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
++                sink->video_width, sink->video_height, 0,
++                GL_RGBA, GL_UNSIGNED_BYTE, NULL);
++  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
++  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
++  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
++  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
++  /* Generate framebuffer object */
++  glGenFramebuffers (1, &sink->fbo);
++  /* Set as target for rendering */
++  glBindFramebuffer (GL_FRAMEBUFFER, sink->fbo);
++  glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
++                          sink->render_tex, 0);
++
++  if (gl_error (sink))
++    goto error;
++
++  /* Create EGL image from rendering texture */
++
++  egl_image = _eglCreateImageKHR(sink->egldisplay, sink->eglctx,
++                                 EGL_GL_TEXTURE_2D_KHR,
++                                 (EGLClientBuffer) (long) sink->render_tex, image_attrs);
++  if (egl_image == EGL_NO_IMAGE_KHR) {
++    GST_ERROR_OBJECT (sink, "eglCreateImageKHR error 0x%x", eglGetError());
++    goto error;
++  }
++
++  /* Now get dma_buf file descriptor and related data */
++
++  ok = _eglExportDMABUFImageQueryMESA (sink->egldisplay, egl_image,
++                                       &fourcc, &num_planes, &modifiers);
++  if (!ok) {
++    GST_ERROR_OBJECT (sink, "eglExportDMABUFImageQueryMESA error 0x%x",
++                      eglGetError());
++    goto error;
++  }
++
++  ok = _eglExportDMABUFImageMESA (sink->egldisplay, egl_image,
++                                  &sink->buf_fd, &stride, &offset);
++  if (!ok) {
++    GST_ERROR_OBJECT (sink, "eglExportDMABUFImageMESA error 0x%x",
++                      eglGetError());
++    goto error;
++  }
++
++  ok = _eglDestroyImageKHR (sink->egldisplay, egl_image);
++  if (!ok)
++    GST_ERROR_OBJECT (sink, "eglDestroyImageKHR error 0x%x",
++                      eglGetError());
++
++  /* Post message with export data to application */
++  gst_element_post_message (GST_ELEMENT (sink),
++      gst_message_new_custom (GST_MESSAGE_ELEMENT, GST_OBJECT (sink),
++          gst_structure_new ("buffer-export-data",
++                             "fd", G_TYPE_INT, sink->buf_fd,
++                             "width", G_TYPE_INT, sink->video_width,
++                             "height", G_TYPE_INT, sink->video_height,
++                             "fourcc", G_TYPE_INT, fourcc,
++                             "stride", G_TYPE_INT, stride,
++                             "offset", G_TYPE_INT, offset,
++                             NULL)));
++
++  return TRUE;
++
++error:
++  if (sink->buf_fd) {
++    close (sink->buf_fd);
++    sink->buf_fd = 0;
++  }
++
++  if (egl_image != EGL_NO_IMAGE_KHR)
++    _eglDestroyImageKHR (sink->egldisplay, egl_image);
++
++  glDeleteFramebuffers(1, &sink->fbo);
++  sink->fbo = 0;
++  glDeleteTextures (1, &sink->render_tex);
++  sink->render_tex = 0;
++
++  return FALSE;
++}
++
++static gboolean
++init_renderer (GstMirSink *sink)
++{
++  EGLBoolean ok;
++  EGLConfig eglconfig;
++  EGLint neglconfigs;
++  const EGLint attribs[] = {
++    EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
++    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
++    EGL_RED_SIZE, 8,
++    EGL_GREEN_SIZE, 8,
++    EGL_BLUE_SIZE, 8,
++    EGL_ALPHA_SIZE, 0,
++    EGL_NONE
++  };
++  EGLint ctxattribs[] = {
++    EGL_CONTEXT_CLIENT_VERSION, 2,
++    EGL_NONE
++  };
++
++  /* Use default server */
++  sink->conn = mir_connect_sync (NULL, "mirsink");
++  if (!mir_connection_is_valid (sink->conn)) {
++    GST_ERROR_OBJECT (sink, "Cannot create Mir connection");
++    goto error;
++  }
++
++  sink->egldisplay = eglGetDisplay (
++      mir_connection_get_egl_native_display (sink->conn));
++  if (sink->egldisplay == EGL_NO_DISPLAY) {
++    GST_ERROR_OBJECT (sink, "Cannot create egl display");
++    goto error;
++  }
++
++  ok = eglInitialize (sink->egldisplay, NULL, NULL);
++  if (!ok) {
++    GST_ERROR_OBJECT (sink, "Cannot initialize egl");
++    goto error;
++  }
++
++  ok = eglChooseConfig (sink->egldisplay, attribs, &eglconfig, 1, &neglconfigs);
++  if (!ok) {
++    GST_ERROR_OBJECT (sink, "Cannot configure egl");
++    goto error;
++  }
++  if (neglconfigs < 1) {
++    GST_ERROR_OBJECT (sink, "no egl config available");
++    goto error;
++  }
++
++  /* If exporting, use EGL_KHR_surfaceless_context so we can render offscreen.
++   * Otherwise, create a Mir window.
++   */
++  if (sink->export_buffers) {
++    sink->eglsurface = EGL_NO_SURFACE;
++  } else {
++    sink->eglsurface = create_window (sink, eglconfig);
++    if (sink->eglsurface == EGL_NO_SURFACE)
++      goto error;
++  }
++
++  sink->eglctx =
++    eglCreateContext (sink->egldisplay, eglconfig, EGL_NO_CONTEXT, ctxattribs);
++  if (sink->eglctx == EGL_NO_CONTEXT) {
++    GST_ERROR_OBJECT (sink, "eglCreateContext failed");
++    goto error;
++  }
++  ok =
++    eglMakeCurrent (sink->egldisplay, sink->eglsurface, sink->eglsurface,
++        sink->eglctx);
++  if (!ok) {
++    GST_ERROR_OBJECT (sink, "eglMakeCurrent failed");
++    goto error;
++  }
++
++  /* Configure shaders */
++  if (!create_shaders (sink))
++    goto error;
++
++  /* Proceed to export buffers*/
++  if (sink->export_buffers)
++    if (!export_buffers (sink))
++      goto error;
++
++  return TRUE;
++
++error:
++  if (sink->egldisplay != EGL_NO_DISPLAY) {
++    if (sink->eglsurface != EGL_NO_SURFACE) {
++      eglDestroySurface (sink->egldisplay, sink->eglsurface);
++      sink->eglsurface = EGL_NO_SURFACE;
++    }
++    if (sink->eglctx != EGL_NO_CONTEXT) {
++      eglDestroyContext (sink->egldisplay, sink->eglctx);
++      sink->eglctx = EGL_NO_CONTEXT;
++    }
++    eglTerminate (sink->egldisplay);
++    sink->egldisplay = EGL_NO_DISPLAY;
++  }
++  if (sink->conn) {
++    mir_connection_release (sink->conn);
++    sink->conn = NULL;
++  }
++  return FALSE;
++}
++
++static GstFlowReturn
++gst_mir_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
++{
++  GstMirSink *sink = GST_MIR_SINK (bsink);
++  GstMapInfo src;
++  guint8 *next_plane;
++  int i;
++  /* Determines order of triangle strip */
++  GLubyte idx[4] = { 0, 1, 3, 2 };
++  EGLint width, height;
++  EGLBoolean ok;
++
++  GST_DEBUG_OBJECT (sink, "render buffer 0x%p", buffer);
++
++  /* Surface *must* be created in the rendering thread */
++  if (!sink->conn)
++    if (!init_renderer (sink))
++      return GST_FLOW_ERROR;
++
++  gst_buffer_map (buffer, &src, GST_MAP_READ);
++
++  /* Associate YUV planes to our textures */
++  /* TODO Can we have stride in the input buffers? how to know? */
++  for (i = 0, next_plane = src.data; i < 3; ++i) {
++    /* GL_TEXTUREi = GL_TEXTURE0 + i is guaranteed */
++    glActiveTexture (GL_TEXTURE0 + i);
++    glTexImage2D (GL_TEXTURE_2D, 0, GL_LUMINANCE,
++        i == 0 ? sink->video_width : sink->video_width / 2,
++        i == 0 ? sink->video_height : sink->video_height / 2,
++        0, GL_LUMINANCE, GL_UNSIGNED_BYTE,
++        next_plane);
++    next_plane += (sink->video_width * sink->video_height) / (i == 0 ? 1 : 4);
++  }
++
++  if (sink->export_buffers) {
++    glViewport (0, 0, sink->video_width, sink->video_height);
++  } else {
++    if (eglQuerySurface (sink->egldisplay, sink->eglsurface, EGL_WIDTH, &width) &&
++        eglQuerySurface (sink->egldisplay, sink->eglsurface, EGL_HEIGHT, &height)) {
++      GST_DEBUG_OBJECT (sink, "Output size is %d x %d", width, height);
++      glViewport (0, 0, width, height);
++    }
++  }
++
++  /* Perform YUV -> RGB conversion by using GLSL shaders, and draw */
++  glDrawElements (GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, idx);
++
++  /* Just print the errors */
++  gl_error (sink);
++
++  if (sink->export_buffers) {
++    /* Notify texture ready (TODO: use explicit fences when widely available) */
++    gst_element_post_message (GST_ELEMENT (sink),
++        gst_message_new_custom (GST_MESSAGE_ELEMENT, GST_OBJECT (sink),
++            gst_structure_new_empty ("frame-ready")));
++  } else {
++    ok = eglSwapBuffers (sink->egldisplay, sink->eglsurface);
++    if (!ok)
++      GST_ERROR_OBJECT (sink, "eglSwapBuffers failed: %d", eglGetError());
++  }
++
++  gst_buffer_unmap (buffer, &src);
++
++  return GST_FLOW_OK;
++}
++
++static gboolean
++plugin_init (GstPlugin * plugin)
++{
++  GST_DEBUG_CATEGORY_INIT (gstmir_debug, "mirsink", 0, " mir video sink");
++
++  return gst_element_register (plugin, "mirsink", GST_RANK_MARGINAL,
++      GST_TYPE_MIR_SINK);
++}
++
++GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
++    GST_VERSION_MINOR,
++    mirsink,
++    "Mir Video Sink", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
++    GST_PACKAGE_ORIGIN)
+diff --git a/ext/mir/gstmirsink.h b/ext/mir/gstmirsink.h
+new file mode 100644
+index 0000000..6e3edb5
+--- /dev/null
++++ b/ext/mir/gstmirsink.h
+@@ -0,0 +1,117 @@
++/*
++ * GStreamer Mir video sink
++ * Copyright (C) 2017 Canonical Ltd
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 3 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free
++ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301 USA.
++ */
++
++#ifndef __GST_MIR_VIDEO_SINK_H__
++#define __GST_MIR_VIDEO_SINK_H__
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <math.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/ioctl.h>
++#include <sys/mman.h>
++#include <fcntl.h>
++#include <assert.h>
++#include <unistd.h>
++#include <stdint.h>
++
++#define GL_GLEXT_PROTOTYPES
++#define EGL_EGLEXT_PROTOTYPES
++
++#include <mir_toolkit/mir_client_library.h>
++#include <EGL/egl.h>
++#include <EGL/eglext.h>
++#include <GLES2/gl2.h>
++#include <GLES2/gl2ext.h>
++
++#include <gst/gst.h>
++#include <gst/video/video.h>
++#include <gst/video/gstvideosink.h>
++#include <gst/video/gstvideometa.h>
++
++#define GST_TYPE_MIR_SINK \
++        (gst_mir_sink_get_type())
++#define GST_MIR_SINK(obj) \
++        (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIR_SINK,GstMirSink))
++#define GST_MIR_SINK_CLASS(klass) \
++        (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIR_SINK,GstMirSinkClass))
++#define GST_IS_MIR_SINK(obj) \
++        (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIR_SINK))
++#define GST_IS_MIR_SINK_CLASS(klass) \
++        (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIR_SINK))
++#define GST_MIR_SINK_GET_CLASS(inst) \
++        (G_TYPE_INSTANCE_GET_CLASS ((inst), GST_TYPE_MIR_SINK, GstMirSinkClass))
++
++typedef struct _GstMirSink GstMirSink;
++typedef struct _GstMirSinkClass GstMirSinkClass;
++
++struct _GstMirSink
++{
++  GstVideoSink parent;
++
++  GstBufferPool *pool;
++
++  GMutex mir_lock;
++
++  /* Whether to export buffers or render them in a local window */
++  gboolean export_buffers;
++  gint video_width;
++  gint video_height;
++  GstVideoFormat video_format;
++
++  MirConnection *conn;
++  MirWindow *window;
++
++  EGLDisplay egldisplay;
++  EGLSurface eglsurface;
++  EGLContext eglctx;
++
++  GLuint vshader, fshader;
++
++  /* Indexes to shader variables */
++  GLint attrpos;
++  GLint attrcordYUV[3];
++  GLint sampYUV[3];
++  GLint yuvmat;
++
++  GLuint text_id[3];
++
++  GLuint prog;
++
++  /* Framebuffer object */
++  GLuint fbo;
++  GLuint render_tex;
++
++  int buf_fd;
++};
++
++struct _GstMirSinkClass
++{
++  GstVideoSinkClass parent;
++};
++
++GType gst_mir_sink_get_type (void) G_GNUC_CONST;
++
++G_END_DECLS
++
++#endif /* __GST_MIR_VIDEO_SINK_H__ */
diff --git a/debian/patches/series b/debian/patches/series
index 08e77ca..451778e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0001-Make-sure-to-link-gme-plugin-with-lz.patch
 pcfile-requires-plugins-good
 adding-mirsink-and-android-media-over-hybris-support.patch
+desktop-mirsink.patch
diff --git a/debian/rules b/debian/rules
index 939e685..46d6771 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,8 @@ VERSIONIZE= \
 #debug package
 DEB_DH_STRIP_ARGS := --dbg-package=$(gst_pkgname)-plugins-bad-dbg
 
-# miralloc is just enabled for i386 and armhf (need android for the other archs)
-android_hybris_archs := i386 armhf
+# miralloc is just enabled for some archs (need android for the other archs)
+android_hybris_archs := i386 armhf arm64
 ifeq ($(DEB_HOST_ARCH_CPU), $(findstring $(DEB_HOST_ARCH_CPU), $(android_hybris_archs)))
 miralloc = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgstmiralloc-$(gst_abi).so.*
 mirallocdev = debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgstmiralloc-$(gst_abi).so
@@ -219,10 +219,16 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),m68k arm))
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
+ifneq (,$(findstring $(DEB_HOST_ARCH),armhf arm64))
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-opengl --disable-glx
 endif
 
+# for arm64 we need to use hybris android sdk version 23 as there is no
+# jb linker for it
+ifneq (,$(findstring $(DEB_HOST_ARCH),arm64))
+export HYBRIS_ANDROID_SDK_VERSION=23
+endif
+
 common-binary-fixup-arch::
 	rm -r $(CURDIR)/debian/libgstreamer-plugins-bad$(gst_abi)-dev/usr/include/*/*/basecamerabinsrc \
 		$(CURDIR)/debian/libgstreamer-plugins-bad$(gst_abi)-dev/usr/include/*/*/interfaces/photography* \