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

Updated DTSC analyser HLS problem finder

Browse source
This commit is contained in:
Thulinma 2016-09-28 18:59:19 +02:00
parent 82a2fb3367
commit 0b92fb0abb
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/analysers/dtsc_analyser.cpp
View file

@ -27,8 +27,6 @@ namespace Analysers {
if (conf.getBool("compact")){ if (conf.getBool("compact")){
bool hasH264 = false; bool hasH264 = false;
bool hasAAC = false; bool hasAAC = false;
bool unstable_keys = false;
bool unstable_parts = false;
JSON::Value result; JSON::Value result;
std::stringstream issues; std::stringstream issues;
for (std::map<unsigned int, DTSC::Track>::iterator it = F.getMeta().tracks.begin(); it != F.getMeta().tracks.end(); it++){ for (std::map<unsigned int, DTSC::Track>::iterator it = F.getMeta().tracks.begin(); it != F.getMeta().tracks.end(); it++){
@ -50,14 +48,14 @@ namespace Analysers {
if ((k->getLength()/k->getParts()) > longest_prt){longest_prt = (k->getLength()/k->getParts());} if ((k->getLength()/k->getParts()) > longest_prt){longest_prt = (k->getLength()/k->getParts());}
if ((k->getLength()/k->getParts()) < shrtest_prt){shrtest_prt = (k->getLength()/k->getParts());} if ((k->getLength()/k->getParts()) < shrtest_prt){shrtest_prt = (k->getLength()/k->getParts());}
} }
track["keys"]["min"] = (long long)shrtest_key; track["keys"]["ms_min"] = (long long)shrtest_key;
track["keys"]["max"] = (long long)longest_key; track["keys"]["ms_max"] = (long long)longest_key;
track["prts"]["min"] = (long long)shrtest_prt; track["keys"]["frame_ms_min"] = (long long)shrtest_prt;
track["prts"]["max"] = (long long)longest_prt; track["keys"]["frame_ms_max"] = (long long)longest_prt;
track["count"]["min"] = (long long)shrtest_cnt; track["keys"]["frames_min"] = (long long)shrtest_cnt;
track["count"]["max"] = (long long)longest_cnt; track["keys"]["frames_max"] = (long long)longest_cnt;
if (shrtest_key < longest_key / 2){issues << it->second.codec << " key duration unstable (variable key interval!) (" << shrtest_key << "-" << longest_key << ")! ";} if (longest_prt > 500){issues << "unstable connection (" << longest_prt << "ms " << it->second.codec << " frame)! ";}
if ((shrtest_prt < longest_prt / 2) && (shrtest_cnt != longest_cnt)){issues << it->second.codec << " part duration unstable (bad connection!) (" << shrtest_prt << "-" << longest_prt << ")! ";} if (shrtest_cnt < 6){issues << "unstable connection (" << shrtest_cnt << " " << it->second.codec << " frames in key)! ";}
if (it->second.codec == "AAC"){hasAAC = true;} if (it->second.codec == "AAC"){hasAAC = true;}
if (it->second.codec == "H264"){hasH264 = true;} if (it->second.codec == "H264"){hasH264 = true;}
if (it->second.type=="video"){ if (it->second.type=="video"){
@ -67,9 +65,9 @@ namespace Analysers {
} }
result[it->second.getWritableIdentifier()] = track; result[it->second.getWritableIdentifier()] = track;
} }
if (hasAAC || hasH264){ if ((hasAAC || hasH264) && F.getMeta().tracks.size() > 1){
if (!hasAAC){issues << "video-only! ";} if (!hasAAC){issues << "HLS no audio!";}
if (!hasH264){issues << "audio-only! ";} if (!hasH264){issues << "HLS no video!";}
} }
if (issues.str().size()){result["issues"] = issues.str();} if (issues.str().size()){result["issues"] = issues.str();}
std::cout << result.toString(); std::cout << result.toString();