jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Prevent re-updating of the stream encoder

Browse Source 
Using advanced output mode, the stream encoder could be updated with the
same settings, causing the encoder to output those changes
unnecessarily.
This commit is contained in:
jp9000 2015-02-14 18:10:39 -08:00
parent 77f2fda3ce
commit 2cc4c6e8d3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -609,7 +609,11 @@ void AdvancedOutput::SetupOutputs()
bool AdvancedOutput::StartStreaming(obs_service_t *service)
{
AdvancedOutput::Update();
if (!useStreamEncoder ||
(!ffmpegRecording && !obs_output_active(fileOutput))) {
UpdateStreamSettings();
}
if (!Active())
SetupOutputs();
@ -634,7 +638,14 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
bool AdvancedOutput::StartRecording()
{
AdvancedOutput::Update();
if (!useStreamEncoder) {
if (!ffmpegRecording) {
UpdateRecordingSettings();
}
} else if (!obs_output_active(streamOutput)) {
UpdateStreamSettings();
}
if (!Active())
SetupOutputs();