Skip to content

plugins: Set missed default bitrates to 6000 kbps #12701

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

plugins: Set missed default bitrates to 6000 kbps #12701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions plugins/mac-videotoolbox/encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,10 +1375,10 @@ static void vt_defaults(obs_data_t *settings, void *data)
obs_data_set_default_string(settings, "rate_control", "CBR");
}
}
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "quality", 60);
obs_data_set_default_bool(settings, "limit_bitrate", false);
obs_data_set_default_int(settings, "max_bitrate", 2500);
obs_data_set_default_int(settings, "max_bitrate", 6000);
obs_data_set_default_double(settings, "max_bitrate_window", 1.5f);
obs_data_set_default_int(settings, "keyint_sec", 2);
obs_data_set_default_string(settings, "profile",
Expand Down
2 changes: 1 addition & 1 deletion plugins/obs-ffmpeg/obs-ffmpeg-openh264.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ static bool openh264_encode(void *data, struct encoder_frame *frame, struct enco

void openh264_defaults(obs_data_t *settings)
{
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_string(settings, "profile", "main");
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ static void vaapi_defaults_internal(obs_data_t *settings, enum codec_type codec)
else if (codec == CODEC_AV1)
obs_data_set_default_int(settings, "profile", AV_PROFILE_AV1_MAIN);
obs_data_set_default_int(settings, "level", AV_LEVEL_UNKNOWN);
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "keyint_sec", 0);
obs_data_set_default_int(settings, "bf", 0);
obs_data_set_default_int(settings, "qp", 20);
Expand Down
8 changes: 4 additions & 4 deletions plugins/obs-ffmpeg/texture-amf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ static inline void adjust_recommended_avc_defaults(amf_base *enc, obs_data_t *se
int64_t framerate = enc->fps_num / enc->fps_den;
if ((enc->cx * enc->cy > 1920 * 1088) || (framerate > 60)) {
// Recommended base defaults
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "cqp", 20);
obs_data_set_default_string(settings, "rate_control", "CBR");
obs_data_set_default_string(settings, "preset", "quality");
Expand Down Expand Up @@ -1841,7 +1841,7 @@ static inline void adjust_recommended_hevc_defaults(amf_base *enc, obs_data_t *s
const int64_t framerate = enc->fps_num / enc->fps_den;
if ((enc->cx * enc->cy > 1920 * 1088) || is10bit || (framerate > 60)) {
// Recommended base defaults
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "cqp", 20);
obs_data_set_default_string(settings, "preset", "quality");
info("Original base default settings were used according to resolution and framerate.");
Expand Down Expand Up @@ -2092,7 +2092,7 @@ try {
static void amf_hevc_defaults(obs_data_t *settings)
{
obs_data_set_default_string(settings, "rate_control", "CBR");
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "cqp", 20);
obs_data_set_default_string(settings, "preset", "quality");
}
Expand Down Expand Up @@ -2245,7 +2245,7 @@ static inline void adjust_recommended_av1_defaults(amf_base *enc, obs_data_t *se
const int64_t framerate = enc->fps_num / enc->fps_den;
if ((enc->cx * enc->cy > 1920 * 1088) || is10bit || (framerate > 60)) {
// Recommended base defaults
obs_data_set_default_int(settings, "bitrate", 2500);
obs_data_set_default_int(settings, "bitrate", 6000);
obs_data_set_default_int(settings, "cqp", 20);
obs_data_set_default_string(settings, "preset", "balanced");
obs_data_set_default_string(settings, "profile", "main");
Expand Down