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

[Alfonso Sanchez-Beato]

androidmedia: Add support for Pro 5

By adding more color formats and increasing the rank of the androidmedia plugin.

androidmedia: Add support for Pro 5

By adding more color formats and increasing the rank of the androidmedia plugin.

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[Iain Lane (laney)]

Note that this was already (partially?) in -1ubuntu3 which was uploaded to Xenial, but the uploader didn't commit the change back to git.

diff --git a/debian/changelog b/debian/changelog
index 144a51b..fb4b058 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-gst-plugins-bad1.0 (1.7.1-1ubuntu2) UNRELEASED; urgency=medium
+gst-plugins-bad1.0 (1.7.1-1ubuntu3) UNRELEASED; urgency=medium
 
+  [ Iain Lane ]
   * Really update Vcs-*
 
- -- Iain Lane <[e-mail]>  Thu, 28 Jan 2016 11:51:15 +0000
+  [ Thomas Voss ]
+  * Add color formats
+  * Increase rank for androidmedia so it is preferred over v4l when present
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 19 Feb 2016 18:12:34 +0100
 
 gst-plugins-bad1.0 (1.7.1-1ubuntu1) xenial; urgency=medium
 
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 469e440..0e40744 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
@@ -23,18 +23,18 @@ Forwarded: no
  gst-libs/gst/mir/mirallocator.c            |  272 ++++
  gst-libs/gst/mir/mirallocator.h            |   69 +
  sys/Makefile.am                            |    6 +
- sys/androidmedia/Makefile.am               |   16 +-
- sys/androidmedia/gstamc-constants.h        |    7 +
+ sys/androidmedia/Makefile.am               |   18 +-
+ sys/androidmedia/gstamc-constants.h        |    9 +
  sys/androidmedia/gstamc.h                  |   97 +-
  sys/androidmedia/gstamcaudiodec.h          |    8 +
  sys/androidmedia/gstamcaudiodechybris.c    | 1291 +++++++++++++++
- sys/androidmedia/gstamchybris.c            | 2182 +++++++++++++++++++++++++
- sys/androidmedia/gstamcvideodec.h          |   30 +
+ sys/androidmedia/gstamchybris.c            | 2186 +++++++++++++++++++++++++
+ sys/androidmedia/gstamcvideodec.h          |   42 +-
  sys/androidmedia/gstamcvideodechybris.c    | 2399 ++++++++++++++++++++++++++++
  tests/check/Makefile.am                    |    7 +
  tests/check/pipelines/gstamcvideodec.c     |  538 +++++++
  tests/check/pipelines/gstamcvideodec_egl.c |   56 +
- 25 files changed, 8757 insertions(+), 6 deletions(-)
+ 25 files changed, 8776 insertions(+), 7 deletions(-)
  create mode 100644 ext/mir/Makefile.am
  create mode 100644 ext/mir/gstmirsink.c
  create mode 100644 ext/mir/gstmirsink.h
@@ -51,11 +51,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 69af057..76b0025 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1664,6 +1664,18 @@
+@@ -1664,6 +1664,18 @@ AG_GST_CHECK_FEATURE(ANDROID_MEDIA, [Android Media], androidmedia, [
    esac
  ])
  
@@ -74,7 +74,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"
-@@ -3321,6 +3333,7 @@
+@@ -3321,6 +3333,7 @@ AM_CONDITIONAL(DECKLINK_OSX, false)
  AM_CONDITIONAL(USE_DIRECTFB, false)
  AM_CONDITIONAL(USE_WAYLAND, false)
  AM_CONDITIONAL(USE_DAALA, false)
@@ -82,7 +82,7 @@ Index: b/configure.ac
  AM_CONDITIONAL(USE_DTS, false)
  AM_CONDITIONAL(USE_EXIF, false)
  AM_CONDITIONAL(USE_RESINDVD, false)
-@@ -3557,6 +3570,7 @@
+@@ -3557,6 +3570,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
@@ -90,7 +90,7 @@ Index: b/configure.ac
  gst-libs/gst/insertbin/Makefile
  gst-libs/gst/interfaces/Makefile
  gst-libs/gst/codecparsers/Makefile
-@@ -3639,6 +3653,7 @@
+@@ -3639,6 +3653,7 @@ ext/dc1394/Makefile
  ext/directfb/Makefile
  ext/wayland/Makefile
  ext/daala/Makefile
@@ -98,11 +98,11 @@ Index: b/configure.ac
  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 33ddba7..ee47a92 100644
 --- a/ext/Makefile.am
 +++ b/ext/Makefile.am
-@@ -76,6 +76,12 @@
+@@ -76,6 +76,12 @@ else
  DAALA_DIR=
  endif
  
@@ -115,7 +115,7 @@ Index: b/ext/Makefile.am
  if USE_DTS
  DTS_DIR=dts
  else
