diff --git a/obs/data/locale/en-US.ini b/obs/data/locale/en-US.ini
index 528a965d6..c916c476c 100644
--- a/obs/data/locale/en-US.ini
+++ b/obs/data/locale/en-US.ini
@@ -313,8 +313,6 @@ Basic.Settings.Output.MaxRetries="Maximum Retries"
Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
Basic.Settings.Output.EncoderPreset="Encoder Preset (higher = less CPU)"
Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
-Basic.Settings.Output.UseCBR="Use Constant Bitrate"
-Basic.Settings.Output.UseBufferSize="Use Custom Buffer Size"
# basic mode 'output' settings - advanced section
Basic.Settings.Output.Adv.Rescale="Rescale Output"
diff --git a/obs/forms/OBSBasicSettings.ui b/obs/forms/OBSBasicSettings.ui
index 4463506e4..afc14f653 100644
--- a/obs/forms/OBSBasicSettings.ui
+++ b/obs/forms/OBSBasicSettings.ui
@@ -6,8 +6,8 @@
0
0
- 895
- 614
+ 937
+ 653
@@ -565,17 +565,7 @@
- -
-
-
- Basic.Settings.Output.UseCBR
-
-
- true
-
-
-
- -
+
-
true
@@ -585,7 +575,7 @@
- -
+
-
-
@@ -629,46 +619,14 @@
- -
-
-
-
- 0
- 0
-
-
-
- Qt::RightToLeft
-
-
- Basic.Settings.Output.UseBufferSize
-
-
-
- -
-
-
- false
-
-
- 0
-
-
- 1000000
-
-
- 2000
-
-
-
- -
+
-
Basic.Settings.Output.CustomEncoderSettings
- -
+
-
@@ -2170,8 +2128,8 @@
0
0
- 67
- 16
+ 98
+ 28
@@ -2558,8 +2516,8 @@
0
0
- 428
- 287
+ 711
+ 566
@@ -3022,70 +2980,6 @@
-
- simpleOutAdvanced
- toggled(bool)
- simpleOutUseCBR
- setVisible(bool)
-
-
- 871
- 360
-
-
- 875
- 392
-
-
-
-
- simpleOutUseBufsize
- toggled(bool)
- simpleOutVBufsize
- setEnabled(bool)
-
-
- 466
- 464
-
-
- 875
- 464
-
-
-
-
- simpleOutAdvanced
- toggled(bool)
- simpleOutUseBufsize
- setVisible(bool)
-
-
- 875
- 360
-
-
- 457
- 464
-
-
-
-
- simpleOutAdvanced
- toggled(bool)
- simpleOutVBufsize
- setVisible(bool)
-
-
- 875
- 360
-
-
- 875
- 464
-
-
-
advOutRecType
currentIndexChanged(int)
diff --git a/obs/window-basic-main-outputs.cpp b/obs/window-basic-main-outputs.cpp
index 025029915..c7a4614be 100644
--- a/obs/window-basic-main-outputs.cpp
+++ b/obs/window-basic-main-outputs.cpp
@@ -177,32 +177,22 @@ void SimpleOutput::Update()
int videoBitrate = config_get_uint(main->Config(), "SimpleOutput",
"VBitrate");
- int videoBufsize = config_get_uint(main->Config(), "SimpleOutput",
- "VBufsize");
int audioBitrate = GetAudioBitrate();
bool advanced = config_get_bool(main->Config(), "SimpleOutput",
"UseAdvanced");
- bool useCBR = config_get_bool(main->Config(), "SimpleOutput",
- "UseCBR");
- bool useBufsize = config_get_bool(main->Config(), "SimpleOutput",
- "UseBufsize");
const char *preset = config_get_string(main->Config(),
"SimpleOutput", "Preset");
const char *custom = config_get_string(main->Config(),
"SimpleOutput", "x264Settings");
obs_data_set_int(h264Settings, "bitrate", videoBitrate);
- obs_data_set_bool(h264Settings, "use_bufsize", useBufsize);
- obs_data_set_int(h264Settings, "buffer_size", videoBufsize);
if (advanced) {
obs_data_set_string(h264Settings, "preset", preset);
obs_data_set_string(h264Settings, "x264opts", custom);
- obs_data_set_bool(h264Settings, "cbr", useCBR);
- } else {
- obs_data_set_bool(h264Settings, "cbr", true);
}
+ obs_data_set_bool(aacSettings, "cbr", true);
obs_data_set_int(aacSettings, "bitrate", audioBitrate);
obs_service_apply_encoder_settings(main->GetService(),
diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp
index f7cba708e..91f3ee91d 100644
--- a/obs/window-basic-main.cpp
+++ b/obs/window-basic-main.cpp
@@ -637,10 +637,6 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_uint (basicConfig, "SimpleOutput", "ABitrate", 160);
config_set_default_bool (basicConfig, "SimpleOutput", "UseAdvanced",
false);
- config_set_default_bool (basicConfig, "SimpleOutput", "UseCBR", true);
- config_set_default_bool (basicConfig, "SimpleOutput", "UseBufsize",
- false);
- config_set_default_int (basicConfig, "SimpleOutput", "Bufsize", 2500);
config_set_default_string(basicConfig, "SimpleOutput", "Preset",
"veryfast");
diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 1f8524ab6..2bb715fae 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -270,11 +270,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->simpleOutputVBitrate, SCROLL_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->simpleOutputABitrate, COMBO_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->simpleOutAdvanced, CHECK_CHANGED, OUTPUTS_CHANGED);
- HookWidget(ui->simpleOutUseCBR, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->simpleOutPreset, COMBO_CHANGED, OUTPUTS_CHANGED);
- HookWidget(ui->simpleOutUseBufsize, CHECK_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->simpleOutPreset, COMBO_CHANGED, OUTPUTS_CHANGED);
- HookWidget(ui->simpleOutVBufsize, SCROLL_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->simpleOutCustom, EDIT_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutEncoder, COMBO_CHANGED, OUTPUTS_CHANGED);
HookWidget(ui->advOutUseRescale, CHECK_CHANGED, OUTPUTS_CHANGED);
@@ -1001,16 +998,10 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
"RecFormat");
int videoBitrate = config_get_uint(main->Config(), "SimpleOutput",
"VBitrate");
- int videoBufsize = config_get_uint(main->Config(), "SimpleOutput",
- "VBufsize");
int audioBitrate = config_get_uint(main->Config(), "SimpleOutput",
"ABitrate");
bool advanced = config_get_bool(main->Config(), "SimpleOutput",
"UseAdvanced");
- bool useCBR = config_get_bool(main->Config(), "SimpleOutput",
- "UseCBR");
- bool useBufsize = config_get_bool(main->Config(), "SimpleOutput",
- "UseBufsize");
const char *preset = config_get_string(main->Config(), "SimpleOutput",
"Preset");
const char *custom = config_get_string(main->Config(), "SimpleOutput",
@@ -1018,9 +1009,6 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
ui->simpleOutputPath->setText(path);
ui->simpleOutputVBitrate->setValue(videoBitrate);
- ui->simpleOutUseBufsize->setChecked(useBufsize);
- ui->simpleOutVBufsize->setValue(
- useBufsize ? videoBufsize : videoBitrate);
int idx = ui->simpleOutRecFormat->findText(format);
ui->simpleOutRecFormat->setCurrentIndex(idx);
@@ -1029,7 +1017,6 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
std::to_string(audioBitrate).c_str());
ui->simpleOutAdvanced->setChecked(advanced);
- ui->simpleOutUseCBR->setChecked(useCBR);
ui->simpleOutPreset->setCurrentText(preset);
ui->simpleOutCustom->setText(custom);
}
@@ -2086,14 +2073,9 @@ void OBSBasicSettings::SaveOutputSettings()
SaveEdit(ui->simpleOutputPath, "SimpleOutput", "FilePath");
SaveCombo(ui->simpleOutRecFormat, "SimpleOutput", "RecFormat");
SaveCheckBox(ui->simpleOutAdvanced, "SimpleOutput", "UseAdvanced");
- SaveCheckBox(ui->simpleOutUseCBR, "SimpleOutput", "UseCBR");
- SaveCheckBox(ui->simpleOutUseBufsize, "SimpleOutput", "UseBufsize");
SaveCombo(ui->simpleOutPreset, "SimpleOutput", "Preset");
SaveEdit(ui->simpleOutCustom, "SimpleOutput", "x264Settings");
- if (ui->simpleOutUseBufsize->isChecked())
- SaveSpinBox(ui->simpleOutVBufsize, "SimpleOutput", "VBufsize");
-
SaveCheckBox(ui->advOutApplyService, "AdvOut", "ApplyServiceSettings");
SaveComboData(ui->advOutEncoder, "AdvOut", "Encoder");
SaveCheckBox(ui->advOutUseRescale, "AdvOut", "Rescale");
@@ -2330,19 +2312,6 @@ void OBSBasicSettings::on_theme_activated(int idx)
App()->SetTheme(currT);
}
-void OBSBasicSettings::on_simpleOutUseBufsize_toggled(bool checked)
-{
- if (!checked)
- ui->simpleOutVBufsize->setValue(
- ui->simpleOutputVBitrate->value());
-}
-
-void OBSBasicSettings::on_simpleOutputVBitrate_valueChanged(int val)
-{
- if (!ui->simpleOutUseBufsize->isChecked())
- ui->simpleOutVBufsize->setValue(val);
-}
-
void OBSBasicSettings::on_listWidget_itemSelectionChanged()
{
int row = ui->listWidget->currentRow();
diff --git a/obs/window-basic-settings.hpp b/obs/window-basic-settings.hpp
index 0cacb6391..fee3595e2 100644
--- a/obs/window-basic-settings.hpp
+++ b/obs/window-basic-settings.hpp
@@ -228,9 +228,6 @@ private:
private slots:
void on_theme_activated(int idx);
- void on_simpleOutUseBufsize_toggled(bool checked);
- void on_simpleOutputVBitrate_valueChanged(int val);
-
void on_listWidget_itemSelectionChanged();
void on_buttonBox_clicked(QAbstractButton *button);