Skip to content

Add pause-resume feature to ffmpeg plugin to auto pause when switching away #7541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dcmouser wants to merge 1 commit into from
Closed

Add pause-resume feature to ffmpeg plugin to auto pause when switching away #7541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions plugins/obs-ffmpeg/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,5 @@ NVENC.CheckDrivers="Please check your video drivers are up to date."
AV1.8bitUnsupportedHdr="OBS does not support 8-bit output of Rec. 2100."

ReconnectDelayTime="Reconnect Delay"

MediaSource.FFmpeg.PauseResume="Pause on deactivate, resume on activate"
17 changes: 17 additions & 0 deletions plugins/obs-ffmpeg/obs-ffmpeg-source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ struct ffmpeg_source {
bool is_clear_on_media_end;
bool restart_on_activate;
bool close_when_inactive;
bool pause_and_resume;
bool seekable;

pthread_t reconnect_thread;
Expand Down Expand Up @@ -115,6 +116,7 @@ static void ffmpeg_source_defaults(obs_data_t *settings)
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);
obs_data_set_default_bool(settings, "pause_and_resume", false);
}

static const char *media_filter =
Expand Down Expand Up @@ -200,6 +202,9 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data)
obs_property_set_long_description(
prop, obs_module_text("CloseFileWhenInactive.ToolTip"));

prop = obs_properties_add_bool(props, "pause_and_resume",
obs_module_text("MediaSource.FFmpeg.PauseResume"));

prop = obs_properties_add_int_slider(props, "speed_percent",
obs_module_text("SpeedPercentage"),
1, 200, 1);
Expand Down Expand Up @@ -465,6 +470,7 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
s->is_local_file = is_local_file;
s->seekable = obs_data_get_bool(settings, "seekable");
s->ffmpeg_options = ffmpeg_options ? bstrdup(ffmpeg_options) : NULL;
s->pause_and_resume = obs_data_get_bool(settings, "pause_and_resume");

if (s->speed_percent < 1 || s->speed_percent > 200)
s->speed_percent = 100;
Expand Down Expand Up @@ -666,6 +672,11 @@ static void ffmpeg_source_activate(void *data)
{
struct ffmpeg_source *s = data;

if (s->pause_and_resume && s->state == OBS_MEDIA_STATE_PAUSED) {
// resume on re-activate
obs_source_media_play_pause(s->source, false);
return;
}
if (s->restart_on_activate)
obs_source_media_restart(s->source);
}
Expand All @@ -674,6 +685,12 @@ static void ffmpeg_source_deactivate(void *data)
{
struct ffmpeg_source *s = data;

if (s->pause_and_resume && s->state == OBS_MEDIA_STATE_PLAYING) {
// pause on deactivate, leave it loaded
obs_source_media_play_pause(s->source, true);
return;
}

if (s->restart_on_activate) {
if (s->media_valid) {
mp_media_stop(&s->media);
Expand Down