Skip to content

Add max bitrate option #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
utkarshdalal wants to merge 26 commits into from
Closed

Add max bitrate option #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
660d8e1
Merge pull request #332 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
1e6d9da
Merge pull request #456 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
8509ee7
Merge pull request #458 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
e1b112c
Merge pull request #460 from LizardByte/nightly
ReenigneArcher Oct 31, 2022
08d623c
Merge pull request #467 from LizardByte/nightly
ReenigneArcher Dec 14, 2022
b2fe042
Merge pull request #567 from LizardByte/nightly
ReenigneArcher Jan 9, 2023
b2c5da2
Merge pull request #738 from LizardByte/nightly
ReenigneArcher Jan 30, 2023
09dff34
Merge pull request #866 from LizardByte/nightly
ReenigneArcher Feb 1, 2023
446825b
Merge pull request #877 from LizardByte/nightly
ReenigneArcher Feb 13, 2023
9563419
Merge pull request #929 from LizardByte/nightly
ReenigneArcher Feb 14, 2023
0dfbcfd
Merge pull request #954 from LizardByte/nightly
ReenigneArcher Feb 21, 2023
483e225
Merge pull request #969 from LizardByte/nightly
ReenigneArcher Mar 30, 2023
d70d084
Merge pull request #1105 from LizardByte/nightly
ReenigneArcher Mar 30, 2023
31e8b79
Merge pull request #1115 from LizardByte/nightly
ReenigneArcher May 29, 2023
9cfa228
added max bitrate variable that overrides bitrate set by moonlight cl…
Jul 22, 2023
6d39591
corrected syntax errors
Jul 22, 2023
23fbeae
updated variable in publish.cpp for windows to build in github action
Jul 22, 2023
d8b62ff
added empty line to force release
Jul 22, 2023
72551fe
Updated description for max_bitrate param
Jul 23, 2023
3fb13de
Addressed code review comments
Jul 24, 2023
5f49733
Merge branch 'nightly' into add_max_bitrate
Jul 24, 2023
3955d2d
Merge branch 'nightly' into add_max_bitrate
Aug 28, 2023
5bca024
Merge pull request #1334 from LizardByte/nightly
ReenigneArcher Oct 16, 2023
415fe56
Merge pull request #3 from utkarshdalal/add_max_bitrate_2
Nov 22, 2023
66e8b9f
Merge branch 'nightly' into master
Nov 22, 2023
82416e8
changes to match remote nightly
Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions docs/source/about/advanced_usage.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,20 @@ 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

Audio
-----

Expand Down
2 changes: 2 additions & 0 deletions src/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ namespace config {
}, // supported resolutions

{ 10, 30, 60, 90, 120 }, // supported fps
0, // max bitrate
Copy link
Member

@ReenigneArcher ReenigneArcher Jul 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
0, // max bitrate
0, // max bitrate

2 spaces (linting rules)

};

input_t input {
Expand Down Expand Up @@ -993,6 +994,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);
Copy link
Member

@ReenigneArcher ReenigneArcher Jul 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
int_f(vars, "max_bitrate", nvhttp.max_bitrate);
int_between_f(vars, "max_bitrate", nvhttp.max_bitrate, { 0, 150000 });


string_f(vars, "audio_sink", audio.sink);
string_f(vars, "virtual_sink", audio.virtual_sink);
Expand Down
1 change: 1 addition & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ namespace config {
std::string external_ip;
std::vector<std::string> resolutions;
std::vector<int> fps;
int max_bitrate;
};

struct input_t {
Expand Down
2 changes: 1 addition & 1 deletion src/video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,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;

Expand Down
16 changes: 15 additions & 1 deletion src_assets/common/assets/web/config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ <h2 class="accordion-header">
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"
Copy link
Member

@ReenigneArcher ReenigneArcher Aug 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
placeholder="5000"
placeholder="0"

Copy link
Contributor Author

@utkarshdalal utkarshdalal Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's done, sorry for the delay I missed the notification.

v-model="config.max_bitrate"
/>
<div class="form-text">
Maximum bitrate for streaming in Kbps. If not specified, the default bitrate is used
Copy link
Member

@ReenigneArcher ReenigneArcher Jul 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Maximum bitrate for streaming in Kbps. If not specified, the default bitrate is used
Maximum bitrate for streaming in Kbps.

We always use the default value if not specified (or if the value provided by the user is outside an acceptable range). Actually we should probably enforce a max value for the setting.

</div>
</div>
</div>
<!-- Mapping Key AltRight to Key Windows -->
<div class="mb-3">
Expand Down Expand Up @@ -1164,10 +1177,12 @@ <h2 class="accordion-header">
"encoder": "",
"fps": "[10,30,60,90,120]",
"gamepad": "auto",
"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",
"nvenc_h264_cavlc": "disabled",
Expand All @@ -1184,7 +1199,6 @@ <h2 class="accordion-header">
"vt_coder": "auto",
"vt_realtime": "enabled",
"vt_software": "auto",
"global_prep_cmd": "[]",
}

new Vue({
Expand Down