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

Added support for syncing MistPlayer output.

Browse source
This commit is contained in:
Thulinma 2014-02-12 15:29:41 +01:00
parent d0418e373a
commit bb16647467
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/buffer/player.cpp
View file

@ -117,9 +117,6 @@ int main(int argc, char** argv){
bool meta_sent = false; bool meta_sent = false;
int playUntil = -1; int playUntil = -1;
long long now, prevTimestamp = 0; //for timing of sending packets long long now, prevTimestamp = 0; //for timing of sending packets
#if DEBUG >= DLVL_DEVEL
long long bench = 0; //for benchmarking
#endif
std::set<int> newSelect; std::set<int> newSelect;
Stats sts; Stats sts;
CYG_DEFI CYG_DEFI
@ -135,6 +132,7 @@ int main(int argc, char** argv){
} }
in_out.Received().get().resize(in_out.Received().get().size() - 1); in_out.Received().get().resize(in_out.Received().get().size() - 1);
if ( !in_out.Received().get().empty()){ if ( !in_out.Received().get().empty()){
DEBUG_MSG(DLVL_HIGH, "Player received: %s", in_out.Received().get().c_str());
switch (in_out.Received().get()[0]){ switch (in_out.Received().get()[0]){
case 'P': { //Push case 'P': { //Push
#if DEBUG >= 4 #if DEBUG >= 4
@ -186,12 +184,9 @@ int main(int argc, char** argv){
playing = -1; playing = -1;
lastSent = Util::epoch(); lastSent = Util::epoch();
in_out.setBlocking(false); in_out.setBlocking(false);
prevTimestamp = 0;
if (in_out.Received().get().size() >= 2){ if (in_out.Received().get().size() >= 2){
playUntil = atoi(in_out.Received().get().substr(2).c_str()); playUntil = atoi(in_out.Received().get().substr(2).c_str());
prevTimestamp = 0;
#if DEBUG >= DLVL_DEVEL
bench = Util::getMS();
#endif
}else{ }else{
playUntil = 0; playUntil = 0;
} }
@ -201,14 +196,17 @@ int main(int argc, char** argv){
if (playing <= 0){ if (playing <= 0){
playing = 1; playing = 1;
} }
prevTimestamp = 0;
++playing; ++playing;
in_out.setBlocking(false); in_out.setBlocking(false);
#if DEBUG >= DLVL_DEVEL
bench = Util::getMS();
#endif
break; break;
} }
case 'q': { //quit-playing case 'q': { //quit-playing
if (playing != 0){
DEBUG_MSG(DLVL_HIGH, "Pausemark sent");
pausemark["time"] = source.getJSON()["time"];
pausemark.sendTo(in_out);
}
playing = 0; playing = 0;
in_out.setBlocking(true); in_out.setBlocking(true);
break; break;
@ -242,6 +240,7 @@ int main(int argc, char** argv){
now = Util::getMS(); now = Util::getMS();
source.seekNext(); source.seekNext();
if ( !source.getJSON()){ if ( !source.getJSON()){
DEBUG_MSG(DLVL_HIGH, "Seek failed (end of file?) - stopping playback");
playing = 0; playing = 0;
} }
if (playing > 0 && source.atKeyframe()){ if (playing > 0 && source.atKeyframe()){
@ -257,14 +256,13 @@ int main(int argc, char** argv){
playing = 0; playing = 0;
} }
if (playing == 0){ if (playing == 0){
#if DEBUG >= DLVL_DEVEL DEBUG_MSG(DLVL_HIGH, "Pausemark sent");
DEBUG_MSG(DLVL_DEVEL, "Completed VoD request in MistPlayer (%d ms)", (Util::getMS() - bench));
#endif
pausemark["time"] = source.getJSON()["time"]; pausemark["time"] = source.getJSON()["time"];
pausemark.sendTo(in_out); pausemark.sendTo(in_out);
in_out.setBlocking(true); in_out.setBlocking(true);
}else{ }else{
lastSent = Util::epoch(); lastSent = Util::epoch();
DEBUG_MSG(DLVL_HIGH, "Playing %lliT%lli", source.getJSON()["trackid"].asInt(), source.getJSON()["time"].asInt());
source.getJSON().sendTo(in_out); source.getJSON().sendTo(in_out);
} }
}else{ }else{

1
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -663,6 +663,7 @@ namespace Connector_HTTP {
} }
if (leftOver < 1){ if (leftOver < 1){
ss.SendNow("q\n");//stop playback ss.SendNow("q\n");//stop playback
Strm.waitForPause(ss);//sync the stream
inited = false; inited = false;
} }
} }