Add fallback mode config

src/config.cpp

@@ -380,6 +380,8 @@ namespace config {
     {},  // encoder
     {},  // adapter_name
     {},  // output_name
+
+    "1920x1080x60",  // fallback_mode
   };
 
   audio_t audio {
@@ -1052,6 +1054,7 @@ namespace config {
     string_f(vars, "encoder", video.encoder);
     string_f(vars, "adapter_name", video.adapter_name);
     string_f(vars, "output_name", video.output_name);
+    string_f(vars, "fallback_mode", video.fallback_mode);
     int_between_f(vars, "min_fps_factor", video.min_fps_factor, { 1, 3 });
 
     path_f(vars, "pkey", nvhttp.pkey);

src/config.h

@@ -77,6 +77,8 @@ namespace config {
     std::string encoder;
     std::string adapter_name;
     std::string output_name;
+
+    std::string fallback_mode;
   };
 
   struct audio_t {

src/nvhttp.cpp

@@ -356,16 +356,6 @@ namespace nvhttp {
       std::copy(rikey.cbegin(), rikey.cend(), std::back_inserter(launch_session->gcm_key));
 
       launch_session->host_audio = host_audio;
-      std::stringstream mode = std::stringstream(get_arg(args, "mode", "0x0x0"));
-      // Split mode by the char "x", to populate width/height/fps
-      int x = 0;
-      std::string segment;
-      while (std::getline(mode, segment, 'x')) {
-        if (x == 0) launch_session->width = atoi(segment.c_str());
-        if (x == 1) launch_session->height = atoi(segment.c_str());
-        if (x == 2) launch_session->fps = atoi(segment.c_str());
-        x++;
-      }
 
       // Encrypted RTSP is enabled with client reported corever >= 1
       auto corever = util::from_view(get_arg(args, "corever", "0"));
@@ -387,10 +377,17 @@ namespace nvhttp {
       uint32_t prepend_iv = util::endian::big<uint32_t>(util::from_view(get_arg(args, "rikeyid")));
       auto prepend_iv_p = (uint8_t *) &prepend_iv;
       std::copy(prepend_iv_p, prepend_iv_p + sizeof(prepend_iv), std::begin(launch_session->iv));
-    } else {
+    }
-      launch_session->width = 0;
+
-      launch_session->height = 0;
+    std::stringstream mode = std::stringstream(get_arg(args, "mode", config::video.fallback_mode.c_str()));
-      launch_session->fps = 0;
+    // Split mode by the char "x", to populate width/height/fps
+    int x = 0;
+    std::string segment;
+    while (std::getline(mode, segment, 'x')) {
+      if (x == 0) launch_session->width = atoi(segment.c_str());
+      if (x == 1) launch_session->height = atoi(segment.c_str());
+      if (x == 2) launch_session->fps = atoi(segment.c_str());
+      x++;
     }
 
     launch_session->device_name = named_cert_p->name.empty() ? "ApolloDisplay"s : named_cert_p->name;

src/process.cpp

@@ -223,7 +223,7 @@ namespace proc {
 
         std::wstring currentPrimaryDisplayName = VDISPLAY::getPrimaryDisplay();
 
-        // When launched through config ui, don't change display settings
+        // Don't change display settings when no params are given
         if (launch_session->width && launch_session->height && launch_session->fps) {
           // Apply display settings
           VDISPLAY::changeDisplaySettings(vdisplayName.c_str(), render_width, render_height, launch_session->fps);

src_assets/common/assets/web/config.html

@@ -343,6 +343,11 @@
       serialize() {
         this.config.global_prep_cmd = JSON.stringify(this.global_prep_cmd.filter(cmd => cmd.do || cmd.undo));
         this.config.server_cmd = JSON.stringify(this.server_cmd.filter(cmd => cmd.name && cmd.cmd));
+
+        // Validate fallback mode
+        if (this.config.fallback_mode && !this.config.fallback_mode.match(/^\d+x\d+x\d+$/)) {
+          this.config.fallback_mode = "1920x1080x60";
+        }
       },
       save() {
         this.saved = false;

src_assets/common/assets/web/configs/tabs/AudioVideo.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {ref, computed} from 'vue'
+import {ref, computed, inject} from 'vue'
 import {$tp} from '../../platform-i18n'
 import PlatformLayout from '../../PlatformLayout.vue'
 import AdapterNameSelector from './audiovideo/AdapterNameSelector.vue'
@@ -8,6 +8,8 @@ import NewDisplayOutputSelector from './audiovideo/NewDisplayOutputSelector.vue'
 import DisplayDeviceOptions from "./audiovideo/DisplayDeviceOptions.vue";
 import DisplayModesSettings from "./audiovideo/DisplayModesSettings.vue";
 
+const $t = inject('i18n').t;
+
 const props = defineProps([
   'platform',
   'config',
@@ -26,6 +28,17 @@ const sudovdaStatus = {
 const currentDriverStatus = computed(() => sudovdaStatus[props.vdisplay])
 
 const config = ref(props.config)
+
+const validateFallbackMode = (event) => {
+  const value = event.target.value;
+  if (!value.match(/^\d+x\d+x\d+$/)) {
+    event.target.setCustomValidity($t('config.fallback_mode_error'));
+  } else {
+    event.target.setCustomValidity('');
+  }
+
+  event.target.reportValidity();
+}
 </script>
 
 <template>
@@ -102,6 +115,20 @@ const config = ref(props.config)
         :min_fps_factor="min_fps_factor"
     />
 
+    <!-- Fallback Display Mode -->
+    <div class="mb-3">
+      <label for="fallback_mode" class="form-label">{{ $t('config.fallback_mode') }}</label>
+      <input 
+        type="text" 
+        class="form-control" 
+        id="fallback_mode" 
+        v-model="config.fallback_mode" 
+        placeholder="1920x1080x60"
+        @input="validateFallbackMode"
+      />
+      <div class="form-text">{{ $t('config.fallback_mode_desc') }}</div>
+    </div>
+
     <div class="mb-3 form-check" v-if="platform === 'windows'">
       <input type="checkbox" class="form-check-input" id="follow_client_hdr" v-model="config.follow_client_hdr" true-value="enabled" false-value="disabled"/>
       <label for="follow_client_hdr" class="form-check-label">{{ $t('config.follow_client_hdr') }}</label>

src_assets/common/assets/web/public/assets/locale/en.json

@@ -181,6 +181,9 @@
     "encoder_software": "Software",
     "external_ip": "External IP",
     "external_ip_desc": "If no external IP address is given, Apollo will automatically detect external IP",
+    "fallback_mode": "Fallback Display Mode",
+    "fallback_mode_desc": "Apollo will use this mode when the client does not provide a mode or when the app is launched through the web UI. Format: [Width]x[Height]x[FPS]",
+    "fallback_mode_error": "Invalid fallback mode. Format: [Width]x[Height]x[FPS]",
     "fec_percentage": "FEC Percentage",
     "fec_percentage_desc": "Percentage of error correcting packets per data packet in each video frame. Higher values can correct for more network packet loss, but at the cost of increasing bandwidth usage.",
     "ffmpeg_auto": "auto -- let ffmpeg decide (default)",

src_assets/common/assets/web/public/assets/locale/zh.json

@@ -179,6 +179,9 @@
     "encoder_software": "软件",
     "external_ip": "外部 IP",
     "external_ip_desc": "如果没有指定外部 IP 地址，Apollo 将自动检测外部 IP",
+    "fallback_mode": "备用显示参数",
+    "fallback_mode_desc": "当客户端未提供显示参数或通过 Web UI 启动应用时使用。格式：[宽度]x[高度]x[帧率]",
+    "fallback_mode_error": "无效的备用显示参数。格式：[宽度]x[高度]x[帧率]",
     "fec_percentage": "FEC (前向纠错) 参数",
     "fec_percentage_desc": "每个视频帧中的错误纠正数据包百分比。较高的值可纠正更多的网络数据包丢失，但代价是增加带宽使用量。",
     "ffmpeg_auto": "auto -- 由 ffmpeg 决定（默认）",