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

Fixed / improved fragmenter.

Browse source
This commit is contained in:
Thulinma 2013-04-13 13:45:42 +02:00
parent 71b918b7aa
commit 61246062fb
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/dtsc.cpp
View file

@ -342,32 +342,54 @@ void DTSC::Stream::updateHeaders(){
metadata["keytime"].append(buffers[keyframes[1].b]["time"].asInt()); metadata["keytime"].append(buffers[keyframes[1].b]["time"].asInt());
metadata["keynum"].append(buffers[keyframes[1].b]["fragnum"].asInt()); metadata["keynum"].append(buffers[keyframes[1].b]["fragnum"].asInt());
metadata["keylen"].append(buffers[keyframes[0].b]["time"].asInt() - buffers[keyframes[1].b]["time"].asInt()); metadata["keylen"].append(buffers[keyframes[0].b]["time"].asInt() - buffers[keyframes[1].b]["time"].asInt());
long long int firstFragNo = -1; unsigned int fragStart = 0;
metadata["frags"].null(); if ( !metadata["frags"]){
long long int currFrag = -1; // this means that if we have < ~10 seconds in the buffer, fragmenting goes horribly wrong.
for (unsigned int i = 1; i < metadata["keytime"].size(); i++){ if ( !metadata.isMember("missed_frags")){
if (metadata["keytime"][i].asInt() / 10000 > currFrag){ metadata["missed_frags"] = 0ll;
currFrag = metadata["keytime"][i].asInt() / 10000; }
}else{
// delete fragments of which the beginning can no longer be reached
while (metadata["frags"][0u]["num"].asInt() < metadata["keynum"][0u].asInt()){
metadata["frags"].shrink(metadata["frags"].size() - 1);
// increase the missed fragments counter
metadata["missed_frags"] = metadata["missed_frags"].asInt() + 1;
}
if (metadata["frags"].size() > 0){
// set oldestFrag to the first keynum outside any current fragment
long long unsigned int oldestFrag = metadata["frags"][metadata["frags"].size() - 1]["num"].asInt() + metadata["frags"][metadata["frags"].size() - 1]["len"].asInt();
// seek fragStart to the first keynum >= oldestFrag
while (metadata["keynum"][fragStart].asInt() < oldestFrag){
fragStart++;
}
}
}
for (unsigned int i = fragStart; i < metadata["keytime"].size(); i++){
if (i == fragStart){
long long int currFrag = metadata["keytime"][i].asInt() / 10000;
long long int fragLen = 1; long long int fragLen = 1;
long long int fragDur = metadata["keylen"][i].asInt(); long long int fragDur = metadata["keylen"][i].asInt();
for (unsigned int j = i + 1; j < metadata["keytime"].size(); j++){ for (unsigned int j = i + 1; j < metadata["keytime"].size(); j++){
if (metadata["keytime"][j].asInt() / 10000 > currFrag){ // if we are now 10+ seconds, finish the fragment
if (firstFragNo == -1){ if (fragDur >= 10000){
firstFragNo = currFrag; // construct and append the fragment
}
JSON::Value thisFrag; JSON::Value thisFrag;
thisFrag["num"] = metadata["keynum"][i]; thisFrag["num"] = metadata["keynum"][i];
thisFrag["len"] = fragLen; thisFrag["len"] = fragLen;
thisFrag["dur"] = fragDur; thisFrag["dur"] = fragDur;
metadata["frags"].append(thisFrag); metadata["frags"].append(thisFrag);
// next fragment starts fragLen fragments up
fragStart += fragLen;
// skip that many - no unneeded looping
i += fragLen - 1;
break; break;
} }
// otherwise, +1 the length and add up the duration
fragLen++; fragLen++;
fragDur += metadata["keylen"][j].asInt(); fragDur += metadata["keylen"][j].asInt();
} }
} }
} }
metadata["missed_frags"] = firstFragNo;
metadata["lastms"] = buffers[keyframes[0].b]["time"].asInt(); metadata["lastms"] = buffers[keyframes[0].b]["time"].asInt();
metadata["buffer_window"] = (long long int)buffertime; metadata["buffer_window"] = (long long int)buffertime;
metadata["live"] = true; metadata["live"] = true;