mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-06-08 09:09:26 +00:00
Merge branch 'main' into 'main'
nvcodec: Accept progressive-high profiles for h264 See merge request gstreamer/gstreamer!6862
This commit is contained in:
commit
7641771136
|
@ -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"
|
||||
},
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue