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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/input/input.cpp
This commit is contained in:
Thulinma 2016-09-02 18:00:50 +02:00
commit 291535a5d7
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/input/input.cpp
View file

@ -397,6 +397,13 @@ namespace Mist {
} }
DTSCPageData & dPage = nProxy.pagesByTrack[it->first].rbegin()->second; DTSCPageData & dPage = nProxy.pagesByTrack[it->first].rbegin()->second;
dPage.keyNum++; dPage.keyNum++;
if (it->second.keys.size() <= i || it->second.keySizes.size() <= i){
FAIL_MSG("Corrupt header - deleting for regeneration and aborting");
std::string headerFile = config->getString("input");
headerFile += ".dtsh";
remove(headerFile.c_str());
return;
}
dPage.partNum += it->second.keys[i].getParts(); dPage.partNum += it->second.keys[i].getParts();
dPage.dataSize += it->second.keySizes[i]; dPage.dataSize += it->second.keySizes[i];
if ((dPage.dataSize > FLIP_DATA_PAGE_SIZE || it->second.keys[i].getTime() - dPage.firstTime > FLIP_TARGET_DURATION) && it->second.keys[i].getTime() - dPage.firstTime > FLIP_MIN_DURATION) { if ((dPage.dataSize > FLIP_DATA_PAGE_SIZE || it->second.keys[i].getTime() - dPage.firstTime > FLIP_TARGET_DURATION) && it->second.keys[i].getTime() - dPage.firstTime > FLIP_MIN_DURATION) {
@ -430,6 +437,13 @@ namespace Mist {
curData[tid].firstTime = myMeta.tracks[tid].keys[0].getTime(); curData[tid].firstTime = myMeta.tracks[tid].keys[0].getTime();
} }
if (myMeta.tracks[tid].keys.size() <= bookKeeping[tid].curKey){
FAIL_MSG("Corrupt header - deleting for regeneration and aborting");
std::string headerFile = config->getString("input");
headerFile += ".dtsh";
remove(headerFile.c_str());
return;
}
if (myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() + 1 == curData[tid].partNum) { if (myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getParts() + 1 == curData[tid].partNum) {
if ((curData[tid].dataSize > FLIP_DATA_PAGE_SIZE || myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getTime() - curData[tid].firstTime > FLIP_TARGET_DURATION) && myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getTime() - curData[tid].firstTime > FLIP_MIN_DURATION) { if ((curData[tid].dataSize > FLIP_DATA_PAGE_SIZE || myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getTime() - curData[tid].firstTime > FLIP_TARGET_DURATION) && myMeta.tracks[tid].keys[bookKeeping[tid].curKey].getTime() - curData[tid].firstTime > FLIP_MIN_DURATION) {
nProxy.pagesByTrack[tid][bookKeeping[tid].first] = curData[tid]; nProxy.pagesByTrack[tid][bookKeeping[tid].first] = curData[tid];