fix: 🐛 Fix wrong default resolution for stream; add max res bounds (#3071)

* fix: 🐛 Fix weong default resolution for stream; add max res bounds

* Address comment

Author: zmerp

Cargo.lock

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["alvr/*"]
 
 [workspace.package]
-version = "21.0.0-dev10"
+version = "21.0.0-dev11"
 edition = "2024"
 rust-version = "1.88"
 authors = ["alvr-org"]

Cargo.toml

@@ -42,6 +42,8 @@ static DECODER_CONFIG_BUFFER: Mutex<Vec<u8>> = Mutex::new(vec![]);
 pub struct AlvrClientCapabilities {
     default_view_width: u32,
     default_view_height: u32,
+    max_view_width: u32,
+    max_view_height: u32,
     refresh_rates: *const f32,
     refresh_rates_count: u64,
     foveated_encoding: bool,
@@ -201,6 +203,8 @@ pub extern "C" fn alvr_initialize(capabilities: AlvrClientCapabilities) {
         capabilities.default_view_height,
     );
 
+    let max_view_resolution = UVec2::new(capabilities.max_view_width, capabilities.max_view_height);
+
     let refresh_rates = unsafe {
         slice::from_raw_parts(
             capabilities.refresh_rates,
@@ -211,6 +215,7 @@ pub extern "C" fn alvr_initialize(capabilities: AlvrClientCapabilities) {
 
     let capabilities = ClientCapabilities {
         default_view_resolution,
+        max_view_resolution,
         refresh_rates,
         foveated_encoding: capabilities.foveated_encoding,
         encoder_high_profile: capabilities.encoder_high_profile,

alvr/client_core/src/c_api.rs

@@ -169,6 +169,7 @@ fn connection_pipeline(
             streaming_capabilities: Some(
                 VideoStreamingCapabilities {
                     default_view_resolution: capabilities.default_view_resolution,
+                    max_view_resolution: capabilities.max_view_resolution,
                     refresh_rates: capabilities.refresh_rates,
                     microphone_sample_rate,
                     foveated_encoding: capabilities.foveated_encoding,

alvr/client_core/src/connection.rs

@@ -60,6 +60,7 @@ pub enum ClientCoreEvent {
 #[derive(Clone)]
 pub struct ClientCapabilities {
     pub default_view_resolution: UVec2,
+    pub max_view_resolution: UVec2,
     pub refresh_rates: Vec<f32>,
     pub foveated_encoding: bool,
     pub encoder_high_profile: bool,

alvr/client_core/src/lib.rs

@@ -191,6 +191,7 @@ fn client_thread(
 ) {
     let capabilities = ClientCapabilities {
         default_view_resolution: UVec2::new(1920, 1832),
+        max_view_resolution: UVec2::new(1920, 1832),
         refresh_rates: vec![60.0, 72.0, 80.0, 90.0, 120.0],
         foveated_encoding: false,
         encoder_high_profile: false,

alvr/client_mock/src/main.rs

@@ -247,7 +247,12 @@ pub fn entry_point() {
         let default_view_resolution = UVec2::new(
             views_config[0].recommended_image_rect_width,
             views_config[0].recommended_image_rect_height,
-        ) * 2;
+        );
+
+        let max_view_resolution = UVec2::new(
+            views_config[0].max_image_rect_width,
+            views_config[0].max_image_rect_height,
+        );
 
         let refresh_rates = if exts.fb_display_refresh_rate {
             xr_session.enumerate_display_refresh_rates().unwrap()
@@ -263,6 +268,7 @@ pub fn entry_point() {
 
         let capabilities = ClientCapabilities {
             default_view_resolution,
+            max_view_resolution,
             refresh_rates,
             foveated_encoding: platform != Platform::Unknown,
             encoder_high_profile: platform != Platform::Unknown,
@@ -290,7 +296,7 @@ pub fn entry_point() {
             Rc::clone(&graphics_context),
             Arc::clone(&interaction_context),
             platform,
-            default_view_resolution,
+            UVec2::min(default_view_resolution * 2, max_view_resolution),
             &last_lobby_message,
         );
 

alvr/client_openxr/src/lib.rs

@@ -30,6 +30,7 @@ pub struct VideoStreamingCapabilitiesExt {
 #[derive(Serialize, Deserialize, Clone)]
 pub struct VideoStreamingCapabilities {
     pub default_view_resolution: UVec2,
+    pub max_view_resolution: UVec2,
     pub refresh_rates: Vec<f32>,
     pub microphone_sample_rate: u32,
     pub foveated_encoding: bool,

alvr/packets/src/lib.rs

@@ -599,12 +599,42 @@ fn connection_pipeline(
         UVec2::new(align32(res.x), align32(res.y))
     }
 
-    let stream_view_resolution = get_view_res(
+    let mut transcoding_view_resolution = get_view_res(
         initial_settings.video.transcoding_view_resolution.clone(),
         streaming_caps.default_view_resolution,
     );
+    if transcoding_view_resolution.x > streaming_caps.max_view_resolution.x
+        || transcoding_view_resolution.y > streaming_caps.max_view_resolution.y
+    {
+        warn!(
+            "Chosen resolution {}x{} exceeds client maximum supported resolution of {}x{}. \
+            Using maximum supported resolution at same aspect ratio.",
+            transcoding_view_resolution.x,
+            transcoding_view_resolution.y,
+            streaming_caps.max_view_resolution.x,
+            streaming_caps.max_view_resolution.y,
+        );
+
+        let transcoding_ratio =
+            transcoding_view_resolution.x as f32 / transcoding_view_resolution.y as f32;
+
+        if transcoding_ratio
+            > streaming_caps.max_view_resolution.x as f32
+                / streaming_caps.max_view_resolution.y as f32
+        {
+            transcoding_view_resolution = UVec2::new(
+                align32(streaming_caps.max_view_resolution.x as f32),
+                align32(streaming_caps.max_view_resolution.x as f32 / transcoding_ratio),
+            );
+        } else {
+            transcoding_view_resolution = UVec2::new(
+                align32(streaming_caps.max_view_resolution.y as f32 * transcoding_ratio),
+                align32(streaming_caps.max_view_resolution.y as f32),
+            );
+        }
+    }
 
-    let target_view_resolution = get_view_res(
+    let emulated_headset_view_resolution = get_view_res(
         initial_settings
             .video
             .emulated_headset_view_resolution
@@ -740,7 +770,7 @@ fn connection_pipeline(
     let stream_config_packet = StreamConfigPacket::new(
         session_manager_lock.session(),
         NegotiatedStreamingConfig {
-            view_resolution: stream_view_resolution,
+            view_resolution: transcoding_view_resolution,
             refresh_rate_hint: fps,
             game_audio_sample_rate,
             enable_foveated_encoding,
@@ -758,10 +788,10 @@ fn connection_pipeline(
         proto_socket.split(STREAMING_RECV_TIMEOUT).to_con()?;
 
     let mut new_openvr_config = contruct_openvr_config(session_manager_lock.session());
-    new_openvr_config.eye_resolution_width = stream_view_resolution.x;
-    new_openvr_config.eye_resolution_height = stream_view_resolution.y;
-    new_openvr_config.target_eye_resolution_width = target_view_resolution.x;
-    new_openvr_config.target_eye_resolution_height = target_view_resolution.y;
+    new_openvr_config.eye_resolution_width = transcoding_view_resolution.x;
+    new_openvr_config.eye_resolution_height = transcoding_view_resolution.y;
+    new_openvr_config.target_eye_resolution_width = emulated_headset_view_resolution.x;
+    new_openvr_config.target_eye_resolution_height = emulated_headset_view_resolution.y;
     new_openvr_config.refresh_rate = fps as _;
     new_openvr_config.enable_foveated_encoding = enable_foveated_encoding;
     new_openvr_config.h264_profile = encoder_profile as _;