From a564440020f019ecefae40d540ae3646e31f2d25 Mon Sep 17 00:00:00 2001 From: Brad Reitmeyer Date: Wed, 15 May 2024 15:56:37 -0500 Subject: [PATCH] nvcodec: Accept progressive-high profiles for h264 Videos using progressive-high used to work on 1.16 before the parser added progressive-high. It looks like partial support was added to nvcodec in https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1634 but accidentally ommited gstnvh264dec Part-of: --- subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json | 2 +- subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264dec.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json index a9039ba964..5d7a0ebe79 100644 --- a/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-plugins-bad/docs/plugins/gst_plugins_cache.json @@ -227320,7 +227320,7 @@ "klass": "Codec/Decoder/Video/Hardware", "pad-templates": { "sink": { - "caps": "video/x-h264:\n stream-format: { (string)avc, (string)avc3, (string)byte-stream }\n alignment: au\n profile: { (string)high, (string)main, (string)constrained-high, (string)constrained-baseline, (string)baseline }\n framerate: [ 0/1, 2147483647/1 ]\n width: [ 48, 4096 ]\n height: [ 16, 4096 ]\n", + "caps": "video/x-h264:\n stream-format: { (string)avc, (string)avc3, (string)byte-stream }\n alignment: au\n profile: { (string)high, (string)main, (string)constrained-high, (string)constrained-baseline, (string)baseline, (string)progressive-high }\n framerate: [ 0/1, 2147483647/1 ]\n width: [ 48, 4096 ]\n height: [ 16, 4096 ]\n", "direction": "sink", "presence": "always" }, diff --git a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264dec.cpp b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264dec.cpp index 66a4e2355a..cc62faa226 100644 --- a/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264dec.cpp +++ b/subprojects/gst-plugins-bad/sys/nvcodec/gstnvh264dec.cpp @@ -1075,7 +1075,7 @@ gst_nv_h264_dec_register (GstPlugin * plugin, guint device_id, cdata->sink_caps = gst_caps_from_string ("video/x-h264, " "stream-format= (string) { avc, avc3, byte-stream }, " "alignment= (string) au, " - "profile = (string) { high, main, constrained-high, constrained-baseline, baseline }, " + "profile = (string) { high, main, constrained-high, constrained-baseline, baseline, progressive-high }, " "framerate = " GST_VIDEO_FPS_RANGE); s = gst_caps_get_structure (sink_caps, 0);