Do not allow enabling passtrhough in real time

alvr-org · Jan 31, 2025 · 6517229 · 6517229
1 parent 8cbf0a1
commit 6517229
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/alvr/client_openxr/src/stream.rs b/alvr/client_openxr/src/stream.rs
@@ -311,7 +311,9 @@ impl StreamContext {
     }
 
     pub fn update_real_time_config(&mut self, config: &RealTimeConfig) {
-        self.config.passthrough = config.passthrough.clone();
+        if let Some(passthrough) = &mut self.config.passthrough {
+            *passthrough = config.passthrough.clone();
+        }
     }
 
     pub fn render(

diff --git a/alvr/packets/src/lib.rs b/alvr/packets/src/lib.rs
@@ -410,7 +410,7 @@ pub enum ServerRequest {
 // compatibility between different versions, even if within the same major version.
 #[derive(Serialize, Deserialize)]
 pub struct RealTimeConfig {
-    pub passthrough: Option<PassthroughMode>,
+    pub passthrough: PassthroughMode,
 }
 
 pub fn encode_real_time_config(config: &RealTimeConfig) -> Result<ServerControlPacket> {

diff --git a/alvr/server_core/src/connection.rs b/alvr/server_core/src/connection.rs
@@ -25,7 +25,7 @@ use alvr_packets::{
 };
 use alvr_session::{
     BodyTrackingSinkConfig, CodecType, ControllersEmulationMode, FrameSize, H264Profile,
-    OpenvrConfig, SessionConfig, SocketProtocol,
+    OpenvrConfig, PassthroughMode, SessionConfig, SocketProtocol,
 };
 use alvr_sockets::{
     PeerType, ProtoControlSocket, StreamSocketBuilder, CONTROL_PORT, KEEPALIVE_INTERVAL,
@@ -1079,9 +1079,14 @@ fn connection_pipeline(
                     let session_manager_lock = SESSION_MANAGER.read();
                     let settings = session_manager_lock.settings();
 
-                    RealTimeConfig {
-                        passthrough: settings.video.passthrough.clone().into_option(),
-                    }
+                    let passthrough =
+                        if let Switch::Enabled(mode) = settings.video.passthrough.clone() {
+                            mode
+                        } else {
+                            PassthroughMode::default()
+                        };
+
+                    RealTimeConfig { passthrough }
                 };
 
                 if let Ok(config) = alvr_packets::encode_real_time_config(&config) {

diff --git a/alvr/session/src/settings.rs b/alvr/session/src/settings.rs
@@ -627,11 +627,17 @@ pub enum PassthroughMode {
     ChromaKey(#[schema(flag = "real-time")] ChromaKeyConfig),
 }
 
+impl Default for PassthroughMode {
+    fn default() -> Self {
+        Self::AugmentedReality { brightness: 0.0 }
+    }
+}
+
 #[derive(SettingsSchema, Serialize, Deserialize, Clone)]
 pub struct VideoConfig {
     #[schema(strings(help = r"Augmented reality: corresponds to premultiplied alpha
-Blend: corresponds to un-premultiplied alpha"))]
-    #[schema(flag = "real-time")]
+Blend: corresponds to un-premultiplied alpha
+Note: if connection is initiated while the switch is disabled, the nested settings will be ignored"))]
     pub passthrough: Switch<PassthroughMode>,
 
     pub bitrate: BitrateConfig,