Add max bitrate 2

docs/source/about/advanced_usage.rst

@@ -413,6 +413,41 @@ resolutions
         3840x1600,
       ]
 
+max_bitrate
+^^^^^^^^^^^
+
+**Description**
+   The maximum bitrate (in Kbps) that Sunshine will encode the stream at. If set to 0, it will always use the bitrate requested by Moonlight.
+
+**Default**
+   ``0``
+
+**Example**
+   .. code-block:: text
+
+      max_bitrate = 5000
+
+dwmflush
+^^^^^^^^
+
+**Description**
+   Invoke DwmFlush() to sync screen capture to the Windows presentation interval.
+
+   .. Caution:: Applies to Windows only. Alleviates visual stuttering during mouse movement.
+      If enabled, this feature will automatically deactivate if the client framerate exceeds
+      the host monitor's current refresh rate.
+
+   .. Note:: If you disable this option, you may see video stuttering during mouse movement in certain scenarios.
+      It is recommended to leave enabled when possible.
+
+**Default**
+   ``enabled``
+
+**Example**
+   .. code-block:: text
+
+      dwmflush = enabled
+
 Audio
 -----
 

src/config.cpp

@@ -479,6 +479,7 @@ namespace config {
     },  // supported resolutions
 
     { 10, 30, 60, 90, 120 },  // supported fps
+    0, // max bitrate
   };
 
   input_t input {
@@ -1049,6 +1050,7 @@ namespace config {
     list_string_f(vars, "resolutions"s, nvhttp.resolutions);
     list_int_f(vars, "fps"s, nvhttp.fps);
     list_prep_cmd_f(vars, "global_prep_cmd", config::sunshine.prep_cmds);
+    int_f(vars, "max_bitrate", nvhttp.max_bitrate);
 
     string_f(vars, "audio_sink", audio.sink);
     string_f(vars, "virtual_sink", audio.virtual_sink);

src/config.h

@@ -99,6 +99,7 @@ namespace config {
     std::string external_ip;
     std::vector<std::string> resolutions;
     std::vector<int> fps;
+    int max_bitrate;
   };
 
   struct input_t {

src/platform/windows/publish.cpp

@@ -29,8 +29,9 @@ using namespace std::literals;
 #define SV(quote) __SV(quote)
 
 extern "C" {
-#ifndef __MINGW32__
 constexpr auto DNS_REQUEST_PENDING = 9506L;
+
+#ifndef __MINGW32__
 constexpr auto DNS_QUERY_REQUEST_VERSION1 = 0x1;
 constexpr auto DNS_QUERY_RESULTS_VERSION1 = 0x1;
 #endif
@@ -129,14 +130,14 @@ namespace platf::publish {
 
     if (enable) {
       status = _DnsServiceRegister(&req, nullptr);
-      if (status != DNS_REQUEST_PENDING) {
+      if (status != MY_DNS_REQUEST_PENDING) {
         print_status("DnsServiceRegister()"sv, status);
         return -1;
       }
     }
     else {
       status = _DnsServiceDeRegister(&req, nullptr);
-      if (status != DNS_REQUEST_PENDING) {
+      if (status != MY_DNS_REQUEST_PENDING) {
         print_status("DnsServiceDeRegister()"sv, status);
         return -1;
       }

src/video.cpp

@@ -1543,7 +1543,7 @@ namespace video {
     }
 
     if (video_format[encoder_t::CBR]) {
-      auto bitrate = config.bitrate * 1000;
+      auto bitrate = ((config::nvhttp.max_bitrate != 0) ? std::min(config.bitrate, config::nvhttp.max_bitrate) : config.bitrate) * 1000;
       ctx->rc_max_rate = bitrate;
       ctx->bit_rate = bitrate;
 

src_assets/common/assets/web/config.html

@@ -200,6 +200,19 @@ <h1 class="my-4">Configuration</h1>
           resolutions and fps are supported.<br>
           This setting does <b>not</b> change how the screen stream is sent to Moonlight
         </div>
+        <div class="mb-3">
+          <label for="max_bitrate" class="form-label">Max Bitrate</label>
+          <input
+            type="number"
+            class="form-control"
+            id="max_bitrate"
+            placeholder="5000"
+            v-model="config.max_bitrate"
+          />
+          <div class="form-text">
+            Maximum bitrate for streaming in Kbps. If not specified, the default bitrate is used
+          </div>
+        </div>
       </div>
       <!-- Mapping Key AltRight to Key Windows -->
       <div class="mb-3">
@@ -1054,11 +1067,13 @@ <h1 class="my-4">Configuration</h1>
     "dwmflush": "enabled",
     "encoder": "",
     "fps": "[10,30,60,90,120]",
-    "gamepad": "auto",
+    "gamepad": "x360",
+    "global_prep_cmd": "[]",
     "hevc_mode": 0,
     "av1_mode": 0,
     "key_rightalt_to_key_win": "disabled",
     "keyboard": "enabled",
+    "max_bitrate": 0,
     "min_log_level": 2,
     "mouse": "enabled",
     "nv_coder": "auto",
@@ -1076,7 +1091,6 @@ <h1 class="my-4">Configuration</h1>
     "vt_coder": "auto",
     "vt_realtime": "enabled",
     "vt_software": "auto",
-    "global_prep_cmd": "[]",
   }
 
   new Vue({