From 8756f523d1b2d8b4b6b8c98f930606006e4d05ff Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Fri, 22 Jul 2022 13:41:17 +0200 Subject: [PATCH] playback: add onvif metadata caps to raw caps + remove encoding from x-onvif-metadata caps output by qtdemux Part-of: --- subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json | 8 ++++---- subprojects/gst-plugins-base/gst/playback/gstrawcaps.h | 3 ++- subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json b/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json index d666e2d..5014d23 100644 --- a/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json +++ b/subprojects/gst-plugins-base/docs/plugins/gst_plugins_cache.json @@ -9060,7 +9060,7 @@ "construct": false, "construct-only": 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", "readable": true, "type": "GstCaps", @@ -9382,7 +9382,7 @@ "construct": false, "construct-only": 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", "readable": true, "type": "GstCaps", @@ -11041,7 +11041,7 @@ "construct": false, "construct-only": 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", "readable": true, "type": "GstCaps", @@ -11347,7 +11347,7 @@ "construct": false, "construct-only": 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", "readable": true, "type": "GstCaps", diff --git a/subprojects/gst-plugins-base/gst/playback/gstrawcaps.h b/subprojects/gst-plugins-base/gst/playback/gstrawcaps.h index 1fc1d7d..a3f2c00 100644 --- a/subprojects/gst-plugins-base/gst/playback/gstrawcaps.h +++ b/subprojects/gst-plugins-base/gst/playback/gstrawcaps.h @@ -34,7 +34,8 @@ G_BEGIN_DECLS "subpicture/x-xsub; " \ "subpicture/x-pgs; " \ "closedcaption/x-cea-608; " \ - "closedcaption/x-cea-708" + "closedcaption/x-cea-708; " \ + "application/x-onvif-metadata; " G_END_DECLS diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c index 7ce652a..7c65784 100644 --- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c +++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c @@ -15459,7 +15459,7 @@ qtdemux_meta_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, _codec ("ONVIF Timed XML MetaData"); caps = 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 { GST_DEBUG_OBJECT (qtdemux, "Unknown content encoding: %s", content_encoding); -- 2.7.4