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

Updated MistConnHTTPLive for DTSC2, fixed a bug in fragmentizing.

Browse source
This commit is contained in:
Erik Zandvliet 2013-06-06 14:52:55 +02:00
parent 0d5011a89a
commit c6aabfa4bf
3 changed files with 81 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/buffer/player.cpp
View file

@ -111,8 +111,10 @@ int main(int argc, char** argv){
JSON::Value last_pack;
bool meta_sent = false;
int playUntil = -1;
long long now, lastTime = 0; //for timing of sending packets
long long bench = 0; //for benchmarking
std::set<int> newSelect;
Stats sts;
CYG_DEFI
@ -182,6 +184,11 @@ int main(int argc, char** argv){
playing = -1;
lastTime = 0;
in_out.setBlocking(false);
if (in_out.Received().get().size() >= 2){
playUntil = atoi(in_out.Received().get().substr(2).c_str());
}else{
playUntil = 0;
}
break;
}
case 'o': { //once-play
@ -199,7 +206,7 @@ int main(int argc, char** argv){
break;
}
case 't': {
std::set<int> newSelect;
newSelect.clear();
std::string tmp = in_out.Received().get().substr(2);
while (tmp != ""){
newSelect.insert(atoi(tmp.substr(0,tmp.find(' ')).c_str()));
@ -239,6 +246,9 @@ int main(int argc, char** argv){
--playing;
}
}
if ( playUntil && playUntil < source.getJSON()["time"].asInt()){
playing = 0;
}
if (playing == 0){
#if DEBUG >= 4
std::cerr << "Completed VoD request in MistPlayer (" << (Util::getMS() - bench) << "ms)" << std::endl;