From 169f7b762e415fa0174583ae0a9ffb221fd0e763 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Thu, 14 Nov 2024 14:45:07 +0100 Subject: [PATCH] transcriberbin: remove proxy properties on element Those properties are now exposed on the sink pads, and should be used directly. Part-of: --- docs/plugins/gst_plugins_cache.json | 47 ------------------ video/closedcaption/src/transcriberbin/imp.rs | 48 ------------------- 2 files changed, 95 deletions(-) diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json index 5a635a87..40be09ee 100644 --- a/docs/plugins/gst_plugins_cache.json +++ b/docs/plugins/gst_plugins_cache.json @@ -7991,18 +7991,6 @@ "type": "GstCaps", "writable": true }, - "language-code": { - "blurb": "The language of the input stream", - "conditionally-available": false, - "construct": false, - "construct-only": false, - "controllable": false, - "default": "en-US", - "mutable": "playing", - "readable": true, - "type": "gchararray", - "writable": true - }, "latency": { "blurb": "Amount of milliseconds to allow the transcriber", "conditionally-available": false, @@ -8031,18 +8019,6 @@ "type": "guint", "writable": true }, - "mode": { - "blurb": "Which closed caption mode to operate in", - "conditionally-available": false, - "construct": false, - "construct-only": false, - "controllable": false, - "default": "roll-up2 (2)", - "mutable": "playing", - "readable": true, - "type": "GstTtToCea608Mode", - "writable": true - }, "mux-method": { "blurb": "The method for muxing multiple transcription streams", "conditionally-available": false, @@ -8055,17 +8031,6 @@ "type": "GstTranscriberBinMuxMethod", "writable": true }, - "transcriber": { - "blurb": "The transcriber element to use", - "conditionally-available": false, - "construct": false, - "construct-only": false, - "controllable": false, - "mutable": "ready", - "readable": true, - "type": "GstElement", - "writable": true - }, "translate-latency": { "blurb": "Amount of extra milliseconds to allow for translating", "conditionally-available": false, @@ -8079,18 +8044,6 @@ "readable": true, "type": "guint", "writable": true - }, - "translation-languages": { - "blurb": "A map of language codes to caption channels, e.g. translation-languages=\"languages, transcript={CC1, 708_1}, fr={708_2, CC3}\" will map the French translation to CC1/service 1 and the original transcript to CC3/service 2", - "conditionally-available": false, - "construct": true, - "construct-only": false, - "controllable": false, - "default": "languages, transcript=(string)cc1;", - "mutable": "playing", - "readable": true, - "type": "GstStructure", - "writable": true } }, "rank": "none" diff --git a/video/closedcaption/src/transcriberbin/imp.rs b/video/closedcaption/src/transcriberbin/imp.rs index 79d9be7b..211bd778 100644 --- a/video/closedcaption/src/transcriberbin/imp.rs +++ b/video/closedcaption/src/transcriberbin/imp.rs @@ -1388,21 +1388,11 @@ impl ObjectImpl for TranscriberBin { .default_value(DEFAULT_ACCUMULATE.mseconds() as u32) .mutable_ready() .build(), - glib::ParamSpecEnum::builder_with_default("mode", DEFAULT_MODE) - .nick("Mode") - .blurb("Which closed caption mode to operate in") - .mutable_playing() - .build(), glib::ParamSpecBoxed::builder::("cc-caps") .nick("Closed Caption caps") .blurb("The expected format of the closed captions") .mutable_ready() .build(), - glib::ParamSpecObject::builder::("transcriber") - .nick("Transcriber") - .blurb("The transcriber element to use") - .mutable_ready() - .build(), glib::ParamSpecEnum::builder_with_default("caption-source", DEFAULT_CAPTION_SOURCE) .nick("Caption source") .blurb("Caption source to use. \ @@ -1410,24 +1400,12 @@ impl ObjectImpl for TranscriberBin { of the other source will be dropped by transcriberbin") .mutable_playing() .build(), - glib::ParamSpecBoxed::builder::("translation-languages") - .nick("Translation languages") - .blurb("A map of language codes to caption channels, e.g. translation-languages=\"languages, transcript={CC1, 708_1}, fr={708_2, CC3}\" will map the French translation to CC1/service 1 and the original transcript to CC3/service 2") - .construct() - .mutable_playing() - .build(), glib::ParamSpecUInt::builder("translate-latency") .nick("Translation Latency") .blurb("Amount of extra milliseconds to allow for translating") .default_value(DEFAULT_TRANSLATE_LATENCY.mseconds() as u32) .mutable_ready() .build(), - glib::ParamSpecString::builder("language-code") - .nick("Language Code") - .blurb("The language of the input stream") - .default_value(Some(DEFAULT_INPUT_LANG_CODE)) - .mutable_playing() - .build(), glib::ParamSpecEnum::builder("mux-method") .nick("Mux Method") .blurb("The method for muxing multiple transcription streams") @@ -1470,12 +1448,6 @@ impl ObjectImpl for TranscriberBin { let mut settings = self.settings.lock().unwrap(); settings.cc_caps = value.get().expect("type checked upstream"); } - "transcriber" => { - self.audio_sinkpad.set_property( - "transcriber", - value.get::().expect("type checked upstream"), - ); - } "caption-source" => { let mut settings = self.settings.lock().unwrap(); settings.caption_source = value.get().expect("type checked upstream"); @@ -1495,28 +1467,12 @@ impl ObjectImpl for TranscriberBin { } } } - "translation-languages" => { - self.audio_sinkpad.set_property( - "translation-languages", - value - .get::>() - .expect("type checked upstream"), - ); - } "translate-latency" => { let mut settings = self.settings.lock().unwrap(); settings.translate_latency = gst::ClockTime::from_mseconds( value.get::().expect("type checked upstream").into(), ); } - "language-code" => { - self.audio_sinkpad.set_property( - "language-code", - value - .get::>() - .expect("type checked upstream"), - ); - } "mux-method" => { let mut settings = self.settings.lock().unwrap(); settings.mux_method = value.get().expect("type checked upstream") @@ -1539,22 +1495,18 @@ impl ObjectImpl for TranscriberBin { let settings = self.settings.lock().unwrap(); (settings.accumulate_time.mseconds() as u32).to_value() } - "mode" => self.audio_sinkpad.property("mode"), "cc-caps" => { let settings = self.settings.lock().unwrap(); settings.cc_caps.to_value() } - "transcriber" => self.audio_sinkpad.property("transcriber"), "caption-source" => { let settings = self.settings.lock().unwrap(); settings.caption_source.to_value() } - "translation-languages" => self.audio_sinkpad.property("translation-languages"), "translate-latency" => { let settings = self.settings.lock().unwrap(); (settings.translate_latency.mseconds() as u32).to_value() } - "language-code" => self.audio_sinkpad.property("language-code"), "mux-method" => { let settings = self.settings.lock().unwrap(); settings.mux_method.to_value()