0538865553
This feature allows a user to delay an output (as long as the output itself supports it). Needless to say this intended for live streams, where users may want to delay their streams to prevent stream sniping, cheating, and other such things. The design this time was a bit more elaborate, but still simple in design: the user can now schedule stops/starts without having to wait for the stream itself to stop before being able to take any action. Optionally, they can also forcibly stop stream (and delay) in case something happens which they might not want to be streamed. Additionally, a new option was added to preserve stream cutoff point on disconnections/reconnections, so that if you get disconnected while streaming, when it reconnects, it will reconnect right at the point where it left off. This will probably be quite useful for a number of applications in addition to regular delay, such as setting the delay to 1 second and then using this feature to minimize, for example, a critical stream such as a tournament stream from getting any of its stream data cut off. However, using this feature will of course cause the stream data to buffer and increase delay (and memory usage) while it's in the process of reconnecting.
198 lines
5.2 KiB
C
198 lines
5.2 KiB
C
/******************************************************************************
|
|
Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#include <inttypes.h>
|
|
#include "obs-internal.h"
|
|
|
|
static inline void push_packet(struct obs_output *output,
|
|
struct encoder_packet *packet, uint64_t t)
|
|
{
|
|
struct delay_data dd = {0};
|
|
|
|
dd.msg = DELAY_MSG_PACKET;
|
|
dd.ts = t;
|
|
obs_duplicate_encoder_packet(&dd.packet, packet);
|
|
|
|
pthread_mutex_lock(&output->delay_mutex);
|
|
circlebuf_push_back(&output->delay_data, &dd, sizeof(dd));
|
|
pthread_mutex_unlock(&output->delay_mutex);
|
|
}
|
|
|
|
static inline void process_delay_data(struct obs_output *output,
|
|
struct delay_data *dd)
|
|
{
|
|
switch (dd->msg) {
|
|
case DELAY_MSG_PACKET:
|
|
if (!output->delay_active || !output->delay_capturing)
|
|
obs_free_encoder_packet(&dd->packet);
|
|
else
|
|
output->delay_callback(output, &dd->packet);
|
|
break;
|
|
case DELAY_MSG_START:
|
|
obs_output_actual_start(output);
|
|
break;
|
|
case DELAY_MSG_STOP:
|
|
obs_output_actual_stop(output, false);
|
|
break;
|
|
}
|
|
}
|
|
|
|
void obs_output_cleanup_delay(obs_output_t *output)
|
|
{
|
|
struct delay_data dd;
|
|
|
|
while (output->delay_data.size) {
|
|
circlebuf_pop_front(&output->delay_data, &dd, sizeof(dd));
|
|
if (dd.msg == DELAY_MSG_PACKET) {
|
|
obs_free_encoder_packet(&dd.packet);
|
|
}
|
|
}
|
|
|
|
output->active_delay_ns = 0;
|
|
output->delay_restart_refs = 0;
|
|
}
|
|
|
|
static inline bool pop_packet(struct obs_output *output, uint64_t t)
|
|
{
|
|
uint64_t elapsed_time;
|
|
struct delay_data dd;
|
|
bool popped = false;
|
|
bool preserve;
|
|
|
|
/* ------------------------------------------------ */
|
|
|
|
preserve = (output->delay_cur_flags & OBS_OUTPUT_DELAY_PRESERVE) != 0;
|
|
|
|
pthread_mutex_lock(&output->delay_mutex);
|
|
|
|
if (output->delay_data.size) {
|
|
circlebuf_peek_front(&output->delay_data, &dd, sizeof(dd));
|
|
elapsed_time = (t - dd.ts);
|
|
|
|
if (preserve && output->reconnecting) {
|
|
output->active_delay_ns = elapsed_time;
|
|
|
|
} else if (elapsed_time > output->active_delay_ns) {
|
|
circlebuf_pop_front(&output->delay_data, NULL,
|
|
sizeof(dd));
|
|
popped = true;
|
|
}
|
|
}
|
|
|
|
pthread_mutex_unlock(&output->delay_mutex);
|
|
|
|
/* ------------------------------------------------ */
|
|
|
|
if (popped)
|
|
process_delay_data(output, &dd);
|
|
|
|
return popped;
|
|
}
|
|
|
|
void process_delay(void *data, struct encoder_packet *packet)
|
|
{
|
|
struct obs_output *output = data;
|
|
uint64_t t = os_gettime_ns();
|
|
push_packet(output, packet, t);
|
|
while (pop_packet(output, t));
|
|
}
|
|
|
|
void obs_output_signal_delay(obs_output_t *output, const char *signal)
|
|
{
|
|
struct calldata params = {0};
|
|
calldata_set_ptr(¶ms, "output", output);
|
|
calldata_set_int(¶ms, "sec", output->active_delay_ns / 1000000000);
|
|
signal_handler_signal(output->context.signals, signal, ¶ms);
|
|
calldata_free(¶ms);
|
|
}
|
|
|
|
bool obs_output_delay_start(obs_output_t *output)
|
|
{
|
|
struct delay_data dd = {
|
|
.msg = DELAY_MSG_START,
|
|
.ts = os_gettime_ns(),
|
|
};
|
|
|
|
if (!output->delay_active) {
|
|
bool can_begin = obs_output_can_begin_data_capture(output, 0);
|
|
if (!can_begin)
|
|
return false;
|
|
if (!obs_output_initialize_encoders(output, 0))
|
|
return false;
|
|
}
|
|
|
|
pthread_mutex_lock(&output->delay_mutex);
|
|
circlebuf_push_back(&output->delay_data, &dd, sizeof(dd));
|
|
pthread_mutex_unlock(&output->delay_mutex);
|
|
|
|
if (output->delay_active) {
|
|
os_atomic_inc_long(&output->delay_restart_refs);
|
|
do_output_signal(output, "starting");
|
|
return true;
|
|
}
|
|
|
|
if (!obs_output_begin_data_capture(output, 0)) {
|
|
obs_output_cleanup_delay(output);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void obs_output_delay_stop(obs_output_t *output)
|
|
{
|
|
struct delay_data dd = {
|
|
.msg = DELAY_MSG_STOP,
|
|
.ts = os_gettime_ns(),
|
|
};
|
|
|
|
pthread_mutex_lock(&output->delay_mutex);
|
|
circlebuf_push_back(&output->delay_data, &dd, sizeof(dd));
|
|
pthread_mutex_unlock(&output->delay_mutex);
|
|
|
|
do_output_signal(output, "stopping");
|
|
}
|
|
|
|
void obs_output_set_delay(obs_output_t *output, uint32_t delay_sec,
|
|
uint32_t flags)
|
|
{
|
|
if (!obs_output_valid(output, "obs_output_set_delay"))
|
|
return;
|
|
|
|
if ((output->info.flags & OBS_OUTPUT_ENCODED) == 0) {
|
|
blog(LOG_WARNING, "Output '%s': Tried to set a delay "
|
|
"value on a non-encoded output",
|
|
output->context.name);
|
|
return;
|
|
}
|
|
|
|
output->delay_sec = delay_sec;
|
|
output->delay_flags = flags;
|
|
}
|
|
|
|
uint32_t obs_output_get_delay(const obs_output_t *output)
|
|
{
|
|
return obs_output_valid(output, "obs_output_set_delay") ?
|
|
output->delay_sec : 0;
|
|
}
|
|
|
|
uint32_t obs_output_get_active_delay(const obs_output_t *output)
|
|
{
|
|
return obs_output_valid(output, "obs_output_set_delay") ?
|
|
(uint32_t)(output->active_delay_ns / 1000000000ULL) : 0;
|
|
}
|