Merge remote-tracking branch 'sunshine/master'

2025-02-15 04:32:32 +08:00
parent 6489c554a2 9aaa40c3ca
commit 93028a823a
10 changed files with 45 additions and 5 deletions
--- a/src/video.cpp
+++ b/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;