feat(client): ✨ Add Pico 4 Ultra support (alvr-org#2466)

Timocop · Nov 26, 2024 · a319afc · a319afc
1 parent 4789d57
commit a319afc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@ This is a fork of [ALVR](https://github.com/polygraphene/ALVR).
 
 |      VR Headset       |                                           Support                                            |
 | :-------------------: | :------------------------------------------------------------------------------------------: |
-|    Quest 1/2/3/Pro    |     :heavy_check_mark: ([store link](https://www.meta.com/experiences/7674846229245715))     |
-|     Pico 4/Neo 3      |                                      :heavy_check_mark:                                      |
+|  Quest 1/2/3/3S/Pro   |     :heavy_check_mark: ([store link](https://www.meta.com/experiences/7674846229245715))     |
+| Pico Neo 3/4/4 Ultra  |                                      :heavy_check_mark:                                      |
 | Vive Focus 3/XR Elite |                                      :heavy_check_mark:                                      |
 |        YVR 1/2        |                                      :heavy_check_mark:                                      |
 |        Lynx R1        |                                      :heavy_check_mark:                                      |

diff --git a/alvr/client_core/src/platform/mod.rs b/alvr/client_core/src/platform/mod.rs
@@ -16,6 +16,9 @@ pub enum Platform {
     QuestUnknown,
     PicoNeo3,
     Pico4,
+    Pico4Ultra,
+    PicoG3,
+    PicoUnknown,
     Focus3,
     XRElite,
     ViveUnknown,
@@ -39,6 +42,9 @@ impl Display for Platform {
             Platform::QuestUnknown => "Quest (unknown)",
             Platform::PicoNeo3 => "Pico Neo 3",
             Platform::Pico4 => "Pico 4",
+            Platform::Pico4Ultra => "Pico 4 Ultra",
+            Platform::PicoG3 => "Pico G3",
+            Platform::PicoUnknown => "Pico (unknown)",
             Platform::Focus3 => "VIVE Focus 3",
             Platform::XRElite => "VIVE XR Elite",
             Platform::ViveUnknown => "HTC VIVE (unknown)",
@@ -69,7 +75,10 @@ pub fn platform() -> Platform {
             ("Oculus", _, "seacliff") => Platform::QuestPro,
             ("Oculus", _, _) => Platform::QuestUnknown,
             ("Pico", "Pico Neo 3" | "Pico Neo3 Link", _) => Platform::PicoNeo3,
-            ("Pico", _, _) => Platform::Pico4,
+            ("Pico", _, "phoenix") => Platform::Pico4,
+            ("Pico", _, "sparrow") => Platform::Pico4Ultra,
+            ("Pico", _, "merline") => Platform::PicoG3,
+            ("Pico", _, _) => Platform::PicoUnknown,
             ("HTC", "VIVE Focus 3", _) => Platform::Focus3,
             ("HTC", "VIVE XR Series", _) => Platform::XRElite,
             ("HTC", _, _) => Platform::ViveUnknown,

diff --git a/alvr/client_openxr/src/lib.rs b/alvr/client_openxr/src/lib.rs
@@ -253,6 +253,10 @@ pub fn entry_point() {
             encoder_high_profile: platform != Platform::Unknown,
             encoder_10_bits: platform != Platform::Unknown,
             encoder_av1: platform == Platform::Quest3,
+            encoder_av1: matches!(
+                platform,
+                Platform::Quest3 | Platform::Quest3S | Platform::Pico4Ultra
+            ),
         };
         let core_context = Arc::new(ClientCoreContext::new(capabilities));