From 052092cd2ea6e6bf4914248237ae4e499ad8cb7e Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Fri, 19 Aug 2022 19:53:38 +0200 Subject: [PATCH] onvifmetadata: removing encoding field The encoding of ONVIF metadata is always UTF-8. ONVIF metadata may or may not be encoded with gzip, but we don't see a use case for transporting compressed ONVIF metadata between elements for now. --- generic/fmp4/src/fmp4mux/imp.rs | 1 - net/onvif/src/onvifaggregator/imp.rs | 1 - net/onvif/src/onvifdepay/imp.rs | 4 +--- net/onvif/src/onvifmetadataparse/imp.rs | 5 +---- net/onvif/src/onvifpay/imp.rs | 4 +--- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/generic/fmp4/src/fmp4mux/imp.rs b/generic/fmp4/src/fmp4mux/imp.rs index 11383f25e..e6a0166dd 100644 --- a/generic/fmp4/src/fmp4mux/imp.rs +++ b/generic/fmp4/src/fmp4mux/imp.rs @@ -2506,7 +2506,6 @@ impl ElementImpl for ONVIFFMP4Mux { .field("bitrate", gst::List::new([16000i32, 24000, 32000, 40000])) .build(), gst::Structure::builder("application/x-onvif-metadata") - .field("encoding", "utf8") .field("parsed", true) .build(), ] diff --git a/net/onvif/src/onvifaggregator/imp.rs b/net/onvif/src/onvifaggregator/imp.rs index 3f997c6d4..f39afea88 100644 --- a/net/onvif/src/onvifaggregator/imp.rs +++ b/net/onvif/src/onvifaggregator/imp.rs @@ -96,7 +96,6 @@ impl ElementImpl for OnvifAggregator { let meta_caps = gst::Caps::builder("application/x-onvif-metadata") .field("parsed", true) - .field("encoding", "utf8") .build(); let meta_sink_pad_template = gst::PadTemplate::with_gtype( diff --git a/net/onvif/src/onvifdepay/imp.rs b/net/onvif/src/onvifdepay/imp.rs index c86115b22..41a8b58a3 100644 --- a/net/onvif/src/onvifdepay/imp.rs +++ b/net/onvif/src/onvifdepay/imp.rs @@ -65,9 +65,7 @@ impl ElementImpl for OnvifDepay { ) .unwrap(); - let src_caps = gst::Caps::builder("application/x-onvif-metadata") - .field("encoding", "utf8") - .build(); + let src_caps = gst::Caps::builder("application/x-onvif-metadata").build(); let src_pad_template = gst::PadTemplate::new( "src", gst::PadDirection::Src, diff --git a/net/onvif/src/onvifmetadataparse/imp.rs b/net/onvif/src/onvifmetadataparse/imp.rs index c6bf1c58e..f3c47b272 100644 --- a/net/onvif/src/onvifmetadataparse/imp.rs +++ b/net/onvif/src/onvifmetadataparse/imp.rs @@ -589,7 +589,6 @@ impl ElementImpl for OnvifMetadataParse { fn pad_templates() -> &'static [gst::PadTemplate] { static PAD_TEMPLATES: Lazy> = Lazy::new(|| { let caps = gst::Caps::builder("application/x-onvif-metadata") - .field("encoding", "utf8") .field("parsed", true) .build(); let src_pad_template = gst::PadTemplate::new( @@ -600,9 +599,7 @@ impl ElementImpl for OnvifMetadataParse { ) .unwrap(); - let caps = gst::Caps::builder("application/x-onvif-metadata") - .field("encoding", "utf8") - .build(); + let caps = gst::Caps::builder("application/x-onvif-metadata").build(); let sink_pad_template = gst::PadTemplate::new( "sink", gst::PadDirection::Sink, diff --git a/net/onvif/src/onvifpay/imp.rs b/net/onvif/src/onvifpay/imp.rs index 59ac47a09..2fb84a0a6 100644 --- a/net/onvif/src/onvifpay/imp.rs +++ b/net/onvif/src/onvifpay/imp.rs @@ -34,9 +34,7 @@ impl ElementImpl for OnvifPay { fn pad_templates() -> &'static [gst::PadTemplate] { static PAD_TEMPLATES: Lazy> = Lazy::new(|| { - let sink_caps = gst::Caps::builder("application/x-onvif-metadata") - .field("encoding", "utf8") - .build(); + let sink_caps = gst::Caps::builder("application/x-onvif-metadata").build(); let sink_pad_template = gst::PadTemplate::new( "sink", gst::PadDirection::Sink,