From 554ad5a4940d2a62ee7269df7506aed3f8737491 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 23 Sep 2018 19:29:19 -0500 Subject: [PATCH] [record] hookup quality --- record/drivers/record_ffmpeg.c | 6 ++++-- record/record_driver.c | 6 ++++++ record/record_driver.h | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c index c20a61333d..6c4e2b40c9 100644 --- a/record/drivers/record_ffmpeg.c +++ b/record/drivers/record_ffmpeg.c @@ -651,6 +651,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p return true; } +/* static bool ffmpeg_init_config_recording(struct ff_config_param *params) { return true; @@ -667,6 +668,7 @@ static bool ffmpeg_init_config_recording(struct ff_config_param *params) return true; } +*/ static bool ffmpeg_init_config(struct ff_config_param *params, const char *config) @@ -924,13 +926,13 @@ static void *ffmpeg_new(const struct record_params *params) handle->params = *params; - if (params->config_type == RECORD_CONFIG_TYPE_RECORDING_CUSTOM) + if (params->preset == RECORD_CONFIG_TYPE_RECORDING_CUSTOM) { if (!ffmpeg_init_config(&handle->config, params->config)) goto error; } else - ffmpeg_init_config_common(&handle->config, params->config_type); + ffmpeg_init_config_common(&handle->config, params->preset); if (!ffmpeg_init_muxer_pre(handle)) goto error; diff --git a/record/record_driver.c b/record/record_driver.c index a6ef7af312..6f02833859 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -391,9 +391,15 @@ bool recording_init(void) else { if (streaming_is_enabled()) + { params.config = settings->paths.path_stream_config; + params.preset = settings->uints.video_stream_quality; + } else + { params.config = settings->paths.path_record_config; + params.preset = settings->uints.video_record_quality; + } } if (video_driver_supports_recording()) diff --git a/record/record_driver.h b/record/record_driver.h index 853ec5f338..400fcbe87f 100644 --- a/record/record_driver.h +++ b/record/record_driver.h @@ -69,7 +69,7 @@ struct record_params /* Audio channels. */ unsigned channels; - enum record_config_type config_type; + enum record_config_type preset; /* Input pixel format. */ enum ffemu_pix_format pix_fmt;