mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-04 22:48:54 +00:00
playback: add onvif metadata caps to raw caps
+ remove encoding from x-onvif-metadata caps output by qtdemux Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2889>
This commit is contained in:
parent
31c1e586c3
commit
8756f523d1
3 changed files with 7 additions and 6 deletions
|
@ -9060,7 +9060,7 @@
|
||||||
"construct": false,
|
"construct": false,
|
||||||
"construct-only": false,
|
"construct-only": false,
|
||||||
"controllable": false,
|
"controllable": false,
|
||||||
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708",
|
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708; application/x-onvif-metadata",
|
||||||
"mutable": "null",
|
"mutable": "null",
|
||||||
"readable": true,
|
"readable": true,
|
||||||
"type": "GstCaps",
|
"type": "GstCaps",
|
||||||
|
@ -9382,7 +9382,7 @@
|
||||||
"construct": false,
|
"construct": false,
|
||||||
"construct-only": false,
|
"construct-only": false,
|
||||||
"controllable": false,
|
"controllable": false,
|
||||||
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708",
|
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708; application/x-onvif-metadata",
|
||||||
"mutable": "null",
|
"mutable": "null",
|
||||||
"readable": true,
|
"readable": true,
|
||||||
"type": "GstCaps",
|
"type": "GstCaps",
|
||||||
|
@ -11041,7 +11041,7 @@
|
||||||
"construct": false,
|
"construct": false,
|
||||||
"construct-only": false,
|
"construct-only": false,
|
||||||
"controllable": false,
|
"controllable": false,
|
||||||
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708",
|
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708; application/x-onvif-metadata",
|
||||||
"mutable": "null",
|
"mutable": "null",
|
||||||
"readable": true,
|
"readable": true,
|
||||||
"type": "GstCaps",
|
"type": "GstCaps",
|
||||||
|
@ -11347,7 +11347,7 @@
|
||||||
"construct": false,
|
"construct": false,
|
||||||
"construct-only": false,
|
"construct-only": false,
|
||||||
"controllable": false,
|
"controllable": false,
|
||||||
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708",
|
"default": "video/x-raw(ANY); audio/x-raw(ANY); text/x-raw(ANY); subpicture/x-dvd; subpicture/x-dvb; subpicture/x-xsub; subpicture/x-pgs; closedcaption/x-cea-608; closedcaption/x-cea-708; application/x-onvif-metadata",
|
||||||
"mutable": "null",
|
"mutable": "null",
|
||||||
"readable": true,
|
"readable": true,
|
||||||
"type": "GstCaps",
|
"type": "GstCaps",
|
||||||
|
|
|
@ -34,7 +34,8 @@ G_BEGIN_DECLS
|
||||||
"subpicture/x-xsub; " \
|
"subpicture/x-xsub; " \
|
||||||
"subpicture/x-pgs; " \
|
"subpicture/x-pgs; " \
|
||||||
"closedcaption/x-cea-608; " \
|
"closedcaption/x-cea-608; " \
|
||||||
"closedcaption/x-cea-708"
|
"closedcaption/x-cea-708; " \
|
||||||
|
"application/x-onvif-metadata; "
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
|
|
@ -15459,7 +15459,7 @@ qtdemux_meta_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
|
||||||
_codec ("ONVIF Timed XML MetaData");
|
_codec ("ONVIF Timed XML MetaData");
|
||||||
caps =
|
caps =
|
||||||
gst_caps_new_simple ("application/x-onvif-metadata", "parsed",
|
gst_caps_new_simple ("application/x-onvif-metadata", "parsed",
|
||||||
G_TYPE_BOOLEAN, TRUE, "encoding", G_TYPE_STRING, "utf8", NULL);
|
G_TYPE_BOOLEAN, TRUE, NULL);
|
||||||
} else {
|
} else {
|
||||||
GST_DEBUG_OBJECT (qtdemux, "Unknown content encoding: %s",
|
GST_DEBUG_OBJECT (qtdemux, "Unknown content encoding: %s",
|
||||||
content_encoding);
|
content_encoding);
|
||||||
|
|
Loading…
Reference in a new issue