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

Small fixes on DTSC lib

Browse source
This commit is contained in:
Erik Zandvliet 2013-11-01 12:22:14 +01:00
parent 7930d3869e
commit 01d008a56c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dtsc.cpp
View file

@ -264,7 +264,7 @@ void DTSC::Stream::addPacket(JSON::Value & newPack){
int keySize = metadata["tracks"][newTrack]["keys"].size(); int keySize = metadata["tracks"][newTrack]["keys"].size();
if (buffercount > 1){ if (buffercount > 1){
#define prevKey metadata["tracks"][newTrack]["keys"][keySize - 1] #define prevKey metadata["tracks"][newTrack]["keys"][keySize - 1]
if (newPack.isMember("keyframe") || !keySize || (datapointertype != VIDEO && newPack["time"].asInt() - 2000 > prevKey["time"].asInt())){ if (newPack.isMember("keyframe") || !keySize || (datapointertype != VIDEO && newPack["time"].asInt() - 5000 > prevKey["time"].asInt())){
updateMeta = true; updateMeta = true;
metadata["tracks"][newTrack]["lastms"] = newPack["time"]; metadata["tracks"][newTrack]["lastms"] = newPack["time"];
keyframes[newPos.trackID].insert(newPos); keyframes[newPos.trackID].insert(newPos);
@ -503,12 +503,12 @@ DTSC::livePos DTSC::Stream::msSeek(unsigned int ms, std::set<int> & allowedTrack
} }
for (std::map<livePos,JSON::Value>::iterator bIt = buffers.begin(); bIt != buffers.end(); bIt++){ for (std::map<livePos,JSON::Value>::iterator bIt = buffers.begin(); bIt != buffers.end(); bIt++){
if (seekTracks.find(bIt->first.trackID) != seekTracks.end()){ if (seekTracks.find(bIt->first.trackID) != seekTracks.end()){
if (bIt->second.isMember("keyframe")){ // if (bIt->second.isMember("keyframe")){
result = bIt->first; result = bIt->first;
if (bIt->first.seekTime >= ms){ if (bIt->first.seekTime >= ms){
return result; return result;
} }
} //}
} }
} }
return result; return result;