From 83e580bd6be024489b1578e1eecf2a41daf76c64 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 6 Mar 2018 14:16:56 +0100
Subject: [PATCH] omxh264: sync with supported profiles on zynqultrascaleplus

Add extra supported AVC profiles and remove extended and 4:4:4 profiles
which are actually not implemented.

https://bugzilla.gnome.org/show_bug.cgi?id=794177
---
 omx/gstomxh264utils.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/omx/gstomxh264utils.c b/omx/gstomxh264utils.c
index 5d28097779..ba292115af 100644
--- a/omx/gstomxh264utils.c
+++ b/omx/gstomxh264utils.c
@@ -32,13 +32,26 @@ typedef struct
 
 static const H264ProfileMapping h264_profiles[] = {
   {"baseline", OMX_VIDEO_AVCProfileBaseline},
+#ifdef USE_OMX_TARGET_ZYNQ_USCALE_PLUS
+  {"constrained-baseline",
+      (OMX_VIDEO_AVCPROFILETYPE) OMX_ALG_VIDEO_AVCProfileConstrainedBaseline},
+#else
   {"constrained-baseline", OMX_VIDEO_AVCProfileBaseline},
+#endif
   {"main", OMX_VIDEO_AVCProfileMain},
-  {"extended", OMX_VIDEO_AVCProfileExtended},
   {"high", OMX_VIDEO_AVCProfileHigh},
   {"high-10", OMX_VIDEO_AVCProfileHigh10},
   {"high-4:2:2", OMX_VIDEO_AVCProfileHigh422},
-  {"high-4:4:4", OMX_VIDEO_AVCProfileHigh444},
+#ifdef USE_OMX_TARGET_ZYNQ_USCALE_PLUS
+  {"progressive-high",
+      (OMX_VIDEO_AVCPROFILETYPE) OMX_ALG_VIDEO_AVCProfileProgressiveHigh},
+  {"constrained-high",
+      (OMX_VIDEO_AVCPROFILETYPE) OMX_ALG_VIDEO_AVCProfileConstrainedHigh},
+  {"high-10-intra",
+      (OMX_VIDEO_AVCPROFILETYPE) OMX_ALG_VIDEO_AVCProfileHigh10_Intra},
+  {"high-4:2:2-intra",
+      (OMX_VIDEO_AVCPROFILETYPE) OMX_ALG_VIDEO_AVCProfileHigh422_Intra},
+#endif
 };
 
 OMX_VIDEO_AVCPROFILETYPE