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

Fixed input buffering packet mismatch problems.

Browse source
This commit is contained in:
Thulinma 2014-10-31 19:25:53 +01:00
parent d457046420
commit e6e76d3971
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/input/input.cpp
View file

@ -249,7 +249,7 @@ namespace Mist {
sprintf(tmpId, "%d", tid); sprintf(tmpId, "%d", tid);
indexPages[tid].init(config->getString("streamname") + tmpId, 8 * 1024, true);//Pages of 8kb in size, room for 512 parts. indexPages[tid].init(config->getString("streamname") + tmpId, 8 * 1024, true);//Pages of 8kb in size, room for 512 parts.
} }
if (myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() + 1 == curData[tid].partNum){ if (myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() == curData[tid].partNum){
if (curData[tid].dataSize > 8 * 1024 * 1024) { if (curData[tid].dataSize > 8 * 1024 * 1024) {
pagesByTrack[tid][bookKeeping[tid].first] = curData[tid]; pagesByTrack[tid][bookKeeping[tid].first] = curData[tid];
bookKeeping[tid].first += curData[tid].keyNum; bookKeeping[tid].first += curData[tid].keyNum;
@ -264,7 +264,9 @@ namespace Mist {
curData[tid].dataSize += lastPack.getDataLen(); curData[tid].dataSize += lastPack.getDataLen();
curData[tid].partNum ++; curData[tid].partNum ++;
bookKeeping[tid].curPart ++; bookKeeping[tid].curPart ++;
DEBUG_MSG(DLVL_DONTEVEN, "Track %ld:%llu on page %d, being part %d of key %d", lastPack.getTrackId(), lastPack.getTime(), bookKeeping[tid].first, curData[tid].partNum, curData[tid].keyNum); if (lastPack.getTrackId() == 4 && (curData[tid].partNum == 1 || myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() == curData[tid].partNum)){
DEBUG_MSG(DLVL_INFO, "Track %ld:%llu (%db) on page %d, being part %d of key %d", lastPack.getTrackId(), lastPack.getTime(), lastPack.getDataLen(), bookKeeping[tid].first, curData[tid].partNum, curData[tid].keyNum);
}
getNext(false); getNext(false);
} }
for (std::map<int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) { for (std::map<int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++) {
@ -295,7 +297,7 @@ namespace Mist {
int pageNum = it->first; int pageNum = it->first;
pageCounter[track][pageNum] = 15;///Keep page 15seconds in memory after last use pageCounter[track][pageNum] = 15;///Keep page 15seconds in memory after last use
DEBUG_MSG(DLVL_DONTEVEN, "Attempting to buffer page %d key %d->%d", track, keyNum, pageNum); DEBUG_MSG(DLVL_DONTEVEN, "Attempting to buffer %d:%d on page %d", track, keyNum, pageNum);
if (dataPages[track].count(pageNum)){ if (dataPages[track].count(pageNum)){
return true; return true;
} }
@ -312,16 +314,19 @@ namespace Mist {
std::stringstream trackSpec; std::stringstream trackSpec;
trackSpec << track; trackSpec << track;
trackSelect(trackSpec.str()); trackSelect(trackSpec.str());
seek(myMeta.tracks[track].keys[pageNum-1].getTime()); unsigned int keyIndex = pageNum-1;
//if (keyIndex > 0){++keyIndex;}
long long unsigned int startTime = myMeta.tracks[track].keys[keyIndex].getTime();
long long unsigned int stopTime = myMeta.tracks[track].lastms + 1; long long unsigned int stopTime = myMeta.tracks[track].lastms + 1;
if ((int)myMeta.tracks[track].keys.size() > pageNum-1 + it->second.keyNum){ if ((int)myMeta.tracks[track].keys.size() > keyIndex + it->second.keyNum){
stopTime = myMeta.tracks[track].keys[pageNum-1 + it->second.keyNum].getTime(); stopTime = myMeta.tracks[track].keys[keyIndex + it->second.keyNum].getTime();
} }
DEBUG_MSG(DLVL_HIGH, "Playing from %ld to %llu", myMeta.tracks[track].keys[pageNum-1].getTime(), stopTime); DEBUG_MSG(DLVL_INFO, "Playing track %d from %d (%llus) to %d (%llus)", track, pageNum, startTime, pageNum-1 + it->second.keyNum, stopTime);
seek(startTime);
it->second.curOffset = 0; it->second.curOffset = 0;
getNext(); getNext();
//in case earlier seeking was inprecise, seek to the exact point //in case earlier seeking was inprecise, seek to the exact point
while (lastPack && lastPack.getTime() < (unsigned long long)myMeta.tracks[track].keys[pageNum-1].getTime()){ while (lastPack && lastPack.getTime() < startTime){
getNext(); getNext();
} }
while (lastPack && lastPack.getTime() < stopTime){ while (lastPack && lastPack.getTime() < stopTime){
@ -331,6 +336,9 @@ namespace Mist {
}else{ }else{
memcpy(dataPages[track][pageNum].mapped + it->second.curOffset, lastPack.getData(), lastPack.getDataLen()); memcpy(dataPages[track][pageNum].mapped + it->second.curOffset, lastPack.getData(), lastPack.getDataLen());
it->second.curOffset += lastPack.getDataLen(); it->second.curOffset += lastPack.getDataLen();
if (track == 4){
DEBUG_MSG(DLVL_DEVEL, "Wrote %u bytes on %llu-%llu where size is %llu (time: %llu / %llu, track %u page %u)", lastPack.getDataLen(), it->second.curOffset, it->second.curOffset-lastPack.getDataLen(), pagesByTrack[track][pageNum].dataSize, lastPack.getTime(), stopTime, track, pageNum);
}
} }
getNext(); getNext();
} }