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

obs-ffmpeg: Allow specifying mux settings directly

Browse Source 
(Jim) Allows the ability to specify mux settings directly on the
output's structure itself rather than just via settings. This is useful
for network-based muxer outputs (such as HLS).
This commit is contained in:
Maya Venkatraman 2020-10-13 13:20:30 -07:00 committed by jp9000
parent 966b48a0f7
commit d7e673d23d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/obs-ffmpeg/obs-ffmpeg-mux.c
View File

@ -71,6 +71,7 @@ static void ffmpeg_mux_destroy(void *data)
os_process_pipe_destroy(stream->pipe);
dstr_free(&stream->path);
dstr_free(&stream->printable_path);
dstr_free(&stream->muxer_settings);
bfree(stream);
}
@ -201,15 +202,20 @@ static void log_muxer_params(struct ffmpeg_muxer *stream, const char *settings)
static void add_muxer_params(struct dstr *cmd, struct ffmpeg_muxer *stream)
{
obs_data_t *settings = obs_output_get_settings(stream->output);
struct dstr mux = {0};
dstr_copy(&mux, obs_data_get_string(settings, "muxer_settings"));
if (dstr_is_empty(&stream->muxer_settings)) {
obs_data_t *settings = obs_output_get_settings(stream->output);
dstr_copy(&mux,
obs_data_get_string(settings, "muxer_settings"));
obs_data_release(settings);
} else {
dstr_copy(&mux, stream->muxer_settings.array);
}
log_muxer_params(stream, mux.array);
dstr_replace(&mux, "\"", "\\\"");
obs_data_release(settings);
dstr_catf(cmd, "\"%s\" ", mux.array ? mux.array : "");

1
plugins/obs-ffmpeg/obs-ffmpeg-mux.h
View File

@ -21,6 +21,7 @@ struct ffmpeg_muxer {
volatile bool stopping;
struct dstr path;
struct dstr printable_path;
struct dstr muxer_settings;
/* replay buffer */
int64_t cur_size;