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

Added iceservers property to WebRTC, support passing it to the player.

Browse source
This commit is contained in:
Thulinma 2021-02-24 00:53:04 +01:00
parent 119586c449
commit 73a73abbd7
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/output/output_http_internal.cpp
View file

@ -217,21 +217,6 @@ namespace Mist{
} }
}; };
void addSource(const std::string &rel, std::set<JSON::Value, sourceCompare> &sources, const HTTP::URL &url,
JSON::Value &conncapa, unsigned int most_simul, unsigned int total_matches){
JSON::Value tmp;
tmp["type"] = conncapa["type"];
tmp["relurl"] = rel;
tmp["priority"] = conncapa["priority"];
if (conncapa.isMember("player_url")){
tmp["player_url"] = conncapa["player_url"].asStringRef();
}
tmp["simul_tracks"] = most_simul;
tmp["total_matches"] = total_matches;
tmp["url"] = url.link(rel).getUrl();
sources.insert(tmp);
}
void addSources(std::string &streamname, std::set<JSON::Value, sourceCompare> &sources, HTTP::URL url, void addSources(std::string &streamname, std::set<JSON::Value, sourceCompare> &sources, HTTP::URL url,
JSON::Value &conncapa, JSON::Value &strmMeta, const std::string &useragent){ JSON::Value &conncapa, JSON::Value &strmMeta, const std::string &useragent){
url.path += "/"; url.path += "/";
@ -325,7 +310,18 @@ namespace Mist{
if (it->isMember("handler")){ if (it->isMember("handler")){
url.protocol = (*it)["handler"].asStringRef() + (isSSL?"s":""); url.protocol = (*it)["handler"].asStringRef() + (isSSL?"s":"");
} }
addSource(relurl, sources, url, *it, most_simul, total_matches); JSON::Value tmp;
tmp["type"] = (*it)["type"];
tmp["relurl"] = relurl;
tmp["priority"] = (*it)["priority"];
if ((*it).isMember("player_url")){
tmp["player_url"] = (*it)["player_url"].asStringRef();
}
if (conncapa.isMember("cnf") && conncapa["cnf"].isMember("iceservers")){tmp["RTCIceServers"] = conncapa["cnf"]["iceservers"];}
tmp["simul_tracks"] = most_simul;
tmp["total_matches"] = total_matches;
tmp["url"] = url.link(relurl).getUrl();
sources.insert(tmp);
} }
} }
} }
@ -556,6 +552,7 @@ namespace Mist{
} }
// and a URL - then list the URL // and a URL - then list the URL
JSON::Value capa_json = capa.asJSON(); JSON::Value capa_json = capa.asJSON();
capa_json["cnf"] = prots.getIndice(i).asJSON();
if (capa.getMember("url_rel") || capa.getMember("methods")){ if (capa.getMember("url_rel") || capa.getMember("methods")){
jsonForEach(pubAddrs, jit){ jsonForEach(pubAddrs, jit){
HTTP::URL altURL = outURL; HTTP::URL altURL = outURL;
@ -577,6 +574,13 @@ namespace Mist{
connectors.getIndice(j).getMember("deps").asString() == cProv && connectors.getIndice(j).getMember("deps").asString() == cProv &&
connectors.getIndice(j).getMember("methods")){ connectors.getIndice(j).getMember("methods")){
JSON::Value subcapa_json = connectors.getIndice(j).asJSON(); JSON::Value subcapa_json = connectors.getIndice(j).asJSON();
subcapa_json["cnf"] = prots.getIndice(i).asJSON();
for (unsigned int k = 0; k < prots_ctr; ++k){
if (prots.getIndice(k).getMember("connector").asString() == connectors.getIndiceName(j)){
subcapa_json["cnf"].extend(prots.getIndice(k).asJSON());
break;
}
}
jsonForEach(pubAddrs, jit){ jsonForEach(pubAddrs, jit){
HTTP::URL altURL = outURL; HTTP::URL altURL = outURL;

8
src/output/output_webrtc.cpp
View file

@ -272,6 +272,14 @@ namespace Mist{
capa["optional"]["key"]["default"] = ""; capa["optional"]["key"]["default"] = "";
capa["optional"]["key"]["type"] = "str"; capa["optional"]["key"]["type"] = "str";
capa["optional"]["iceservers"]["name"] = "STUN/TURN config";
capa["optional"]["iceservers"]["help"] = "An array of RTCIceServer objects, each describing one server which may be used by the ICE agent; these are typically STUN and/or TURN servers. These will be passed verbatim to the RTCPeerConnection constructor as the 'iceServers' property.";
capa["optional"]["iceservers"]["option"] = "--iceservers";
capa["optional"]["iceservers"]["short"] = "z";
capa["optional"]["iceservers"]["default"] = "";
capa["optional"]["iceservers"]["type"] = "json";
config->addOptionsFromCapabilities(capa); config->addOptionsFromCapabilities(capa);
} }