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

Fixed video width/height detection in javascripts.

Browse source
This commit is contained in:
Thulinma 2013-09-09 12:06:27 +02:00
parent 909df1f24e
commit 6d33e7be56
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/connectors/conn_http.cpp
View file

@ -303,8 +303,16 @@ namespace Connector_HTTP {
response = "// Generating info code for stream " + streamname + "\n\nif (!mistvideo){var mistvideo = {};}\n"; response = "// Generating info code for stream " + streamname + "\n\nif (!mistvideo){var mistvideo = {};}\n";
JSON::Value json_resp; JSON::Value json_resp;
if (ServConf["streams"].isMember(streamname) && ServConf["config"]["protocols"].size() > 0){ if (ServConf["streams"].isMember(streamname) && ServConf["config"]["protocols"].size() > 0){
json_resp["width"] = ServConf["streams"][streamname]["meta"]["video"]["width"].asInt(); if (ServConf["streams"][streamname]["meta"].isMember("tracks") && ServConf["streams"][streamname]["meta"]["tracks"].size() > 0){
json_resp["height"] = ServConf["streams"][streamname]["meta"]["video"]["height"].asInt(); for (JSON::ObjIter it = ServConf["streams"][streamname]["meta"]["tracks"].ObjBegin(); it != ServConf["streams"][streamname]["meta"]["tracks"].ObjEnd(); it++){
if (it->second.isMember("width") && it->second["width"].asInt() > json_resp["width"].asInt()){
json_resp["width"] = it->second["width"].asInt();
}
if (it->second.isMember("height") && it->second["height"].asInt() > json_resp["height"].asInt()){
json_resp["height"] = it->second["height"].asInt();
}
}
}
if (json_resp["width"].asInt() < 1 || json_resp["height"].asInt() < 1){ if (json_resp["width"].asInt() < 1 || json_resp["height"].asInt() < 1){
json_resp["width"] = 640ll; json_resp["width"] = 640ll;
json_resp["height"] = 480ll; json_resp["height"] = 480ll;