-@@ -464,6 +470,7 @@
+@@ -464,6 +470,7 @@ SUBDIRS=\
  	$(LIBFAME_DIR) \
  	$(LIBMMS_DIR) \
  	$(LIBVISUAL_DIR) \
@@ -123,7 +123,7 @@ Index: b/ext/Makefile.am
  	$(MODPLUG_DIR) \
  	$(MPEG2ENC_DIR) \
  	$(MPG123_DIR) \
-@@ -514,6 +521,7 @@
+@@ -514,6 +521,7 @@ DIST_SUBDIRS = \
  	dc1394 \
  	directfb \
  	wayland \
@@ -131,8 +131,9 @@ Index: b/ext/Makefile.am
  	faac \
  	faad \
  	flite \
-Index: b/ext/mir/Makefile.am
-===================================================================
+diff --git a/ext/mir/Makefile.am b/ext/mir/Makefile.am
+new file mode 100644
+index 0000000..d588fc7
 --- /dev/null
 +++ b/ext/mir/Makefile.am
 @@ -0,0 +1,17 @@
@@ -153,8 +154,9 @@ Index: b/ext/mir/Makefile.am
 +libgstmirsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 +include_HEADERS = mirpool.h gstmirsink.h
 +noinst_HEADERS =
-Index: b/ext/mir/gstmirsink.c
-===================================================================
+diff --git a/ext/mir/gstmirsink.c b/ext/mir/gstmirsink.c
+new file mode 100644
+index 0000000..ca88ae3
 --- /dev/null
 +++ b/ext/mir/gstmirsink.c
 @@ -0,0 +1,854 @@
@@ -1012,8 +1014,9 @@ Index: b/ext/mir/gstmirsink.c
 +    mirsink,
 +    "Mir Video Sink", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME,
 +    GST_PACKAGE_ORIGIN)
-Index: b/ext/mir/gstmirsink.h
-===================================================================
+diff --git a/ext/mir/gstmirsink.h b/ext/mir/gstmirsink.h
+new file mode 100644
+index 0000000..e8158a7
 --- /dev/null
 +++ b/ext/mir/gstmirsink.h
 @@ -0,0 +1,134 @@
@@ -1151,8 +1154,9 @@ Index: b/ext/mir/gstmirsink.h
 +G_END_DECLS
 +
 +#endif /* __GST_MIR_VIDEO_SINK_H__ */
-Index: b/ext/mir/mirpool.c
-===================================================================
+diff --git a/ext/mir/mirpool.c b/ext/mir/mirpool.c
+new file mode 100644
+index 0000000..85b3334
 --- /dev/null
 +++ b/ext/mir/mirpool.c
 @@ -0,0 +1,434 @@
@@ -1590,8 +1594,9 @@ 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/mir/mirpool.h b/ext/mir/mirpool.h
+new file mode 100644
+index 0000000..3853aa8
 --- /dev/null
 +++ b/ext/mir/mirpool.h
 @@ -0,0 +1,91 @@
@@ -1686,11 +1691,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 732978d..e645f69 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
  
@@ -1708,7 +1713,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 \
@@ -1717,8 +1722,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 @@
@@ -1748,8 +1754,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 @@
@@ -1908,8 +1915,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 @@
@@ -1956,8 +1964,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 @@
@@ -2233,8 +2242,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 @@
@@ -2307,11 +2317,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 a0d7ca6..90902cb 100644
 --- a/sys/Makefile.am
 +++ b/sys/Makefile.am
-@@ -10,6 +10,12 @@
+@@ -10,6 +10,12 @@ else
  ANDROID_MEDIA_DIR=
  endif
  
@@ -2324,8 +2334,8 @@ Index: b/sys/Makefile.am
  if USE_APPLE_MEDIA
  APPLE_MEDIA_DIR=applemedia applemedia-nonpublic
  else
-Index: b/sys/androidmedia/Makefile.am
-===================================================================
+diff --git a/sys/androidmedia/Makefile.am b/sys/androidmedia/Makefile.am
+index a04b0ad..4e93271 100644
 --- a/sys/androidmedia/Makefile.am
 +++ b/sys/androidmedia/Makefile.am
 @@ -1,6 +1,12 @@
@@ -2342,7 +2352,7 @@ Index: b/sys/androidmedia/Makefile.am
  	gstamc.c \
  	gstamcaudiodec.c \
  	gstamcvideodec.c \
-@@ -8,6 +14,7 @@
+@@ -8,6 +14,7 @@ libgstandroidmedia_la_SOURCES = \
  	gstamcsurface.c \
  	gstamcsurfacetexture.c \
  	gstjniutils.c
@@ -2350,7 +2360,7 @@ Index: b/sys/androidmedia/Makefile.am
  
  noinst_HEADERS = \
  	gstamc.h \
