lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.8+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-05-27 22:57:19 +02:00
parent 8b2e5f2130
commit 8e020cdacb
115 changed files with 1767 additions and 10949 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/rtmp-services/CMakeLists.txt
View file

@ -13,6 +13,13 @@ set(rtmp-services_SOURCES
rtmp-custom.c
rtmp-services-main.c)
if(WIN32)
set(MODULE_DESCRIPTION "OBS RTMP Services")
configure_file(${CMAKE_SOURCE_DIR}/cmake/winrc/obs-module.rc.in rtmp-services.rc)
list(APPEND rtmp-services_SOURCES
rtmp-services.rc)
endif()
set(rtmp-services_HEADERS
twitch.h
younow.h

4
plugins/rtmp-services/data/package.json Executable file → Normal file
View file

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

175
plugins/rtmp-services/data/services.json Executable file → Normal file
View file

@ -893,57 +893,61 @@
"name": "Castr.io",
"servers": [
{
"name": "Chicago US",
"name": "US-East (Chicago, IL)",
"url": "rtmp://cg.castr.io/static"
},
{
"name": "Los Angeles US",
"url": "rtmp://la.castr.io/static"
},
{
"name": "New York US",
"name": "US-East (New York, NY)",
"url": "rtmp://ny.castr.io/static"
},
{
"name": "Miami US",
"name": "US-East (Miami, FL)",
"url": "rtmp://mi.castr.io/static"
},
{
"name": "Montreal CA",
"name": "US-West (Seattle, WA)",
"url": "rtmp://se.castr.io/static"
},
{
"name": "US-West (Los Angeles, CA)",
"url": "rtmp://la.castr.io/static"
},
{
"name": "US-Central (Dallas, TX)",
"url": "rtmp://da.castr.io/static"
},
{
"name": "NA-East (Toronto, CA)",
"url": "rtmp://qc.castr.io/static"
},
{
"name": "London UK",
"url": "rtmp://uk.castr.io/static"
},
{
"name": "Frankfurt DE",
"url": "rtmp://de.castr.io/static"
},
{
"name": "Frankfurt DE 2",
"url": "rtmp://fr.castr.io/static"
},
{
"name": "Moscow RU",
"url": "rtmp://ru.castr.io/static"
},
{
"name": "Singapore",
"url": "rtmp://sg.castr.io/static"
},
{
"name": "Sydney AU",
"url": "rtmp://au.castr.io/static"
},
{
"name": "Brazil",
"name": "SA (Sao Paulo, BR)",
"url": "rtmp://br.castr.io/static"
},
{
"name": "India",
"name": "EU-West (London, UK)",
"url": "rtmp://uk.castr.io/static"
},
{
"name": "EU-Central (Frankfurt, DE)",
"url": "rtmp://fr.castr.io/static"
},
{
"name": "Russia (Moscow)",
"url": "rtmp://ru.castr.io/static"
},
{
"name": "Asia (Singapore)",
"url": "rtmp://sg.castr.io/static"
},
{
"name": "Asia (India)",
"url": "rtmp://in.castr.io/static"
},
{
"name": "Australia (Sydney)",
"url": "rtmp://au.castr.io/static"
},
{
"name": "US Central",
"url": "rtmp://us-central.castr.io/static"
@ -975,10 +979,6 @@
{
"name": "Singapore",
"url": "rtmp://sg-central.castr.io/static"
},
{
"name": "India",
"url": "rtmp://in.castr.io/static"
}
],
"recommended": {
@ -1128,7 +1128,7 @@
"servers": [
{
"name": "Auto",
"url": "rtmp://s-sd.stripcdn.com/ext"
"url": "rtmp://s-sd.stripst.com/ext"
}
],
"recommended": {
@ -1494,14 +1494,28 @@
"name": "Bongacams",
"servers": [
{
"name": "Default",
"url": "rtmp://origin.bcrncdn.com:1934/live"
"name": "Automatic / Default",
"url": "rtmp://auto.origin.gnsbc.com:1934/live"
},
{
"name": "Automatic / Backup",
"url": "rtmp://origin.bcvidorigin.com:1934/live"
},
{
"name": "Europe",
"url": "rtmp://z-eu.origin.gnsbc.com:1934/live"
},
{
"name": "North America",
"url": "rtmp://z-us.origin.gnsbc.com:1934/live"
}
],
"recommend": {
"keyint": 2,
"max video bitrate": 6000,
"max audio bitrate": 192
"max audio bitrate": 192,
"bframes": 0,
"x264opts": "tune=zerolatency"
}
},
{
@ -1518,16 +1532,20 @@
}
},
{
"name": "ChathostessModels",
"name": "Chathostess",
"servers": [
{
"name": "ChathostessModels - Default",
"name": "Chathostess - Default",
"url": "rtmp://wowza01.foobarweb.com/cmschatsys_video"
},
{
"name": "Chathostess - Backup",
"url": "rtmp://wowza05.foobarweb.com/cmschatsys_video"
}
],
"recommended": {
"keyint": 2,
"max video bitrate": 3000,
"max video bitrate": 3600,
"max audio bitrate": 128
}
},
@ -1733,6 +1751,73 @@
"recommended": {
"keyint": 2
}
},
{
"name": "niconico, premium member (ニコニコ生放送 プレミアム会員)",
"servers": [
{
"name": "Default",
"url": "rtmp://aliveorigin.dmc.nico/named_input"
}
],
"recommended": {
"keyint": 2,
"profile": "high",
"max audio bitrate": 192,
"max video bitrate": 5808,
"x264opts": "tune=zerolatency"
}
},
{
"name": "niconico, free member (ニコニコ生放送 一般会員)",
"servers": [
{
"name": "Default",
"url": "rtmp://aliveorigin.dmc.nico/named_input"
}
],
"recommended": {
"keyint": 2,
"profile": "high",
"max audio bitrate": 96,
"max video bitrate": 904,
"x264opts": "tune=zerolatency"
}
},
{
"name": "WASD.TV",
"servers": [
{
"name": "Automatic",
"url": "rtmp://push.rtmp.wasd.tv/live"
},
{
"name": "Russia, Moscow",
"url": "rtmp://ru-moscow.rtmp.wasd.tv/live"
},
{
"name": "Germany, Frankfurt",
"url": "rtmp://de-frankfurt.rtmp.wasd.tv/live"
},
{
"name": "Finland, Helsinki",
"url": "rtmp://fi-helsinki.rtmp.wasd.tv/live"
}
],
"recommended": {
"keyint": 2,
"max video bitrate": 10000,
"max audio bitrate": 192
}
},
{
"name": "VirtWish",
"servers": [
{
"name": "Default",
"url": "rtmp://rtmp.virtwish.com/live"
}
]
}
]
}

2
plugins/rtmp-services/rtmp-custom.c
View file

@ -18,6 +18,8 @@ static void rtmp_custom_update(void *data, obs_data_t *settings)
bfree(service->server);
bfree(service->key);
bfree(service->username);
bfree(service->password);
service->server = bstrdup(obs_data_get_string(settings, "server"));
service->key = bstrdup(obs_data_get_string(settings, "key"));