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

rtmp-services: Add Mixer FTL service 

Adds "Mixer FTL" service and renames the original service with RTMP
servers to "Mixer RTMP".

Closes jp9000/obs-studio#980
master
Quinn Damerell 2017-07-31 16:16:21 -07:00 committed by jp9000
parent 6f8e38e0a0
commit 535f4a7fcf
4 changed files with 100 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/rtmp-services/data/locale/en-US.ini
View File

@ -2,6 +2,7 @@ StreamingServices="Streaming Services"
CustomStreamingServer="Custom Streaming Server"
Service="Service"
Server="Server"
Server.Auto="Auto (Recommended)"
StreamKey="Stream key"
UseAuth="Use authentication"
Username="Username"

4
plugins/rtmp-services/data/package.json
View File

@ -1,10 +1,10 @@
{
"url": "https://obsproject.com/obs2_update/rtmp-services",
"version": 66,
"version": 67,
"files": [
{
"name": "services.json",
"version": 66
"version": 67
}
]
}

94
plugins/rtmp-services/data/services.json
View File

@ -281,7 +281,97 @@
}
},
{
"name": "Mixer.com",
"name": "Mixer.com - FTL",
"common": true,
"servers": [
{
"name": "US: Dallas, TX",
"url": "ingest-dal.mixer.com"
},
{
"name": "US: San Jose, CA",
"url": "ingest-sjc.mixer.com"
},
{
"name": "US: Seattle, WA",
"url": "ingest-sea.mixer.com"
},
{
"name": "US: Washington DC",
"url": "ingest-wdc.mixer.com"
},
{
"name": "Canada: Toronto",
"url": "ingest-tor.mixer.com"
},
{
"name": "EU: London",
"url": "ingest-lon.mixer.com"
},
{
"name": "EU: Amsterdam",
"url": "ingest-ams.mixer.com"
},
{
"name": "EU: Milan",
"url": "ingest-mil.mixer.com"
},
{
"name": "EU: Paris",
"url": "ingest-par.mixer.com"
},
{
"name": "EU: Frankfurt",
"url": "ingest-fra.mixer.com"
},
{
"name": "EU: Oslo",
"url": "ingest-osl.mixer.com"
},
{
"name": "Brazil: Sao Paulo",
"url": "ingest-sao.mixer.com"
},
{
"name": "Australia: Melbourne",
"url": "ingest-mel.mixer.com"
},
{
"name": "Australia: Sydney",
"url": "ingest-syd.mixer.com"
},
{
"name": "Mexico: Mexico City",
"url": "ingest-mex.mixer.com"
},
{
"name": "Asia: Hong Kong",
"url": "ingest-hkg.mixer.com"
},
{
"name": "Asia: Tokyo",
"url": "ingest-tok.mixer.com"
},
{
"name": "South Korea: Seoul",
"url": "ingest-seo.mixer.com"
},
{
"name": "India: Chennai",
"url": "ingest-che.mixer.com"
}
],
"recommended": {
"keyint": 3,
"output": "ftl_output",
"max audio bitrate": 160,
"max video bitrate": 10000,
"profile": "main",
"bframes": 0
}
},
{
"name": "Mixer.com - RTMP",
"common": true,
"servers": [
{
@ -362,7 +452,7 @@
}
],
"recommended": {
"keyint": 1,
"keyint": 3,
"max audio bitrate": 160,
"max video bitrate": 10000,
"profile": "main"

5
plugins/rtmp-services/rtmp-common.c
View File

@ -259,6 +259,11 @@ static void fill_servers(obs_property_t *servers_prop, json_t *service,
return;
}
if (strcmp(name, "Mixer.com - FTL") == 0) {
obs_property_list_add_string(servers_prop,
obs_module_text("Server.Auto"), "auto");
}
json_array_foreach (servers, index, server) {
const char *server_name = get_string_val(server, "name");
const char *url = get_string_val(server, "url");