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

obs-x264: Do not show reconfigure details in log

Browse Source 
Prevents the x264 plugin from spamming the log when dynamic bitrate is
active.
This commit is contained in:
jp9000 2019-08-15 08:37:42 -07:00
parent ed43de5c75
commit 15ade1e2c4
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/obs-x264/obs-x264.c
View File

@ -397,7 +397,7 @@ enum rate_control {
};
static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
char **params)
char **params, bool update)
{
video_t *video = obs_encoder_video(obsx264->encoder);
const struct video_output_info *voi = video_output_get_info(video);
@ -518,23 +518,26 @@ static void update_params(struct obs_x264 *obsx264, obs_data_t *settings,
while (*params)
set_param(obsx264, *(params++));
info("settings:\n"
"\trate_control: %s\n"
"\tbitrate: %d\n"
"\tbuffer size: %d\n"
"\tcrf: %d\n"
"\tfps_num: %d\n"
"\tfps_den: %d\n"
"\twidth: %d\n"
"\theight: %d\n"
"\tkeyint: %d\n",
rate_control, obsx264->params.rc.i_vbv_max_bitrate,
obsx264->params.rc.i_vbv_buffer_size,
(int)obsx264->params.rc.f_rf_constant, voi->fps_num, voi->fps_den,
width, height, obsx264->params.i_keyint_max);
if (!update) {
info("settings:\n"
"\trate_control: %s\n"
"\tbitrate: %d\n"
"\tbuffer size: %d\n"
"\tcrf: %d\n"
"\tfps_num: %d\n"
"\tfps_den: %d\n"
"\twidth: %d\n"
"\theight: %d\n"
"\tkeyint: %d\n",
rate_control, obsx264->params.rc.i_vbv_max_bitrate,
obsx264->params.rc.i_vbv_buffer_size,
(int)obsx264->params.rc.f_rf_constant, voi->fps_num,
voi->fps_den, width, height, obsx264->params.i_keyint_max);
}
}
static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings)
static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings,
bool update)
{
char *preset = bstrdup(obs_data_get_string(settings, "preset"));
char *profile = bstrdup(obs_data_get_string(settings, "profile"));
@ -563,7 +566,7 @@ static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings)
}
if (success) {
update_params(obsx264, settings, paramlist);
update_params(obsx264, settings, paramlist, update);
if (opts && *opts)
info("custom settings: %s", opts);
@ -584,7 +587,7 @@ static bool update_settings(struct obs_x264 *obsx264, obs_data_t *settings)
static bool obs_x264_update(void *data, obs_data_t *settings)
{
struct obs_x264 *obsx264 = data;
bool success = update_settings(obsx264, settings);
bool success = update_settings(obsx264, settings, true);
int ret;
if (success) {
@ -630,7 +633,7 @@ static void *obs_x264_create(obs_data_t *settings, obs_encoder_t *encoder)
struct obs_x264 *obsx264 = bzalloc(sizeof(struct obs_x264));
obsx264->encoder = encoder;
if (update_settings(obsx264, settings)) {
if (update_settings(obsx264, settings, false)) {
obsx264->context = x264_encoder_open(&obsx264->params);
if (obsx264->context == NULL)