From b644699c8d84734655eb7b36217dd5c6c90fc002 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 13 Mar 2018 16:15:30 +0100 Subject: [PATCH] omxh26{4,5}enc: don't pick default 10-bit profile The OMX stack of the zynqultrascaleplus (the only one supporting NV12_10LE32 and NV16_10LE32) will now pick the proper profile if none has been requested. Best to rely on its default than hardcoding a specific one in gst-omx. https://bugzilla.gnome.org/show_bug.cgi?id=794319 --- omx/gstomxh264enc.c | 13 ------------- omx/gstomxh265enc.c | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/omx/gstomxh264enc.c b/omx/gstomxh264enc.c index 631e31d224..4c4b3b256e 100644 --- a/omx/gstomxh264enc.c +++ b/omx/gstomxh264enc.c @@ -676,19 +676,6 @@ gst_omx_h264_enc_set_format (GstOMXVideoEnc * enc, GstOMXPort * port, gst_caps_unref (peercaps); } - /* Change default profile to high-10 if input is 10 bits */ - if (profile == OMX_VIDEO_AVCProfileMax) { - GstVideoFormat format; - - format = state->info.finfo->format; - if (format == GST_VIDEO_FORMAT_NV12_10LE32 || - format == GST_VIDEO_FORMAT_NV16_10LE32) { - GST_DEBUG_OBJECT (self, - "Set profile to high-10 as input is a 10 bits format"); - profile = OMX_VIDEO_AVCProfileHigh10; - } - } - if (profile != OMX_VIDEO_AVCProfileMax || level != OMX_VIDEO_AVCLevelMax) { /* OMX provides 2 API to set the profile and level. We try using the * generic one here and the H264 specific when calling diff --git a/omx/gstomxh265enc.c b/omx/gstomxh265enc.c index e0994314fb..68fe432bd8 100644 --- a/omx/gstomxh265enc.c +++ b/omx/gstomxh265enc.c @@ -494,19 +494,6 @@ gst_omx_h265_enc_set_format (GstOMXVideoEnc * enc, GstOMXPort * port, gst_caps_unref (peercaps); } - /* Change default profile to main-10 if input is 10 bits */ - if (profile == OMX_VIDEO_HEVCProfileUnknown) { - GstVideoFormat format; - - format = state->info.finfo->format; - if (format == GST_VIDEO_FORMAT_NV12_10LE32 || - format == GST_VIDEO_FORMAT_NV16_10LE32) { - GST_DEBUG_OBJECT (self, - "Set profile to main-10 as input is a 10 bits format"); - profile = OMX_VIDEO_HEVCProfileMain10; - } - } - if (profile != OMX_VIDEO_HEVCProfileUnknown || level != OMX_VIDEO_HEVCLevelUnknown) { /* OMX provides 2 API to set the profile and level. We try using the