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

Added some helpful high-level debug messages to generic IO handlers, fixed missing track selection when streaming live input

Browse source
This commit is contained in:
Thulinma 2018-07-13 23:17:47 +02:00
parent e00e10b3ad
commit fe7cee8666
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/input/input.cpp
View file

@ -559,6 +559,7 @@ namespace Mist {
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
it->second.firstms = 0;
it->second.lastms = 0;
selectedTracks.insert(it->first);
}
std::string reason = streamMainLoop();
@ -821,6 +822,7 @@ namespace Mist {
getNext();
//in case earlier seeking was inprecise, seek to the exact point
while (thisPacket && thisPacket.getTime() < (unsigned long long)myMeta.tracks[track].keys[keyNum - 1].getTime()) {
DONTEVEN_MSG("Skipping packet: %d@%llu, %llub", track, thisPacket.getTime(), thisPacket.getDataLen());
getNext();
}
}
@ -840,6 +842,7 @@ namespace Mist {
}else{
while (thisPacket && thisPacket.getTime() < stopTime) {
if (thisPacket.getTime() >= lastBuffered){
DONTEVEN_MSG("Buffering packet: %d@%llu, %llub", track, thisPacket.getTime(), thisPacket.getDataLen());
bufferNext(thisPacket);
++packCounter;
byteCounter += thisPacket.getDataLen();
@ -850,7 +853,7 @@ namespace Mist {
}
bufferFinalize(track);
bufferTimer = Util::bootMS() - bufferTimer;
DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d (%llu packets, %llu bytes, %llu-%llums) for track %d (%s) in %llums", keyNum, packCounter, byteCounter, myMeta.tracks[track].keys[keyNum - 1].getTime(), stopTime, track, myMeta.tracks[track].codec.c_str(), bufferTimer);
DEBUG_MSG(DLVL_DEVEL, "Done buffering page %d (%llu packets, %llu bytes, %llu-%llums -> %llums) for track %d (%s) in %llums", keyNum, packCounter, byteCounter, myMeta.tracks[track].keys[keyNum - 1].getTime(), stopTime, lastBuffered, track, myMeta.tracks[track].codec.c_str(), bufferTimer);
pageCounter[track][keyNum] = 15;
return true;
}