Merge remote-tracking branch 'sunshine/master'

src_assets/common/assets/web/config.html

@@ -201,6 +201,7 @@
               "headless_mode": "disabled",
               "double_refreshrate": "disabled",
               "min_fps_factor": 1,
+              "max_bitrate": 0,
             },
           },
           {

src_assets/common/assets/web/configs/tabs/audiovideo/DisplayModesSettings.vue

@@ -17,6 +17,13 @@ const config = ref(props.config)
     <input type="number" min="1" max="3" class="form-control" id="min_fps_factor" placeholder="1" v-model="config.min_fps_factor" />
     <div class="form-text">{{ $t('config.min_fps_factor_desc') }}</div>
   </div>
+
+  <!--max_bitrate-->
+  <div class="mb-3">
+    <label for="max_bitrate" class="form-label">{{ $t("config.max_bitrate") }}</label>
+    <input type="number" class="form-control" id="max_bitrate" placeholder="0" v-model="config.max_bitrate" />
+    <div class="form-text">{{ $t("config.max_bitrate_desc") }}</div>
+  </div>
 </template>
 
 <style scoped>

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

@@ -308,6 +308,8 @@
     "log_level_desc": "The minimum log level printed to standard out",
     "log_path": "Logfile Path",
     "log_path_desc": "The file where the current logs of Apollo are stored.",
+    "max_bitrate": "Maximum Bitrate",
+    "max_bitrate_desc": "The maximum bitrate (in Kbps) that Apollo will encode the stream at. If set to 0, it will always use the bitrate requested by Artemis/Moonlight.",
     "min_fps_factor": "Minimum FPS Factor",
     "min_fps_factor_desc": "Apollo will use this factor to calculate the minimum time between frames. Increasing this value slightly may help when streaming mostly static content. Higher values will consume more bandwidth.",
     "min_threads": "Minimum CPU Thread Count",