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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2016-11-03 12:22:53 +01:00
commit 871eb8131c
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/dtscmeta.cpp
View file

@ -1258,7 +1258,7 @@ namespace DTSC {
//update firstms //update firstms
firstms = keys[0].getTime(); firstms = keys[0].getTime();
//delete any fragments no longer fully buffered //delete any fragments no longer fully buffered
while (fragments[0].getNumber() < keys[0].getNumber()) { while (fragments.size() && keys.size() && fragments[0].getNumber() < keys[0].getNumber()) {
fragments.pop_front(); fragments.pop_front();
fragInsertTime.pop_front(); fragInsertTime.pop_front();
//and update the missed fragment counter //and update the missed fragment counter
@ -1658,8 +1658,8 @@ namespace DTSC {
writePointer(p, "\340", 1);//Begin track object writePointer(p, "\340", 1);//Begin track object
writePointer(p, "\000\011fragments\002", 12); writePointer(p, "\000\011fragments\002", 12);
writePointer(p, convertInt(fragments.size() * PACKED_FRAGMENT_SIZE), 4); writePointer(p, convertInt(fragments.size() * PACKED_FRAGMENT_SIZE), 4);
for (std::deque<Fragment>::iterator it = fragments.begin(); it != fragments.end(); it++) { for (; firstFrag != fragments.end(); ++firstFrag) {
writePointer(p, it->getData(), PACKED_FRAGMENT_SIZE); writePointer(p, firstFrag->getData(), PACKED_FRAGMENT_SIZE);
} }
writePointer(p, "\000\004keys\002", 7); writePointer(p, "\000\004keys\002", 7);
writePointer(p, convertInt(keys.size() * PACKED_KEY_SIZE), 4); writePointer(p, convertInt(keys.size() * PACKED_KEY_SIZE), 4);