hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed protocol display for websocket-based outputs in JSON streaminfo

Browse source
This commit is contained in:
Thulinma 2020-10-13 23:26:31 +02:00
parent 3f6e1c8768
commit e7d802836a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_http_internal.cpp
View file

@ -320,8 +320,10 @@ namespace Mist{
}
}
if (!strmMeta.isMember("live") || !it->isMember("nolive")){
if (!url.protocol.size() && it->isMember("handler")){
url.protocol = (*it)["handler"].asStringRef();
bool isSSL = false;
if (url.protocol == "https" || url.protocol == "wss"){isSSL = true;}
if (it->isMember("handler")){
url.protocol = (*it)["handler"].asStringRef() + (isSSL?"s":"");
}
addSource(relurl, sources, url, *it, most_simul, total_matches);
}

2
src/output/output_webrtc.cpp
View file

@ -167,7 +167,7 @@ namespace Mist{
capa["codecs"][0u][1u].append("opus");
capa["codecs"][0u][1u].append("ALAW");
capa["codecs"][0u][1u].append("ULAW");
capa["methods"][0u]["handler"] = "webrtc";
capa["methods"][0u]["handler"] = "ws";
capa["methods"][0u]["type"] = "webrtc";
capa["methods"][0u]["priority"] = 2;
capa["methods"][0u]["nobframes"] = 1;