From 92d1ca41cc2ec5046fe57516dbf3213399ad7fc5 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Sun, 26 Jun 2022 00:28:00 -0700 Subject: [PATCH] libobs: Fix warnings about type usage --- libobs/obs-internal.h | 2 +- libobs/obs-output.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libobs/obs-internal.h b/libobs/obs-internal.h index 7f27fd311..86c4627fa 100644 --- a/libobs/obs-internal.h +++ b/libobs/obs-internal.h @@ -1027,7 +1027,7 @@ struct obs_output { int reconnect_retry_sec; int reconnect_retry_max; int reconnect_retries; - uint64_t reconnect_retry_cur_msec; + uint32_t reconnect_retry_cur_msec; float reconnect_retry_exp; pthread_t reconnect_thread; os_event_t *reconnect_stop_event; diff --git a/libobs/obs-output.c b/libobs/obs-output.c index 57c2933b4..3253a3b25 100644 --- a/libobs/obs-output.c +++ b/libobs/obs-output.c @@ -28,7 +28,7 @@ #define get_weak(output) ((obs_weak_output_t *)output->context.control) #define RECONNECT_RETRY_MAX_MSEC (15 * 60 * 1000) -#define RECONNECT_RETRY_BASE_EXP 1.5 +#define RECONNECT_RETRY_BASE_EXP 1.5f static inline bool active(const struct obs_output *output) { @@ -150,7 +150,7 @@ obs_output_t *obs_output_create(const char *id, const char *name, output->reconnect_retry_sec = 2; output->reconnect_retry_max = 20; output->reconnect_retry_exp = - RECONNECT_RETRY_BASE_EXP + (rand_float(0) * 0.05); + RECONNECT_RETRY_BASE_EXP + (rand_float(0) * 0.05f); output->valid = true; obs_context_init_control(&output->context, output, @@ -2398,10 +2398,14 @@ static void output_reconnect(struct obs_output *output) } if (output->reconnect_retries) { - output->reconnect_retry_cur_msec *= output->reconnect_retry_exp; - if (output->reconnect_retry_cur_msec > RECONNECT_RETRY_MAX_MSEC) + output->reconnect_retry_cur_msec = + (uint32_t)(output->reconnect_retry_cur_msec * + output->reconnect_retry_exp); + if (output->reconnect_retry_cur_msec > + RECONNECT_RETRY_MAX_MSEC) { output->reconnect_retry_cur_msec = RECONNECT_RETRY_MAX_MSEC; + } } output->reconnect_retries++;