Merge remote-tracking branch 'sunshine/master'

src/config.cpp

@@ -513,7 +513,10 @@ namespace config {
       {},  // mode_remapping
       {}  // wa
     },  // display_device
+
     1,  // min_fps_factor
+    0  // max_bitrate
+
     "1920x1080x60",  // fallback_mode
   };
 
@@ -1183,6 +1186,7 @@ namespace config {
     bool_f(vars, "dd_wa_hdr_toggle", video.dd.wa.hdr_toggle);
 
     int_between_f(vars, "min_fps_factor", video.min_fps_factor, {1, 3});
+    int_f(vars, "max_bitrate", video.max_bitrate);
     string_f(vars, "fallback_mode", video.fallback_mode);
 
     path_f(vars, "pkey", nvhttp.pkey);

src/config.h

@@ -141,6 +141,8 @@ namespace config {
     } dd;
 
     int min_fps_factor;  // Minimum fps target, determines minimum frame time
+    int max_bitrate;  // Maximum bitrate, sets ceiling in kbps for bitrate requested from client
+
     std::string fallback_mode;
   };
 

src/video.cpp

@@ -1711,7 +1711,8 @@ namespace video {
         }
       }
 
-      auto bitrate = config.bitrate * 1000;
+      auto bitrate = ((config::video.max_bitrate > 0) ? std::min(config.bitrate, config::video.max_bitrate) : config.bitrate) * 1000;
+      BOOST_LOG(info) << "Streaming bitrate is " << bitrate;
       ctx->rc_max_rate = bitrate;
       ctx->bit_rate = bitrate;