From: Olivier Crête <olivier.crete@collabora.com>
Date: Fri, 2 Oct 2020 22:47:16 +0000 (-0400)
Subject: openh264dec: Accept constrained-high and progressive-high profiles
X-Git-Tag: 1.19.3~507^2~1032
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03d710bd40655b434d087092476d166b20b58692;p=platform%2Fupstream%2Fgstreamer.git

openh264dec: Accept constrained-high and progressive-high profiles

They're just subsets of the high profile.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1634>
---

diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
index 3eb0e08..9dad19d 100644
--- a/docs/plugins/gst_plugins_cache.json
+++ b/docs/plugins/gst_plugins_cache.json
@@ -213539,7 +213539,7 @@
                 "long-name": "OpenH264 video decoder",
                 "pad-templates": {
                     "sink": {
-                        "caps": "video/x-h264:\n  stream-format: byte-stream\n      alignment: au\n        profile: { (string)constrained-baseline, (string)baseline, (string)main, (string)high }\n",
+                        "caps": "video/x-h264:\n  stream-format: byte-stream\n      alignment: au\n        profile: { (string)constrained-baseline, (string)baseline, (string)main, (string)high, (string)constrained-high, (string)progressive-high }\n",
                         "direction": "sink",
                         "presence": "always"
                     },
diff --git a/ext/openh264/gstopenh264dec.cpp b/ext/openh264/gstopenh264dec.cpp
index f49a4d3..e608380 100644
--- a/ext/openh264/gstopenh264dec.cpp
+++ b/ext/openh264/gstopenh264dec.cpp
@@ -61,7 +61,7 @@ static gboolean gst_openh264dec_decide_allocation (GstVideoDecoder * decoder,
     GstQuery * query);
 
 #if HAVE_OPENH264_MAIN_PROFILE
-#define SUPPORTED_PROFILE_STR "profile=(string){ constrained-baseline, baseline, main, high }"
+#define SUPPORTED_PROFILE_STR "profile=(string){ constrained-baseline, baseline, main, high, constrained-high, progressive-high }"
 #else
 #define SUPPORTED_PROFILE_STR "profile=(string){ constrained-baseline, baseline }"
 #endif