lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 26.0.0+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions
Download patch file Download diff file Expand all files Collapse all files

142
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View file

@ -58,6 +58,12 @@ struct ffmpeg_source {
bool close_when_inactive;
bool seekable;
pthread_t reconnect_thread;
bool stop_reconnect;
bool reconnect_thread_valid;
volatile bool reconnecting;
int reconnect_delay_sec;
enum obs_media_state state;
obs_hotkey_pair_id play_pause_hotkey;
obs_hotkey_id stop_hotkey;
@ -81,18 +87,18 @@ static bool is_local_file_modified(obs_properties_t *props,
obs_property_t *local_file = obs_properties_get(props, "local_file");
obs_property_t *looping = obs_properties_get(props, "looping");
obs_property_t *buffering = obs_properties_get(props, "buffering_mb");
obs_property_t *close =
obs_properties_get(props, "close_when_inactive");
obs_property_t *seekable = obs_properties_get(props, "seekable");
obs_property_t *speed = obs_properties_get(props, "speed_percent");
obs_property_t *reconnect_delay_sec =
obs_properties_get(props, "reconnect_delay_sec");
obs_property_set_visible(input, !enabled);
obs_property_set_visible(input_format, !enabled);
obs_property_set_visible(buffering, !enabled);
obs_property_set_visible(close, enabled);
obs_property_set_visible(local_file, enabled);
obs_property_set_visible(looping, enabled);
obs_property_set_visible(speed, enabled);
obs_property_set_visible(seekable, !enabled);
obs_property_set_visible(reconnect_delay_sec, !enabled);
return true;
}
@ -103,6 +109,7 @@ static void ffmpeg_source_defaults(obs_data_t *settings)
obs_data_set_default_bool(settings, "looping", false);
obs_data_set_default_bool(settings, "clear_on_media_end", true);
obs_data_set_default_bool(settings, "restart_on_activate", true);
obs_data_set_default_int(settings, "reconnect_delay_sec", 10);
obs_data_set_default_int(settings, "buffering_mb", 2);
obs_data_set_default_int(settings, "speed_percent", 100);
}
@ -163,7 +170,7 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data)
obs_module_text("RestartWhenActivated"));
prop = obs_properties_add_int_slider(props, "buffering_mb",
obs_module_text("BufferingMB"), 1,
obs_module_text("BufferingMB"), 0,
16, 1);
obs_property_int_set_suffix(prop, " MB");
@ -174,6 +181,11 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data)
obs_module_text("InputFormat"),
OBS_TEXT_DEFAULT);
prop = obs_properties_add_int_slider(
props, "reconnect_delay_sec",
obs_module_text("ReconnectDelayTime"), 1, 60, 1);
obs_property_int_set_suffix(prop, " S");
#ifndef __APPLE__
obs_properties_add_bool(props, "hw_decode",
obs_module_text("HardwareDecode"));
@ -245,12 +257,24 @@ static void preload_frame(void *opaque, struct obs_source_frame *f)
if (s->is_clear_on_media_end || s->is_looping)
obs_source_preload_video(s->source, f);
if (!s->is_local_file && os_atomic_set_bool(&s->reconnecting, false))
FF_BLOG(LOG_INFO, "Reconnected.");
}
static void seek_frame(void *opaque, struct obs_source_frame *f)
{
struct ffmpeg_source *s = opaque;
obs_source_set_video_frame(s->source, f);
}
static void get_audio(void *opaque, struct obs_source_audio *a)
{
struct ffmpeg_source *s = opaque;
obs_source_output_audio(s->source, a);
if (!s->is_local_file && os_atomic_set_bool(&s->reconnecting, false))
FF_BLOG(LOG_INFO, "Reconnected.");
}
static void media_stopped(void *opaque)
@ -274,6 +298,7 @@ static void ffmpeg_source_open(struct ffmpeg_source *s)
.opaque = s,
.v_cb = get_frame,
.v_preload_cb = preload_frame,
.v_seek_cb = seek_frame,
.a_cb = get_audio,
.stop_cb = media_stopped,
.path = s->input,
@ -282,12 +307,51 @@ static void ffmpeg_source_open(struct ffmpeg_source *s)
.speed = s->speed_percent,
.force_range = s->range,
.hardware_decoding = s->is_hw_decoding,
.is_local_file = s->is_local_file || s->seekable};
.is_local_file = s->is_local_file || s->seekable,
.reconnecting = s->reconnecting,
};
s->media_valid = mp_media_init(&s->media, &info);
}
}
static void ffmpeg_source_start(struct ffmpeg_source *s)
{
if (!s->media_valid)
ffmpeg_source_open(s);
if (!s->media_valid)
return;
mp_media_play(&s->media, s->is_looping, s->reconnecting);
if (s->is_local_file && (s->is_clear_on_media_end || s->is_looping))
obs_source_show_preloaded_video(s->source);
else
obs_source_output_video(s->source, NULL);
set_media_state(s, OBS_MEDIA_STATE_PLAYING);
obs_source_media_started(s->source);
}
static void *ffmpeg_source_reconnect(void *data)
{
struct ffmpeg_source *s = data;
os_sleep_ms(s->reconnect_delay_sec * 1000);
if (s->stop_reconnect || s->media_valid)
goto finish;
bool active = obs_source_active(s->source);
if (!s->close_when_inactive || active)
ffmpeg_source_open(s);
if (!s->restart_on_activate || active)
ffmpeg_source_start(s);
finish:
s->reconnect_thread_valid = false;
return NULL;
}
static void ffmpeg_source_tick(void *data, float seconds)
{
UNUSED_PARAMETER(seconds);
@ -298,21 +362,22 @@ static void ffmpeg_source_tick(void *data, float seconds)
mp_media_free(&s->media);
s->media_valid = false;
}
s->destroy_media = false;
}
}
static void ffmpeg_source_start(struct ffmpeg_source *s)
{
if (!s->media_valid)
ffmpeg_source_open(s);
if (s->media_valid) {
mp_media_play(&s->media, s->is_looping);
if (s->is_local_file)
obs_source_show_preloaded_video(s->source);
set_media_state(s, OBS_MEDIA_STATE_PLAYING);
obs_source_media_started(s->source);
if (!s->is_local_file) {
if (!os_atomic_set_bool(&s->reconnecting, true)) {
FF_BLOG(LOG_WARNING, "Disconnected. "
"Reconnecting...");
}
if (pthread_create(&s->reconnect_thread, NULL,
ffmpeg_source_reconnect, s) != 0) {
FF_BLOG(LOG_WARNING, "Could not create "
"reconnect thread");
return;
}
s->reconnect_thread_valid = true;
}
}
}
@ -332,16 +397,27 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
input = (char *)obs_data_get_string(settings, "local_file");
input_format = NULL;
s->is_looping = obs_data_get_bool(settings, "looping");
s->close_when_inactive =
obs_data_get_bool(settings, "close_when_inactive");
} else {
input = (char *)obs_data_get_string(settings, "input");
input_format =
(char *)obs_data_get_string(settings, "input_format");
s->reconnect_delay_sec =
(int)obs_data_get_int(settings, "reconnect_delay_sec");
s->reconnect_delay_sec = s->reconnect_delay_sec == 0
? 10
: s->reconnect_delay_sec;
s->is_looping = false;
s->close_when_inactive = true;
if (s->reconnect_thread_valid) {
s->stop_reconnect = true;
pthread_join(s->reconnect_thread, NULL);
s->stop_reconnect = false;
}
}
s->close_when_inactive =
obs_data_get_bool(settings, "close_when_inactive");
s->input = input ? bstrdup(input) : NULL;
s->input_format = input_format ? bstrdup(input_format) : NULL;
#ifndef __APPLE__
@ -391,7 +467,7 @@ static void restart_hotkey(void *data, obs_hotkey_id id, obs_hotkey_t *hotkey,
return;
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
obs_source_media_restart(s->source);
}
@ -460,7 +536,7 @@ static bool ffmpeg_source_play_hotkey(void *data, obs_hotkey_pair_id id,
struct ffmpeg_source *s = data;
if (s->state == OBS_MEDIA_STATE_PLAYING ||
!obs_source_active(s->source))
!obs_source_showing(s->source))
return false;
obs_source_media_play_pause(s->source, false);
@ -479,7 +555,7 @@ static bool ffmpeg_source_pause_hotkey(void *data, obs_hotkey_pair_id id,
struct ffmpeg_source *s = data;
if (s->state != OBS_MEDIA_STATE_PLAYING ||
!obs_source_active(s->source))
!obs_source_showing(s->source))
return false;
obs_source_media_play_pause(s->source, true);
@ -497,7 +573,7 @@ static void ffmpeg_source_stop_hotkey(void *data, obs_hotkey_id id,
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
obs_source_media_stop(s->source);
}
@ -539,6 +615,11 @@ static void ffmpeg_source_destroy(void *data)
if (s->hotkey)
obs_hotkey_unregister(s->hotkey);
if (!s->is_local_file) {
s->stop_reconnect = true;
if (s->reconnect_thread_valid)
pthread_join(s->reconnect_thread, NULL);
}
if (s->media_valid)
mp_media_free(&s->media);
@ -576,6 +657,12 @@ static void ffmpeg_source_play_pause(void *data, bool pause)
{
struct ffmpeg_source *s = data;
if (!s->media_valid)
ffmpeg_source_open(s);
if (!s->media_valid)
return;
mp_media_play_pause(&s->media, pause);
if (pause)
@ -599,7 +686,7 @@ static void ffmpeg_source_restart(void *data)
{
struct ffmpeg_source *s = data;
if (obs_source_active(s->source))
if (obs_source_showing(s->source))
ffmpeg_source_start(s);
set_media_state(s, OBS_MEDIA_STATE_PLAYING);
@ -627,6 +714,9 @@ static void ffmpeg_source_set_time(void *data, int64_t ms)
{
struct ffmpeg_source *s = data;
if (!s->media_valid)
return;
mp_media_seek_to(&s->media, ms);
}