mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Remove cbr/bufsize from simple output mode

Browse Source 
CBR is now always on by default for streaming, so there's no reason to
have a setting for this in particular.  Still available in advanced
output settings of course, but simple output mode really should be kept
as simple as possible.
This commit is contained in:
jp9000 2015-09-11 08:39:38 -07:00
parent 6b4d267682
commit b574407c74
6 changed files with 11 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs/data/locale/en-US.ini
View File

@ -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"

126
obs/forms/OBSBasicSettings.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>895</width>
<height>614</height>
<width>937</width>
<height>653</height>
</rect>
</property>
<property name="sizePolicy">
@ -565,17 +565,7 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="simpleOutUseCBR">
<property name="text">
<string>Basic.Settings.Output.UseCBR</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_24">
<property name="enabled">
<bool>true</bool>
@ -585,7 +575,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="simpleOutPreset">
<item>
<property name="text">
@ -629,46 +619,14 @@
</item>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="simpleOutUseBufsize">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>Basic.Settings.Output.UseBufferSize</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="simpleOutVBufsize">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
<property name="value">
<number>2000</number>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Basic.Settings.Output.CustomEncoderSettings</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="6" column="1">
<widget class="QLineEdit" name="simpleOutCustom"/>
</item>
</layout>
@ -2170,8 +2128,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>67</width>
<height>16</height>
<width>98</width>
<height>28</height>
</rect>
</property>
</widget>
@ -2558,8 +2516,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>428</width>
<height>287</height>
<width>711</width>
<height>566</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@ -3022,70 +2980,6 @@
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutUseCBR</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>871</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>392</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutUseBufsize</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutVBufsize</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>466</x>
<y>464</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutUseBufsize</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>875</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>457</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>simpleOutAdvanced</sender>
<signal>toggled(bool)</signal>
<receiver>simpleOutVBufsize</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>875</x>
<y>360</y>
</hint>
<hint type="destinationlabel">
<x>875</x>
<y>464</y>
</hint>
</hints>
</connection>
<connection>
<sender>advOutRecType</sender>
<signal>currentIndexChanged(int)</signal>

12
obs/window-basic-main-outputs.cpp
View File

@ -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(),

4
obs/window-basic-main.cpp
View File

@ -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");

31
obs/window-basic-settings.cpp
View File

@ -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();

3
obs/window-basic-settings.hpp
View File

@ -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);