starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:40:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

rtmp-services: Set protocol in rtmp_common if none set

Browse Source
This commit is contained in:
tytan652
2023-03-24 16:07:40 -04:00
committed by Ryan Foster
parent 21289b2777
commit 6f755451d9
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/rtmp-services/rtmp-common.c
+32 -3
View File
@@ -108,6 +108,31 @@ static void update_recommendations(struct rtmp_common *service, json_t *rec)
service->max_fps = get_int_val(rec, "max fps");
}
#define RTMP_PREFIX "rtmp://"
#define RTMPS_PREFIX "rtmps://"
static const char *get_protocol(json_t *service, obs_data_t *settings)
{
const char *protocol = get_string_val(service, "protocol");
if (protocol) {
return protocol;
}
json_t *servers = json_object_get(service, "servers");
if (!json_is_array(servers))
return "RTMP";
json_t *server = json_array_get(servers, 0);
const char *url = get_string_val(server, "url");
if (strncmp(url, RTMPS_PREFIX, strlen(RTMPS_PREFIX)) == 0) {
obs_data_set_string(settings, "protocol", "RTMPS");
return "RTMPS";
}
return "RTMP";
}
static void rtmp_common_update(void *data, obs_data_t *settings)
{
struct rtmp_common *service = data;
@@ -143,6 +168,13 @@ static void rtmp_common_update(void *data, obs_data_t *settings)
service->service = bstrdup(new_name);
}
if ((service->protocol == NULL ||
service->protocol[0] == '\0')) {
bfree(service->protocol);
service->protocol =
bstrdup(get_protocol(serv, settings));
}
if (serv) {
json_t *rec = json_object_get(serv, "recommended");
if (json_is_object(rec)) {
@@ -209,9 +241,6 @@ static inline bool get_bool_val(json_t *service, const char *key)
return json_is_true(bool_val);
}
#define RTMP_PREFIX "rtmp://"
#define RTMPS_PREFIX "rtmps://"
static bool is_protocol_available(json_t *service)
{
const char *protocol = get_string_val(service, "protocol");