Merge pull request #161 from mahkoh/jorth/pipewire-hotfix

portal: ignore formats not supported by pipewire
mahkoh · Apr 10, 2024 · f35a7f6 · f35a7f6
2 parents e9ba778 + 3f39fa1
commit f35a7f6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jay-compositor"
-version = "1.0.1"
+version = "1.0.2"
 edition = "2021"
 build = "build/build.rs"
 license = "GPL-3.0-only"

diff --git a/deploy-notes.md b/deploy-notes.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+# 1.0.2
+
+- Needs jay-compositor release.
+
 # 1.0
 
 - Needs jay-config release.

diff --git a/release-notes.md b/release-notes.md
@@ -2,6 +2,10 @@
 
 - Add support for wp-alpha-modifier.
 
+# 1.0.2 (2024-04-10)
+
+- Fixed a bug that caused the portal to fail.
+
 # 1.0 (2024-04-07)
 
 This is the first stable release of Jay.
diff --git a/src/format.rs b/src/format.rs
@@ -71,11 +71,19 @@ static FORMATS_MAP: Lazy<AHashMap<u32, &'static Format>> = Lazy::new(|| {
 static PW_FORMATS_MAP: Lazy<AHashMap<SpaVideoFormat, &'static Format>> = Lazy::new(|| {
     let mut map = AHashMap::new();
     for format in FORMATS {
-        assert!(map.insert(format.pipewire, format).is_none());
+        if format.pipewire != SPA_VIDEO_FORMAT_UNKNOWN {
+            assert!(map.insert(format.pipewire, format).is_none());
+        }
     }
     map
 });
 
+#[test]
+fn formats_dont_panic() {
+    formats();
+    pw_formats();
+}
+
 pub fn formats() -> &'static AHashMap<u32, &'static Format> {
     &FORMATS_MAP
 }