Update Cargo.lock

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1476>

.gitignore

@@ -1,4 +1,3 @@
-Cargo.lock
 target
 *~
 *.bk

.gitlab-ci.yml

@@ -6,7 +6,7 @@ include:
     file: '/templates/debian.yml'
 
   - project: 'gstreamer/gstreamer-rs'
-    ref: main
+    ref: '0.22'
     file: '/ci/images_template.yml'
 
   - project: 'gstreamer/gstreamer'

CHANGELOG.md

@@ -5,6 +5,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html),
 specifically the [variant used by Rust](http://doc.crates.io/manifest.html#the-version-field).
 
+## [0.12.2] - 2024-02-26
+### Fixed
+- rtpgccbwe: Don't reset PTS/DTS to `None` as otherwise `rtpsession` won't be
+  able to generate valid RTCP.
+- webrtcsink: Fix usage with 1.22.
+
+### Added
+- janusvrwebrtcsink: Add `secret-key` property.
+- janusvrwebrtcsink: Allow for string room ids and add `string-ids` property.
+- textwrap: Don't split on all whitespaces, especially not on non-breaking
+  whitespace.
+
+## [0.12.1] - 2024-02-13
+### Added
+- gtk4: Create a window for testing purposes when running in `gst-launch-1.0`
+  or if `GST_GTK4_WINDOW=1` is set.
+- webrtcsink: Add `msid` property.
+
 ## [0.12.0] - 2024-02-08
 ### Changed
 - ndi: `ndisrc` passes received data downstream without an additional copy, if
@@ -344,7 +362,9 @@ specifically the [variant used by Rust](http://doc.crates.io/manifest.html#the-v
 - webrtcsink: Make the `turn-server` property a `turn-servers` list
 - webrtcsink: Move from async-std to tokio
 
-[Unreleased]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.12.0...HEAD
+[Unreleased]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.12.2...HEAD
+[0.12.2]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.12.1...0.12.2
+[0.12.1]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.12.0...0.12.1
 [0.12.0]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.11.3...0.12.0
 [0.11.3]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.11.2...0.11.3
 [0.11.2]: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/compare/0.11.1...0.11.2

Cargo.toml

@@ -113,36 +113,36 @@ panic = 'unwind'
 opt-level = 1
 
 [workspace.package]
-version = "0.12.0-alpha.1"
+version = "0.12.2"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 edition = "2021"
 rust-version = "1.70"
 
 [workspace.dependencies]
 once_cell = "1"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
-gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
-cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master", features=["use_glib"] }
-pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
-pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "master" }
-gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-wayland = { package = "gdk4-wayland", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-x11 = { package = "gdk4-x11", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gdk-win32 = { package = "gdk4-win32", git = "https://github.com/gtk-rs/gtk4-rs", branch = "master"}
-gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-gl = { package = "gstreamer-gl", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-gl-egl = { package = "gstreamer-gl-egl", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-gl-wayland = { package = "gstreamer-gl-wayland", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-gl-x11 = { package = "gstreamer-gl-x11", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-net = { package = "gstreamer-net", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-plugin-version-helper = { path="./version-helper" }
-gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-sdp = { package = "gstreamer-sdp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-utils = { package = "gstreamer-utils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
-gst-webrtc = { package = "gstreamer-webrtc", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main" }
+glib = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" }
+gio = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" }
+cairo-rs = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19", features=["use_glib"] }
+pango = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" }
+pangocairo = { git = "https://github.com/gtk-rs/gtk-rs-core", branch = "0.19", version = "0.19" }
+gtk = { package = "gtk4", git = "https://github.com/gtk-rs/gtk4-rs", branch = "0.8", version = "0.8"}
+gdk-wayland = { package = "gdk4-wayland", git = "https://github.com/gtk-rs/gtk4-rs", branch = "0.8", version = "0.8"}
+gdk-x11 = { package = "gdk4-x11", git = "https://github.com/gtk-rs/gtk4-rs", branch = "0.8", version = "0.8"}
+gdk-win32 = { package = "gdk4-win32", git = "https://github.com/gtk-rs/gtk4-rs", branch = "0.8", version = "0.8"}
+gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-gl = { package = "gstreamer-gl", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-gl-egl = { package = "gstreamer-gl-egl", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-gl-wayland = { package = "gstreamer-gl-wayland", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-gl-x11 = { package = "gstreamer-gl-x11", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-net = { package = "gstreamer-net", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-pbutils = { package = "gstreamer-pbutils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-plugin-version-helper = { path="./version-helper", version = "0.8" }
+gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-sdp = { package = "gstreamer-sdp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-utils = { package = "gstreamer-utils", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-video = { package = "gstreamer-video", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }
+gst-webrtc = { package = "gstreamer-webrtc", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.22", version = "0.22" }

deny.toml

@@ -70,6 +70,9 @@ version = "0.9"
 [[bans.skip]]
 name = "hmac"
 version = "0.11"
+[[bans.skip]]
+name = "zerocopy"
+version = "0.6"
 
 # field-offset and nix depend on an older memoffset
 # https://github.com/Diggsey/rust-field-offset/pull/23
@@ -184,6 +187,9 @@ version = "0.2"
 [[bans.skip]]
 name = "toml_edit"
 version = "0.21"
+[[bans.skip]]
+name = "winnow"
+version = "0.5"
 
 [sources]
 unknown-registry = "deny"

docs/plugins/gst_plugins_cache.json

@@ -6704,12 +6704,14 @@
                     "audio_%%u": {
                         "caps": "audio/x-raw:\naudio/x-opus:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     },
                     "video_%%u": {
                         "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\nvideo/x-vp8:\nvideo/x-h264:\nvideo/x-vp9:\nvideo/x-h265:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     }
                 },
                 "rank": "none"
@@ -6735,12 +6737,14 @@
                     "audio_%%u": {
                         "caps": "audio/x-raw:\naudio/x-opus:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     },
                     "video_%%u": {
                         "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\nvideo/x-vp8:\nvideo/x-h264:\nvideo/x-vp9:\nvideo/x-h265:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     }
                 },
                 "rank": "none"
@@ -6766,12 +6770,14 @@
                     "audio_%%u": {
                         "caps": "audio/x-raw:\naudio/x-opus:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     },
                     "video_%%u": {
                         "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\nvideo/x-vp8:\nvideo/x-h264:\nvideo/x-vp9:\nvideo/x-h265:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     }
                 },
                 "rank": "none"
@@ -6797,12 +6803,14 @@
                     "audio_%%u": {
                         "caps": "audio/x-raw:\naudio/x-opus:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     },
                     "video_%%u": {
                         "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\nvideo/x-vp8:\nvideo/x-h264:\nvideo/x-vp9:\nvideo/x-h265:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     }
                 },
                 "rank": "none"
@@ -6862,12 +6870,14 @@
                     "audio_%%u": {
                         "caps": "audio/x-raw:\naudio/x-opus:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     },
                     "video_%%u": {
                         "caps": "video/x-raw:\n\nvideo/x-raw(memory:CUDAMemory):\n\nvideo/x-raw(memory:GLMemory):\n\nvideo/x-raw(memory:NVMM):\n\nvideo/x-raw(memory:D3D11Memory):\nvideo/x-vp8:\nvideo/x-h264:\nvideo/x-vp9:\nvideo/x-h265:\n",
                         "direction": "sink",
-                        "presence": "request"
+                        "presence": "request",
+                        "type": "GstWebRTCSinkPad"
                     }
                 },
                 "rank": "none"
@@ -7590,6 +7600,32 @@
                     }
                 ]
             },
+            "GstWebRTCSinkPad": {
+                "hierarchy": [
+                    "GstWebRTCSinkPad",
+                    "GstGhostPad",
+                    "GstProxyPad",
+                    "GstPad",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "kind": "object",
+                "properties": {
+                    "msid": {
+                        "blurb": "Remote MediaStream ID in use for this pad",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "NULL",
+                        "mutable": "ready",
+                        "readable": true,
+                        "type": "gchararray",
+                        "writable": true
+                    }
+                }
+            },
             "GstWebRTCSrcPad": {
                 "hierarchy": [
                     "GstWebRTCSrcPad",

meson.build

@@ -1,7 +1,7 @@
 project('gst-plugins-rs',
         'rust',
         'c',
-        version: '0.12.0-alpha.1',
+        version: '0.12.2',
         meson_version : '>= 1.1')
 
 # dependencies.py needs a toml parsing module
@@ -489,6 +489,16 @@ foreach plugin : plugins
     plugin_name = plugin_name.substring(3)
   endif
 
+  plugin_display_name = plugin_name
+  if plugin_name.startswith('gst')
+    plugin_display_name = plugin_name.substring(3)
+  endif
+  if plugin_display_name in plugin_names
+    # When default_library=both plugins are duplicated.
+    continue
+  endif
+  plugin_names += plugin_display_name
+
   option_name = plugin_name.substring(3)
   if option_name.startswith('rs')
     option_name = option_name.substring(2)
@@ -533,13 +543,7 @@ foreach plugin : plugins
     warning('Static plugin @0@ is known to fail. It will not be included in libgstreamer-full.'.format(plugin_name))
   else
     gst_plugins += dep
-
     pc_files += [plugin_name + '.pc']
-    if plugin_name.startswith('gst')
-      plugin_names += [plugin_name.substring(3)]
-    else
-      plugin_names += [plugin_name]
-    endif
   endif
 endforeach
 

mux/fmp4/Cargo.toml

@@ -27,7 +27,7 @@ gst-app = { workspace = true, features = ["v1_18"] }
 gst-check = { workspace = true, features = ["v1_18"] }
 m3u8-rs = "5.0"
 chrono = "0.4"
-dash-mpd = { version = "0.14", default-features = false }
+dash-mpd = { version = "0.15", default-features = false }
 quick-xml = { version = "0.31", features = ["serialize"] }
 serde = "1"
 

mux/fmp4/examples/dash_vod.rs

@@ -182,8 +182,8 @@ fn main() -> Result<(), Error> {
                 let mut write_segment =
                     |start: gst::ClockTime, duration: gst::ClockTime, repeat: usize| {
                         let mut s = dash_mpd::S {
-                            t: Some(start.mseconds() as i64),
-                            d: duration.mseconds() as i64,
+                            t: Some(start.mseconds()),
+                            d: duration.mseconds(),
                             ..Default::default()
                         };
                         if repeat > 0 {

net/rtp/src/gcc/imp.rs

@@ -1146,15 +1146,12 @@ impl ObjectSubclass for BandwidthEstimator {
     fn with_class(klass: &Self::Class) -> Self {
         let templ = klass.pad_template("sink").unwrap();
         let sinkpad = gst::Pad::builder_from_template(&templ)
-            .chain_function(|_pad, parent, mut buffer| {
+            .chain_function(|_pad, parent, buffer| {
                 BandwidthEstimator::catch_panic_pad_function(
                     parent,
                     || Err(gst::FlowError::Error),
                     |this| {
                         let mut state = this.state.lock().unwrap();
-                        let mutbuf = buffer.make_mut();
-                        mutbuf.set_pts(None);
-                        mutbuf.set_dts(None);
                         state.buffers.push_front(buffer);
 
                         state.flow_return

net/webrtc/Cargo.toml

@@ -25,11 +25,11 @@ futures = "0.3"
 tokio = { version = "1", features = ["fs", "macros", "rt-multi-thread", "time"] }
 tokio-native-tls = "0.3.0"
 tokio-stream = "0.1.11"
-async-tungstenite = { version = "0.24", features = ["tokio-runtime", "tokio-native-tls"] }
+async-tungstenite = { version = "0.25", features = ["tokio-runtime", "tokio-native-tls"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 fastrand = "2.0"
-gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-signalling-protocol" }
+gst_plugin_webrtc_protocol = { path="protocol", package = "gst-plugin-webrtc-signalling-protocol", version = "0.12" }
 human_bytes = "0.4"
 url = "2"
 

net/webrtc/signalling/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 anyhow = "1"
 tokio = { version = "1", features = ["fs", "io-util", "macros", "rt-multi-thread", "time"] }
 tokio-native-tls = "0.3.0"
-async-tungstenite = { version = "0.24", features = ["tokio-runtime", "tokio-native-tls"] }
+async-tungstenite = { version = "0.25", features = ["tokio-runtime", "tokio-native-tls"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 clap = { version = "4", features = ["derive"] }
@@ -24,7 +24,7 @@ uuid = { version = "1", features = ["v4"] }
 thiserror = "1"
 test-log = { version = "0.2", features = ["trace"], default-features = false }
 pin-project-lite = "0.2"
-gst_plugin_webrtc_protocol = { path="../protocol", package = "gst-plugin-webrtc-signalling-protocol" }
+gst_plugin_webrtc_protocol = { path="../protocol", package = "gst-plugin-webrtc-signalling-protocol", version = "0.12" }
 
 [[bin]]
 name = "gst-webrtc-signalling-server"

net/webrtc/src/janusvr_signaller/imp.rs

@@ -42,17 +42,26 @@ fn feed_id() -> u32 {
     thread_rng().gen()
 }
 
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[serde(untagged)]
+enum RoomId {
+    Str(String),
+    Num(u32),
+}
+
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
 struct KeepAliveMsg {
     janus: String,
     transaction: String,
     session_id: u64,
+    apisecret: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
 struct CreateSessionMsg {
     janus: String,
     transaction: String,
+    apisecret: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
@@ -61,14 +70,15 @@ struct AttachPluginMsg {
     transaction: String,
     plugin: String,
     session_id: u64,
+    apisecret: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
 struct RoomRequestBody {
     request: String,
     ptype: String,
-    room: u64,
-    id: u32,
+    room: RoomId,
+    id: RoomId,
     #[serde(skip_serializing_if = "Option::is_none")]
     display: Option<String>,
 }
@@ -79,6 +89,7 @@ struct RoomRequestMsg {
     transaction: String,
     session_id: u64,
     handle_id: u64,
+    apisecret: Option<String>,
     body: RoomRequestBody,
 }
 
@@ -102,6 +113,7 @@ struct PublishMsg {
     transaction: String,
     session_id: u64,
     handle_id: u64,
+    apisecret: Option<String>,
     body: PublishBody,
     jsep: Jsep,
 }
@@ -119,6 +131,7 @@ struct TrickleMsg {
     transaction: String,
     session_id: u64,
     handle_id: u64,
+    apisecret: Option<String>,
     candidate: Candidate,
 }
 
@@ -141,12 +154,12 @@ struct InnerError {
 
 #[derive(Serialize, Deserialize, Debug)]
 struct RoomJoined {
-    room: Option<u64>,
+    room: Option<RoomId>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 struct RoomEvent {
-    room: Option<u64>,
+    room: Option<RoomId>,
     error_code: Option<i32>,
     error: Option<String>,
 }
@@ -213,14 +226,18 @@ struct State {
     session_id: Option<u64>,
     handle_id: Option<u64>,
     transaction_id: Option<String>,
+    room_id: Option<RoomId>,
+    feed_id: Option<RoomId>,
 }
 
 #[derive(Clone)]
 struct Settings {
     janus_endpoint: String,
     room_id: Option<String>,
-    feed_id: u32,
+    feed_id: String,
     display_name: Option<String>,
+    secret_key: Option<String>,
+    string_ids: bool,
 }
 
 impl Default for Settings {
@@ -228,8 +245,10 @@ impl Default for Settings {
         Self {
             janus_endpoint: "ws://127.0.0.1:8188".to_string(),
             room_id: None,
-            feed_id: feed_id(),
+            feed_id: feed_id().to_string(),
             display_name: None,
+            secret_key: None,
+            string_ids: false,
         }
     }
 }
@@ -240,8 +259,10 @@ pub struct Signaller {
     state: Mutex<State>,
     #[property(name="janus-endpoint", get, set, type = String, member = janus_endpoint, blurb = "The Janus server endpoint to POST SDP offer to")]
     #[property(name="room-id", get, set, type = String, member = room_id, blurb = "The Janus Room ID that will be joined to")]
-    #[property(name="feed-id", get, set, type = u32, member = feed_id, blurb = "The Janus Feed ID to identify where the track is coming from")]
+    #[property(name="feed-id", get, set, type = String, member = feed_id, blurb = "The Janus Feed ID to identify where the track is coming from")]
     #[property(name="display-name", get, set, type = String, member = display_name, blurb = "The name of the publisher in the Janus Video Room")]
+    #[property(name="secret-key", get, set, type = String, member = secret_key, blurb = "The secret API key to communicate with Janus server")]
+    #[property(name="string-ids", get, set, type = bool, member = string_ids, blurb = "Force passing room-id and feed-id as string even if they can be parsed into an integer")]
     settings: Mutex<Settings>,
 }
 
@@ -292,15 +313,20 @@ impl Signaller {
                         },
                         _ = tokio::time::sleep(Duration::from_secs(10)) => {
                             if let Some(ref this) = this {
-                                let (transaction, session_id) = {
+                                let (transaction, session_id, apisecret) = {
                                     let state = this.state.lock().unwrap();
-                                    (state.transaction_id.clone().unwrap(),
-                                    state.session_id.unwrap())
+                                    let settings = this.settings.lock().unwrap();
+                                    (
+                                        state.transaction_id.clone().unwrap(),
+                                        state.session_id.unwrap(),
+                                        settings.secret_key.clone(),
+                                    )
                                 };
                                 let msg = OutgoingMessage::KeepAlive(KeepAliveMsg {
                                     janus: "keepalive".to_string(),
                                     transaction,
                                     session_id,
+                                    apisecret,
                                 });
                                 res = ws_sink
                                     .send(WsMessage::Text(serde_json::to_string(&msg).unwrap()))
@@ -402,7 +428,7 @@ impl Signaller {
                     match plugindata {
                         VideoRoomData::Joined(joined) => {
                             if let Some(room) = joined.room {
-                                gst::trace!(CAT, imp: self, "Joined room {} successfully", room);
+                                gst::trace!(CAT, imp: self, "Joined room {room:?} successfully");
                                 self.session_requested();
                             }
                         }
@@ -466,9 +492,12 @@ impl Signaller {
     fn create_session(&self) {
         let transaction = transaction_id();
         self.set_transaction_id(transaction.clone());
+        let settings = self.settings.lock().unwrap();
+        let apisecret = settings.secret_key.clone();
         self.send(OutgoingMessage::CreateSession(CreateSessionMsg {
             janus: "create".to_string(),
             transaction,
+            apisecret,
         }));
     }
 
@@ -481,12 +510,14 @@ impl Signaller {
     }
 
     fn attach_plugin(&self) {
-        let (transaction, session_id) = {
+        let (transaction, session_id, apisecret) = {
             let state = self.state.lock().unwrap();
+            let settings = self.settings.lock().unwrap();
 
             (
                 state.transaction_id.clone().unwrap(),
                 state.session_id.unwrap(),
+                settings.secret_key.clone(),
             )
         };
         self.send(OutgoingMessage::AttachPlugin(AttachPluginMsg {
@@ -494,12 +525,13 @@ impl Signaller {
             transaction,
             plugin: "janus.plugin.videoroom".to_string(),
             session_id,
+            apisecret,
         }));
     }
 
     fn join_room(&self) {
-        let (transaction, session_id, handle_id, room, feed_id, display) = {
-            let state = self.state.lock().unwrap();
+        let (transaction, session_id, handle_id, room, feed_id, display, apisecret) = {
+            let mut state = self.state.lock().unwrap();
             let settings = self.settings.lock().unwrap();
 
             if settings.room_id.is_none() {
@@ -507,13 +539,38 @@ impl Signaller {
                 return;
             }
 
+            /* room_id and feed_id can be either a string or integer depending
+             * on server configuration. The property is always a string, if we
+             * can parse it to integer then assume that's what the server expects,
+             * unless string-ids=true is set to force usage of strings.
+             * Save parsed value in state to not have to parse it again for future
+             * API calls.
+             */
+            if settings.string_ids {
+                state.room_id = Some(RoomId::Str(settings.room_id.clone().unwrap()));
+                state.feed_id = Some(RoomId::Str(settings.feed_id.clone()));
+            } else {
+                let room_id_str = settings.room_id.as_ref().unwrap();
+                match room_id_str.parse::<u32>() {
+                    Ok(n) => {
+                        state.room_id = Some(RoomId::Num(n));
+                        state.feed_id = Some(RoomId::Num(settings.feed_id.parse().unwrap()));
+                    }
+                    Err(_) => {
+                        state.room_id = Some(RoomId::Str(room_id_str.clone()));
+                        state.feed_id = Some(RoomId::Str(settings.feed_id.clone()));
+                    }
+                };
+            }
+
             (
                 state.transaction_id.clone().unwrap(),
                 state.session_id.unwrap(),
                 state.handle_id.unwrap(),
-                settings.room_id.as_ref().unwrap().parse().unwrap(),
-                settings.feed_id,
+                state.room_id.clone().unwrap(),
+                state.feed_id.clone().unwrap(),
                 settings.display_name.clone(),
+                settings.secret_key.clone(),
             )
         };
         self.send(OutgoingMessage::RoomRequest(RoomRequestMsg {
@@ -521,6 +578,7 @@ impl Signaller {
             transaction,
             session_id,
             handle_id,
+            apisecret,
             body: RoomRequestBody {
                 request: "join".to_string(),
                 ptype: "publisher".to_string(),
@@ -532,7 +590,7 @@ impl Signaller {
     }
 
     fn leave_room(&self) {
-        let (transaction, session_id, handle_id, room, feed_id, display) = {
+        let (transaction, session_id, handle_id, room, feed_id, display, apisecret) = {
             let state = self.state.lock().unwrap();
             let settings = self.settings.lock().unwrap();
 
@@ -545,9 +603,10 @@ impl Signaller {
                 state.transaction_id.clone().unwrap(),
                 state.session_id.unwrap(),
                 state.handle_id.unwrap(),
-                settings.room_id.as_ref().unwrap().parse().unwrap(),
-                settings.feed_id,
+                state.room_id.clone().unwrap(),
+                state.feed_id.clone().unwrap(),
                 settings.display_name.clone(),
+                settings.secret_key.clone(),
             )
         };
         self.send_blocking(OutgoingMessage::RoomRequest(RoomRequestMsg {
@@ -555,6 +614,7 @@ impl Signaller {
             transaction,
             session_id,
             handle_id,
+            apisecret,
             body: RoomRequestBody {
                 request: "leave".to_string(),
                 ptype: "publisher".to_string(),
@@ -566,7 +626,7 @@ impl Signaller {
     }
 
     fn publish(&self, offer: &gst_webrtc::WebRTCSessionDescription) {
-        let (transaction, session_id, handle_id) = {
+        let (transaction, session_id, handle_id, apisecret) = {
             let state = self.state.lock().unwrap();
             let settings = self.settings.lock().unwrap();
 
@@ -579,6 +639,7 @@ impl Signaller {
                 state.transaction_id.clone().unwrap(),
                 state.session_id.unwrap(),
                 state.handle_id.unwrap(),
+                settings.secret_key.clone(),
             )
         };
         let sdp_data = offer.sdp().as_text().unwrap();
@@ -587,6 +648,7 @@ impl Signaller {
             transaction,
             session_id,
             handle_id,
+            apisecret,
             body: PublishBody {
                 request: "publish".to_string(),
                 audio: true,
@@ -601,7 +663,7 @@ impl Signaller {
     }
 
     fn trickle(&self, candidate: &str, sdp_m_line_index: u32) {
-        let (transaction, session_id, handle_id) = {
+        let (transaction, session_id, handle_id, apisecret) = {
             let state = self.state.lock().unwrap();
             let settings = self.settings.lock().unwrap();
 
@@ -614,6 +676,7 @@ impl Signaller {
                 state.transaction_id.clone().unwrap(),
                 state.session_id.unwrap(),
                 state.handle_id.unwrap(),
+                settings.secret_key.clone(),
             )
         };
         self.send(OutgoingMessage::Trickle(TrickleMsg {
@@ -621,6 +684,7 @@ impl Signaller {
             transaction,
             session_id,
             handle_id,
+            apisecret,
             candidate: Candidate {
                 candidate: candidate.to_string(),
                 sdp_m_line_index,

net/webrtc/src/webrtcsink/imp.rs

@@ -20,7 +20,9 @@ use std::ops::Mul;
 use std::sync::{mpsc, Arc, Condvar, Mutex};
 
 use super::homegrown_cc::CongestionController;
-use super::{WebRTCSinkCongestionControl, WebRTCSinkError, WebRTCSinkMitigationMode};
+use super::{
+    WebRTCSinkCongestionControl, WebRTCSinkError, WebRTCSinkMitigationMode, WebRTCSinkPad,
+};
 use crate::aws_kvs_signaller::AwsKvsSignaller;
 use crate::janusvr_signaller::JanusVRSignaller;
 use crate::livekit_signaller::LiveKitSignaller;
@@ -186,7 +188,7 @@ impl futures::stream::FusedStream for CustomBusStream {
 /// Wrapper around our sink pads
 #[derive(Debug, Clone)]
 struct InputStream {
-    sink_pad: gst::GhostPad,
+    sink_pad: WebRTCSinkPad,
     producer: Option<StreamProducer>,
     /// The (fixed) caps coming in
     in_caps: Option<gst::Caps>,
@@ -554,8 +556,8 @@ fn make_converter_for_video_caps(caps: &gst::Caps, codec: &Codec) -> Result<gst:
                 // NVIDIA V4L2 encoders require NVMM memory as input and that requires using the
                 // corresponding converter
                 || codec
-                    .encoder_factory()
-                    .map_or(false, |factory| factory.name().starts_with("nvv4l2"))
+                .encoder_factory()
+                .map_or(false, |factory| factory.name().starts_with("nvv4l2"))
             {
                 let queue = make_element("queue", None)?;
                 let nvconvert = if let Ok(nvconvert) = make_element("nvvideoconvert", None) {
@@ -1434,6 +1436,10 @@ impl InputStream {
             ),
         )
     }
+
+    fn msid(&self) -> Option<String> {
+        self.sink_pad.property("msid")
+    }
 }
 
 impl NavigationEventHandler {
@@ -1537,12 +1543,13 @@ impl BaseWebRTCSink {
         match extension_configuration_type {
             ExtensionConfigurationType::Auto => {
                 // GstRTPBasePayload::extensions property is only available since GStreamer 1.24
-                if !payloader.has_property("extensions", Some(gst::Array::static_type()))
-                    && self.has_connected_payloader_setup_slots()
-                {
-                    gst::warning!(CAT, "'extensions' property is not available: TWCC extension ID will default to 1. \
+                if !payloader.has_property("extensions", Some(gst::Array::static_type())) {
+                    if self.has_connected_payloader_setup_slots() {
+                        gst::warning!(CAT, "'extensions' property is not available: TWCC extension ID will default to 1. \
         Application code must ensure to pick non-conflicting IDs for any additionally configured extensions. \
         Please consider updating GStreamer to 1.24.");
+                    }
+
                     return Some(1);
                 }
 
@@ -1738,6 +1745,11 @@ impl BaseWebRTCSink {
                 return;
             };
 
+            if let Some(msid) = stream.msid() {
+                gst::trace!(CAT, obj: element, "forwarding msid={msid:?} to webrtcbin sinkpad");
+                pad.set_property("msid", &msid);
+            }
+
             let transceiver = pad.property::<gst_webrtc::WebRTCRTPTransceiver>("transceiver");
 
             transceiver.set_property(
@@ -1867,7 +1879,7 @@ impl BaseWebRTCSink {
                         gst::StreamError::Failed,
                         ["Signalling error: {}", error]
                     );
-                })
+                }),
             ),
 
             request_meta: signaler.connect_closure(
@@ -1877,7 +1889,7 @@ impl BaseWebRTCSink {
                     let meta = instance.imp().settings.lock().unwrap().meta.clone();
 
                     meta
-                })
+                }),
             ),
 
             session_requested: signaler.connect_closure(
@@ -1887,7 +1899,7 @@ impl BaseWebRTCSink {
                     if let Err(err) = instance.imp().start_session(session_id, peer_id, offer) {
                         gst::warning!(CAT, "{}", err);
                     }
-                })
+                }),
             ),
 
             session_description: signaler.connect_closure(
@@ -1908,9 +1920,9 @@ impl BaseWebRTCSink {
             ),
 
             handle_ice: signaler.connect_closure(
-                    "handle-ice",
-                    false,
-                    glib::closure!(@watch instance => move |
+                "handle-ice",
+                false,
+                glib::closure!(@watch instance => move |
                         _signaler: glib::Object,
                         session_id: &str,
                         sdp_m_line_index: u32,
@@ -1920,7 +1932,7 @@ impl BaseWebRTCSink {
                             .imp()
                             .handle_ice(session_id, Some(sdp_m_line_index), None, candidate);
                     }),
-                ),
+            ),
 
             session_ended: signaler.connect_closure(
                 "session-ended",
@@ -1930,7 +1942,7 @@ impl BaseWebRTCSink {
                         gst::warning!(CAT, "{}", err);
                     }
                     false
-                })
+                }),
             ),
 
             shutdown: signaler.connect_closure(
@@ -1938,7 +1950,7 @@ impl BaseWebRTCSink {
                 false,
                 glib::closure!(@watch instance => move |_signaler: glib::Object|{
                     instance.imp().shutdown(instance);
-                })
+                }),
             ),
         });
     }
@@ -2585,7 +2597,7 @@ impl BaseWebRTCSink {
         if session.congestion_controller.is_some() {
             let session_id_str = session_id.to_string();
             rtpbin.connect_closure("on-new-ssrc", true,
-                glib::closure!(@weak-allow-none element,
+                                   glib::closure!(@weak-allow-none element,
                                 => move |rtpbin: gst::Object, session_id: u32, _src: u32| {
                         let rtp_session = rtpbin.emit_by_name::<gst::Element>("get-session", &[&session_id]);
 
@@ -2606,8 +2618,8 @@ impl BaseWebRTCSink {
                                 ));
                             }
                         }
-                    })
-                );
+                    }),
+            );
         }
 
         let clock = element.clock();
@@ -3718,7 +3730,7 @@ impl ObjectImpl for BaseWebRTCSink {
                     .mutable_ready()
                     .build(),
                 glib::ParamSpecObject::builder::<Signallable>("signaller")
-                    .flags(glib::ParamFlags::READABLE  | gst::PARAM_FLAG_MUTABLE_READY)
+                    .flags(glib::ParamFlags::READABLE | gst::PARAM_FLAG_MUTABLE_READY)
                     .blurb("The Signallable object to use to handle WebRTC Signalling")
                     .build(),
             ]
@@ -4071,11 +4083,12 @@ impl ElementImpl for BaseWebRTCSink {
                 caps_builder = caps_builder.structure(codec.caps.structure(0).unwrap().to_owned());
             }
 
-            let video_pad_template = gst::PadTemplate::new(
+            let video_pad_template = gst::PadTemplate::with_gtype(
                 "video_%u",
                 gst::PadDirection::Sink,
                 gst::PadPresence::Request,
                 &caps_builder.build(),
+                WebRTCSinkPad::static_type(),
             )
             .unwrap();
 
@@ -4084,11 +4097,12 @@ impl ElementImpl for BaseWebRTCSink {
             for codec in Codecs::audio_codecs() {
                 caps_builder = caps_builder.structure(codec.caps.structure(0).unwrap().to_owned());
             }
-            let audio_pad_template = gst::PadTemplate::new(
+            let audio_pad_template = gst::PadTemplate::with_gtype(
                 "audio_%u",
                 gst::PadDirection::Sink,
                 gst::PadPresence::Request,
                 &caps_builder.build(),
+                WebRTCSinkPad::static_type(),
             )
             .unwrap();
 
@@ -4127,13 +4141,13 @@ impl ElementImpl for BaseWebRTCSink {
             (name, false)
         };
 
-        let sink_pad = gst::GhostPad::builder_from_template(templ)
+        let sink_pad = gst::PadBuilder::<WebRTCSinkPad>::from_template(templ)
             .name(name.as_str())
             .chain_function(|pad, parent, buffer| {
                 BaseWebRTCSink::catch_panic_pad_function(
                     parent,
                     || Err(gst::FlowError::Error),
-                    |this| this.chain(pad, buffer),
+                    |this| this.chain(pad.upcast_ref(), buffer),
                 )
             })
             .event_function(|pad, parent, event| {
@@ -4250,7 +4264,7 @@ impl ChildProxyImpl for BaseWebRTCSink {
     fn child_by_name(&self, name: &str) -> Option<glib::Object> {
         match name {
             "signaller" => Some(self.settings.lock().unwrap().signaller.clone().upcast()),
-            _ => None,
+            _ => self.obj().static_pad(name).map(|pad| pad.upcast()),
         }
     }
 }

net/webrtc/src/webrtcsink/mod.rs

@@ -39,11 +39,16 @@ use gst::subclass::prelude::*;
 mod homegrown_cc;
 
 mod imp;
+mod pad;
 
 glib::wrapper! {
     pub struct BaseWebRTCSink(ObjectSubclass<imp::BaseWebRTCSink>) @extends gst::Bin, gst::Element, gst::Object, @implements gst::ChildProxy, gst_video::Navigation;
 }
 
+glib::wrapper! {
+    pub struct WebRTCSinkPad(ObjectSubclass<pad::WebRTCSinkPad>) @extends gst::GhostPad, gst::ProxyPad, gst::Pad, gst::Object;
+}
+
 glib::wrapper! {
     pub struct WebRTCSink(ObjectSubclass<imp::WebRTCSink>) @extends BaseWebRTCSink, gst::Bin, gst::Element, gst::Object, @implements gst::ChildProxy, gst_video::Navigation;
 }
@@ -124,6 +129,7 @@ enum WebRTCSinkMitigationMode {
 }
 
 pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
+    WebRTCSinkPad::static_type().mark_as_plugin_api(gst::PluginAPIFlags::empty());
     BaseWebRTCSink::static_type().mark_as_plugin_api(gst::PluginAPIFlags::empty());
     WebRTCSinkCongestionControl::static_type().mark_as_plugin_api(gst::PluginAPIFlags::empty());
     gst::Element::register(

net/webrtc/src/webrtcsink/pad.rs

@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: MPL-2.0
+
+use gst::{glib, prelude::*, subclass::prelude::*};
+use once_cell::sync::Lazy;
+use std::sync::Mutex;
+
+#[derive(Default)]
+pub struct WebRTCSinkPad {
+    settings: Mutex<Settings>,
+}
+
+#[derive(Debug, Default)]
+struct Settings {
+    msid: Option<String>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for WebRTCSinkPad {
+    const NAME: &'static str = "GstWebRTCSinkPad";
+    type Type = super::WebRTCSinkPad;
+    type ParentType = gst::GhostPad;
+}
+
+impl ObjectImpl for WebRTCSinkPad {
+    fn properties() -> &'static [glib::ParamSpec] {
+        static PROPS: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
+            vec![glib::ParamSpecString::builder("msid")
+                .flags(glib::ParamFlags::READWRITE | gst::PARAM_FLAG_MUTABLE_READY)
+                .blurb("Remote MediaStream ID in use for this pad")
+                .build()]
+        });
+        PROPS.as_ref()
+    }
+    fn set_property(&self, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec) {
+        let mut settings = self.settings.lock().unwrap();
+        match pspec.name() {
+            "msid" => {
+                settings.msid = value
+                    .get::<Option<String>>()
+                    .expect("type checked upstream")
+            }
+            name => panic!("no writable property {name:?}"),
+        }
+    }
+    fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+        let settings = self.settings.lock().unwrap();
+        match pspec.name() {
+            "msid" => settings.msid.to_value(),
+            name => panic!("no readable property {name:?}"),
+        }
+    }
+}
+
+impl GstObjectImpl for WebRTCSinkPad {}
+impl PadImpl for WebRTCSinkPad {}
+impl ProxyPadImpl for WebRTCSinkPad {}
+impl GhostPadImpl for WebRTCSinkPad {}

text/wrap/src/gsttextwrap/imp.rs

@@ -174,7 +174,7 @@ impl TextWrap {
                     CAT,
                     imp: self,
                     "Outputting contents {}, ts: {}, duration: {}",
-                    drained.to_string(),
+                    drained,
                     state.start_ts.display(),
                     duration.display(),
                 );
@@ -199,7 +199,7 @@ impl TextWrap {
 
             state.end_ts = buffer.pts();
 
-            let words = data.split_whitespace();
+            let words = data.split_ascii_whitespace();
             let mut current_text = state.current_text.to_string();
 
             for word in words {

utils/fallbackswitch/Cargo.toml

@@ -13,7 +13,7 @@ gst.workspace = true
 gst-base.workspace = true
 gst-audio.workspace = true
 gst-video.workspace = true
-gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true }
+gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true, version = "0.12" }
 gtk = { workspace = true, optional = true }
 gio = { workspace = true, optional = true }
 parking_lot = "0.12"

utils/fallbackswitch/src/fallbacksrc/imp.rs

@@ -534,7 +534,7 @@ impl ObjectImpl for FallbackSrc {
 
     // Called whenever a value of a property is read. It can be called
     // at any time from any thread.
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::block_in_conditions)]
     fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
         match pspec.name() {
             "enable-audio" => {
@@ -3237,7 +3237,7 @@ impl FallbackSrc {
         });
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::block_in_conditions)]
     fn schedule_source_restart_timeout(
         &self,
         state: &mut State,
@@ -3400,7 +3400,7 @@ impl FallbackSrc {
         source.restart_timeout = Some(timeout);
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::block_in_conditions)]
     fn have_fallback_activated(&self, state: &State) -> bool {
         let mut have_audio = false;
         let mut have_video = false;

utils/fallbackswitch/src/fallbackswitch/imp.rs

@@ -771,7 +771,7 @@ impl FallbackSwitch {
             is_active
         );
 
-        #[allow(clippy::blocks_in_if_conditions)]
+        #[allow(clippy::block_in_conditions)]
         let output_clockid = if is_active {
             pad_state.schedule_clock(
                 self,

utils/livesync/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 gio = { workspace = true, optional = true }
 gst.workspace = true
 gst-audio.workspace = true
-gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true }
+gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true, version = "0.12" }
 gtk = { workspace = true, optional = true }
 num-rational = { version = "0.4", default-features = false, features = [] }
 once_cell.workspace = true

utils/togglerecord/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 gst.workspace = true
 gst-audio.workspace = true
 gst-video.workspace = true
-gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true }
+gst-plugin-gtk4 = { path = "../../video/gtk4", optional = true, version = "0.12" }
 gtk = { workspace = true, optional = true }
 gio = { workspace = true, optional = true }
 parking_lot = "0.12"

utils/togglerecord/src/togglerecord/imp.rs

@@ -693,7 +693,7 @@ impl ToggleRecord {
         }
     }
 
-    #[allow(clippy::blocks_in_if_conditions)]
+    #[allow(clippy::block_in_conditions)]
     fn handle_secondary_stream<T: HandleData>(
         &self,
         pad: &gst::Pad,

version-helper/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gst-plugin-version-helper"
-version = "0.8.0"
+version = "0.8.1"
 authors = ["Sajeer Ahamed <ahamedsajeer.15.15@cse.mrt.ac.lk>",
            "Sebastian Dröge <sebastian@centricular.com>"]
 categories = ["development-tools"]

video/gtk4/src/sink/imp.rs

@@ -61,6 +61,7 @@ pub(crate) static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
 #[derive(Default)]
 pub struct PaintableSink {
     paintable: Mutex<Option<ThreadGuard<Paintable>>>,
+    window: Mutex<Option<ThreadGuard<gtk::Window>>>,
     info: Mutex<Option<gst_video::VideoInfo>>,
     sender: Mutex<Option<async_channel::Sender<SinkEvent>>>,
     pending_frame: Mutex<Option<Frame>>,
@@ -231,6 +232,18 @@ impl ElementImpl for PaintableSink {
     ) -> Result<gst::StateChangeSuccess, gst::StateChangeError> {
         match transition {
             gst::StateChange::NullToReady => {
+                let create_window = glib::program_name().as_deref() == Some("gst-launch-1.0")
+                    || std::env::var("GST_GTK4_WINDOW").as_deref() == Ok("1");
+
+                if create_window {
+                    let res = utils::invoke_on_main_thread(gtk::init);
+
+                    if let Err(err) = res {
+                        gst::error!(CAT, imp: self, "Failed to create initialize GTK: {err}");
+                        return Err(gst::StateChangeError);
+                    }
+                }
+
                 let mut paintable = self.paintable.lock().unwrap();
 
                 if paintable.is_none() {
@@ -273,6 +286,10 @@ impl ElementImpl for PaintableSink {
                         );
                     }
                 }
+
+                if create_window {
+                    self.create_window();
+                }
             }
             _ => (),
         }
@@ -294,6 +311,17 @@ impl ElementImpl for PaintableSink {
                     }
                 });
             }
+            gst::StateChange::ReadyToNull => {
+                let mut window_guard = self.window.lock().unwrap();
+                if let Some(window) = window_guard.take() {
+                    drop(window_guard);
+
+                    glib::MainContext::default().invoke(move || {
+                        let window = window.get_ref();
+                        window.close();
+                    });
+                }
+            }
             _ => (),
         }
 
@@ -520,6 +548,46 @@ impl PaintableSink {
             .replace(tmp_caps);
     }
 
+    fn create_window(&self) {
+        let self_ = self.to_owned();
+        glib::MainContext::default().invoke(move || {
+            let mut window_guard = self_.window.lock().unwrap();
+            if window_guard.is_some() {
+                return;
+            }
+
+            let paintable = match &*self_.paintable.lock().unwrap() {
+                Some(paintable) => paintable.get_ref().clone(),
+                None => return,
+            };
+
+            let window = gtk::Window::new();
+            let picture = gtk::Picture::new();
+            picture.set_paintable(Some(&paintable));
+            window.set_child(Some(&picture));
+            window.set_default_size(640, 480);
+
+            window.connect_close_request({
+                let self_ = self_.clone();
+                move |_window| {
+                    if self_.window.lock().unwrap().is_some() {
+                        gst::element_imp_error!(
+                            self_,
+                            gst::ResourceError::NotFound,
+                            ("Output window was closed")
+                        );
+                    }
+
+                    glib::Propagation::Proceed
+                }
+            });
+
+            window.show();
+
+            *window_guard = Some(ThreadGuard::new(window));
+        });
+    }
+
     fn create_paintable(&self, paintable_storage: &mut MutexGuard<Option<ThreadGuard<Paintable>>>) {
         #[cfg(any(target_os = "macos", target_os = "windows", feature = "gst-gl"))]
         {