-@@ -22,21 +29,28 @@
+@@ -22,21 +29,28 @@ noinst_HEADERS = \
  libgstandroidmedia_la_CFLAGS = \
  	-I$(top_srcdir)/gst-libs \
  	-I$(top_builddir)/gst-libs \
@@ -2380,11 +2390,11 @@ Index: b/sys/androidmedia/Makefile.am
  androidmedia_java_classesdir = $(datadir)/gst-android/ndk-build/androidmedia/
  androidmedia_java_classes_DATA = org/freedesktop/gstreamer/androidmedia/GstAmcOnFrameAvailableListener.java
 +endif
-Index: b/sys/androidmedia/gstamc-constants.h
-===================================================================
+diff --git a/sys/androidmedia/gstamc-constants.h b/sys/androidmedia/gstamc-constants.h
+index cc43f61..9e2c7db 100644
 --- a/sys/androidmedia/gstamc-constants.h
 +++ b/sys/androidmedia/gstamc-constants.h
-@@ -93,6 +93,8 @@
+@@ -93,6 +93,8 @@ enum
    COLOR_Format24BitARGB6666 = 42,
    COLOR_Format24BitABGR6666 = 43,
    COLOR_FormatAndroidOpaque = 0x7F000789,
@@ -2393,12 +2403,14 @@ Index: b/sys/androidmedia/gstamc-constants.h
    COLOR_TI_FormatYUV420PackedSemiPlanar = 0x7f000100,
    COLOR_INTEL_FormatYUV420PackedSemiPlanar = 0x7fa00e00,
    COLOR_INTEL_FormatYUV420PackedSemiPlanar_Tiled = 0x7fa00f00,
-@@ -112,8 +114,13 @@
+@@ -112,8 +114,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,
 +  COLOR_EXYNOS_FormatNV12Tiled = 0x7fc00002,
 +  COLOR_EXYNOS_FormatNV21Linear = 0x7f000011,
++  COLOR_EXYNOS_FormatYVU420Planar = 0x7F000012,
++  COLOR_EXYNOS_Format32bitABGR8888 = 0x7F000013,
    /* YV12: http://developer.android.com/reference/android/graphics/ImageFormat.html#YV12 */
    COLOR_FormatYV12 = 0x32315659,
 +  /* MTK formats. FormatYV12 is used by VP8/9. */
@@ -2407,8 +2419,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 a640616..e2d6b7d 100644
 --- a/sys/androidmedia/gstamc.h
 +++ b/sys/androidmedia/gstamc.h
 @@ -24,12 +24,67 @@
@@ -2480,7 +2492,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 {
@@ -2510,7 +2522,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);
  
@@ -2526,7 +2538,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);
  
@@ -2545,9 +2557,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
  
  
@@ -2560,7 +2572,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);
  
@@ -2571,11 +2583,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;
@@ -2586,7 +2598,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;
@@ -2597,8 +2609,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 @@
@@ -3893,11 +3906,12 @@ 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..160a006
 --- /dev/null
 +++ b/sys/androidmedia/gstamchybris.c
-@@ -0,0 +1,2182 @@
+@@ -0,0 +1,2186 @@
 +/*
 + * Initially based on gstamc.c
 + *
@@ -5361,14 +5375,18 @@ Index: b/sys/androidmedia/gstamchybris.c
 +  GstVideoFormat video_format;
 +} color_format_mapping_table[] = {
 +  {
++  COLOR_FormatYUV420Flexible, GST_VIDEO_FORMAT_I420}, {
 +  COLOR_FormatYUV420Planar, GST_VIDEO_FORMAT_I420}, {
 +  COLOR_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
++  261, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_TI_FormatYUV420PackedSemiPlanar, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_TI_FormatYUV420PackedSemiPlanarInterlaced, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_QCOM_FormatYUV420SemiPlanar, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_QCOM_FormatYUV420PackedSemiPlanar64x32Tile2m8ka, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_EXYNOS_FormatNV12Tiled, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_EXYNOS_FormatNV21Linear, GST_VIDEO_FORMAT_NV21}, {
++  COLOR_EXYNOS_FormatYVU420Planar, GST_VIDEO_FORMAT_YV12}, {
++  COLOR_EXYNOS_Format32bitABGR8888, GST_VIDEO_FORMAT_ABGR}, {
 +  256, GST_VIDEO_FORMAT_NV12}, {
 +  263, GST_VIDEO_FORMAT_NV12}, {
 +  COLOR_MTK_FormatYV12, GST_VIDEO_FORMAT_YV12}
@@ -6027,7 +6045,7 @@ Index: b/sys/androidmedia/gstamchybris.c
 +      if (g_str_has_prefix (codec_info->name, "OMX.google"))
 +        rank = GST_RANK_SECONDARY;
 +      else
-+        rank = GST_RANK_PRIMARY;
++        rank = GST_RANK_PRIMARY + 2;
 +
 +      ret |= gst_element_register (plugin, element_name, rank, subtype);
 +      g_free (element_name);
@@ -6080,8 +6098,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 eca39fe..d43abc7 100644
 --- a/sys/androidmedia/gstamcvideodec.h
 +++ b/sys/androidmedia/gstamcvideodec.h
 @@ -22,12 +22,20 @@
@@ -6107,7 +6125,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;
@@ -6127,7 +6145,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;
  
@@ -6138,7 +6156,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
    GstClockTime last_upstream_ts;
  
    /* Draining state */
