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

rtmp-services: Remove Mixer servers and checks

Browse Source
This commit is contained in:
derrod 2020-06-22 22:02:51 +02:00
parent db37cc34d5
commit b8f91cc4c3
3 changed files with 2 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -290,178 +290,6 @@
"max audio bitrate": 320
}
},
{
"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": "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": 2,
"output": "ftl_output",
"max audio bitrate": 160,
"max video bitrate": 10000,
"profile": "main",
"bframes": 0,
"x264opts": "scenecut=0"
}
},
{
"name": "Mixer.com - RTMP",
"common": true,
"servers": [
{
"name": "US: Dallas, TX",
"url": "rtmp://ingest-dal.mixer.com:1935/beam"
},
{
"name": "US: San Jose, CA",
"url": "rtmp://ingest-sjc.mixer.com:1935/beam"
},
{
"name": "US: Seattle, WA",
"url": "rtmp://ingest-sea.mixer.com:1935/beam"
},
{
"name": "US: Washington DC",
"url": "rtmp://ingest-wdc.mixer.com:1935/beam"
},
{
"name": "Canada: Toronto",
"url": "rtmp://ingest-tor.mixer.com:1935/beam"
},
{
"name": "EU: London",
"url": "rtmp://ingest-lon.mixer.com:1935/beam"
},
{
"name": "EU: Amsterdam",
"url": "rtmp://ingest-ams.mixer.com:1935/beam"
},
{
"name": "EU: Milan",
"url": "rtmp://ingest-mil.mixer.com:1935/beam"
},
{
"name": "EU: Paris",
"url": "rtmp://ingest-par.mixer.com:1935/beam"
},
{
"name": "EU: Frankfurt",
"url": "rtmp://ingest-fra.mixer.com:1935/beam"
},
{
"name": "Brazil: Sao Paulo",
"url": "rtmp://ingest-sao.mixer.com:1935/beam"
},
{
"name": "Australia: Melbourne",
"url": "rtmp://ingest-mel.mixer.com:1935/beam"
},
{
"name": "Australia: Sydney",
"url": "rtmp://ingest-syd.mixer.com:1935/beam"
},
{
"name": "Mexico: Mexico City",
"url": "rtmp://ingest-mex.mixer.com:1935/beam"
},
{
"name": "Asia: Hong Kong",
"url": "rtmp://ingest-hkg.mixer.com:1935/beam"
},
{
"name": "Asia: Tokyo",
"url": "rtmp://ingest-tok.mixer.com:1935/beam"
},
{
"name": "South Korea: Seoul",
"url": "rtmp://ingest-seo.mixer.com:1935/beam"
},
{
"name": "India: Chennai",
"url": "rtmp://ingest-che.mixer.com:1935/beam"
}
],
"recommended": {
"keyint": 2,
"max audio bitrate": 160,
"max video bitrate": 10000,
"profile": "main",
"x264opts": "scenecut=0"
}
},
{
"name": "Mobcrush",
"servers": [

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

@ -340,10 +340,6 @@ 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");
}
if (strcmp(name, "Twitch") == 0) {
if (fill_twitch_servers(servers_prop))
return;