提交 bc394430 编写于 作者: J jp9000

libobs: Allow forced stop even when already stopping

Allow outputs to force a stop even when already in the process of
stopping.  If for example a stream is heavily congested and taking a
very long time to stop, this allows frontends to give the users the
option to forcibly stop the stream to make it stop as quickly as
possible.
上级 007d39e2
......@@ -322,7 +322,7 @@ void obs_output_actual_stop(obs_output_t *output, bool force, uint64_t ts)
bool call_stop = true;
bool was_reconnecting = false;
if (stopping(output))
if (stopping(output) && !force)
return;
os_event_reset(output->stopping_event);
......@@ -391,8 +391,8 @@ void obs_output_force_stop(obs_output_t *output)
if (!stopping(output)) {
output->stop_code = 0;
do_output_signal(output, "stopping");
obs_output_actual_stop(output, true, 0);
}
obs_output_actual_stop(output, true, 0);
}
bool obs_output_active(const obs_output_t *output)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册