-@@ -90,18 +111,25 @@
+@@ -90,18 +111,25 @@ struct _GstAmcVideoDec
    gboolean draining;
    /* TRUE if the component is drained currently */
    gboolean drained;
@@ -6164,7 +6182,7 @@ Index: b/sys/androidmedia/gstamcvideodec.h
    GError *gl_error;
    GMutex gl_lock;
    GCond gl_cond;
-@@ -110,6 +138,16 @@
+@@ -110,6 +138,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;
@@ -6181,8 +6199,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..cff94c4
 --- /dev/null
 +++ b/sys/androidmedia/gstamcvideodechybris.c
 @@ -0,0 +1,2399 @@
@@ -8585,11 +8604,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 1701aa0..8496367 100644
 --- a/tests/check/Makefile.am
 +++ b/tests/check/Makefile.am
-@@ -221,6 +221,12 @@
+@@ -221,6 +221,12 @@ else
  check_gl=
  endif
  
@@ -8602,7 +8621,7 @@ Index: b/tests/check/Makefile.am
  VALGRIND_TO_FIX = \
  	elements/mpeg2enc \
  	elements/mplex    \
-@@ -281,6 +287,7 @@
+@@ -281,6 +287,7 @@ check_PROGRAMS = \
  	elements/rtponviftimestamp \
  	elements/id3mux \
  	pipelines/mxf \
@@ -8610,8 +8629,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 @@
@@ -9153,8 +9173,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/androidmedia-support-COLOR_QCOM_FormatYVU420SemiPlanar32m.patch b/debian/patches/androidmedia-support-COLOR_QCOM_FormatYVU420SemiPlanar32m.patch
index 8905270..15ccd3d 100644
--- a/debian/patches/androidmedia-support-COLOR_QCOM_FormatYVU420SemiPlanar32m.patch
+++ b/debian/patches/androidmedia-support-COLOR_QCOM_FormatYVU420SemiPlanar32m.patch
@@ -9,11 +9,17 @@ using same code as COLOR_QCOM_FormatYUV420SemiPlanar
 to handle software conversion.
 
 BugLink: https://bugs.launchpad.net/ubuntu/+source/gst-plugins-bad1.0/+bug/1452386
+---
+ sys/androidmedia/gstamchybris.c         | 3 ++-
+ sys/androidmedia/gstamcvideodechybris.c | 1 +
+ 2 files changed, 3 insertions(+), 1 deletion(-)
 
+diff --git a/sys/androidmedia/gstamchybris.c b/sys/androidmedia/gstamchybris.c
+index 160a006..06b1cd1 100644
 --- a/sys/androidmedia/gstamchybris.c
 +++ b/sys/androidmedia/gstamchybris.c
-@@ -1367,7 +1367,8 @@
-   COLOR_EXYNOS_FormatNV21Linear, GST_VIDEO_FORMAT_NV21}, {
+@@ -1475,7 +1475,8 @@ static const struct
+   COLOR_EXYNOS_Format32bitABGR8888, GST_VIDEO_FORMAT_ABGR}, {
    256, GST_VIDEO_FORMAT_NV12}, {
    263, GST_VIDEO_FORMAT_NV12}, {
 -  COLOR_MTK_FormatYV12, GST_VIDEO_FORMAT_YV12}
@@ -22,9 +28,11 @@ BugLink: https://bugs.launchpad.net/ubuntu/+source/gst-plugins-bad1.0/+bug/14523
  };
  
  static gboolean
+diff --git a/sys/androidmedia/gstamcvideodechybris.c b/sys/androidmedia/gstamcvideodechybris.c
+index cff94c4..8f20501 100644
 --- a/sys/androidmedia/gstamcvideodechybris.c
 +++ b/sys/androidmedia/gstamcvideodechybris.c
-@@ -1137,6 +1137,7 @@
+@@ -1151,6 +1151,7 @@ gst_amc_video_dec_fill_buffer (GstAmcVideoDec * self, gint idx,
          break;
        }
        case COLOR_QCOM_FormatYUV420SemiPlanar: