From 19382f1e9138220a64ca0f37bd076ed1fddacaa7 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 27 Feb 2017 22:41:47 +1100 Subject: [PATCH] openh264: Conditionally support the main and high profiles openh264 added main/high profile support upstream after the 1.8.0 release, so detect a version higher than that and support main/high stream input --- ext/openh264/gstopenh264dec.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ext/openh264/gstopenh264dec.cpp b/ext/openh264/gstopenh264dec.cpp index aafccf0e43..a8a3f90b3e 100644 --- a/ext/openh264/gstopenh264dec.cpp +++ b/ext/openh264/gstopenh264dec.cpp @@ -37,6 +37,12 @@ #include #include /* for memcpy */ +#if OPENH264_VERSION_CHECK (1,9) +#define HAVE_OPENH264_MAIN_PROFILE 1 +#else +#define HAVE_OPENH264_MAIN_PROFILE 0 +#endif + GST_DEBUG_CATEGORY_STATIC (gst_openh264dec_debug_category); #define GST_CAT_DEFAULT gst_openh264dec_debug_category @@ -62,7 +68,12 @@ GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS ("video/x-h264, stream-format=(string)byte-stream, alignment=(string)au, " - "profile=(string){ constrained-baseline, baseline}")); +#if HAVE_OPENH264_MAIN_PROFILE + "profile=(string){ constrained-baseline, baseline, main, high }" +#else + "profile=(string){ constrained-baseline, baseline }" +#endif + )); static GstStaticPadTemplate gst_openh264dec_src_template = GST_STATIC_PAD_TEMPLATE ("src",