mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[record] refinements

Browse Source
This commit is contained in:
radius 2018-09-26 18:46:00 -05:00
parent ef3677633c
commit 2c59716e77
2 changed files with 2930 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
record/drivers/record_ffmpeg.c
View File

@ -640,7 +640,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p
{ {
if (!settings->bools.video_gpu_record) if (!settings->bools.video_gpu_record)
params->scale_factor = settings->uints.video_record_scale_factor > 0 ? params->scale_factor = settings->uints.video_record_scale_factor > 0 ?
settings->uints.video_record_scale_factor : 1; settings->uints.video_record_scale_factor : 2;
else else
params->scale_factor = 1; params->scale_factor = 1;
strlcpy(params->format, "matroska", sizeof(params->format)); strlcpy(params->format, "matroska", sizeof(params->format));
@ -649,17 +649,16 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p
{ {
if (!settings->bools.video_gpu_record) if (!settings->bools.video_gpu_record)
params->scale_factor = settings->uints.video_stream_scale_factor > 0 ? params->scale_factor = settings->uints.video_stream_scale_factor > 0 ?
settings->uints.video_stream_scale_factor : 1; settings->uints.video_stream_scale_factor : 2;
else else
params->scale_factor = 1; params->scale_factor = 2;
strlcpy(params->format, "flv", sizeof(params->format)); strlcpy(params->format, "flv", sizeof(params->format));
} }
else else if (preset == RECORD_CONFIG_TYPE_STREAMING_NETPLAY)
{ {
params->scale_factor = 1; params->scale_factor = 1;
strlcpy(params->format, "flv", sizeof(params->format)); strlcpy(params->format, "m2ts", sizeof(params->format));
} }
return true; return true;
} }
@ -698,6 +697,7 @@ static bool ffmpeg_init_config(struct ff_config_param *params,
return true; return true;
params->conf = config_file_new(config); params->conf = config_file_new(config);
RARCH_LOG("[FFmpeg] Loading FFmpeg config \"%s\".\n", config);
if (!params->conf) if (!params->conf)
{ {
RARCH_ERR("[FFmpeg] Failed to load FFmpeg config \"%s\".\n", config); RARCH_ERR("[FFmpeg] Failed to load FFmpeg config \"%s\".\n", config);
@ -938,7 +938,7 @@ static void *ffmpeg_new(const struct record_params *params)
handle->params = *params; handle->params = *params;
if (params->preset == RECORD_CONFIG_TYPE_RECORDING_CUSTOM) if (params->preset == RECORD_CONFIG_TYPE_RECORDING_CUSTOM || params->preset == RECORD_CONFIG_TYPE_STREAMING_CUSTOM)
{ {
if (!ffmpeg_init_config(&handle->config, params->config)) if (!ffmpeg_init_config(&handle->config, params->config))
goto error; goto error;

3810
retroarch.cfg
View File

File diff suppressed because it is too large Load Diff