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

Fixed firstms/lastms in DTSC::Track, fixed stream buffer limitations.

Browse source
This commit is contained in:
Thulinma 2013-12-03 09:50:25 +01:00
parent f09b258804
commit 99353f49a0
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/dtsc.cpp
View file

@ -235,9 +235,6 @@ void DTSC::Stream::addPacket(JSON::Value & newPack){
newPos.seekTime++;
}
buffers[newPos] = newPack;
if (buffercount > 1){
buffers[newPos].toNetPacked();//make sure package is packed and ready
}
datapointertype = INVALID;
std::string tmp = "";
if (newPack.isMember("trackid") && newPack["trackid"].asInt() > 0){
@ -260,6 +257,9 @@ void DTSC::Stream::addPacket(JSON::Value & newPack){
}
if (buffercount > 1){
metadata.update(newPack);
if (newPack.isMember("keyframe") || metadata.tracks[newPos.trackID].keys.rbegin()->getTime() == newPos.seekTime){
keyframes[newPos.trackID].insert(newPos);
}
metadata.live = true;
}
@ -297,7 +297,7 @@ void DTSC::Stream::cutOneBuffer(){
metadata.tracks[trid].keys.pop_front();
// delete fragments of which the beginning can no longer be reached
while (metadata.tracks[trid].fragments.size() && metadata.tracks[trid].fragments[0].getNumber() < metadata.tracks[trid].keys[0].getNumber()){
metadata.tracks[trid].firstms += metadata.tracks[trid].fragments[0].getDuration();
metadata.tracks[trid].firstms = metadata.tracks[trid].keys[0].getTime();
metadata.tracks[trid].fragments.pop_front();
// increase the missed fragments counter
metadata.tracks[trid].missedFrags ++;