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

Merge branch 'master' into DTSC

Browse source 
Conflicts:
	Buffer/main.cpp
	server.html
This commit is contained in:
Thulinma 2012-04-04 15:02:05 +02:00
commit 022ff26205
3 changed files with 1163 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Buffer/main.cpp
View file

@ -148,7 +148,7 @@ namespace Buffer{
std::cout << "Warning: User was send corrupt video data and send to the next keyframe!" << std::endl;
Strm->dropRing(myRing);
myRing = Strm->getRing();
}
}
currsend = 0;
//try to complete a send
@ -204,7 +204,7 @@ namespace Buffer{
Storage["log"] = Json::Value(Json::objectValue);
Storage["curr"] = Json::Value(Json::objectValue);
Storage["totals"] = Json::Value(Json::objectValue);
while (!feof(stdin) || ip_waiting){
usleep(1000); //sleep for 1 ms, to prevent 100% CPU time
@ -223,9 +223,7 @@ namespace Buffer{
Storage["totals"]["up"] = tot_up;
Storage["totals"]["count"] = tot_count;
Storage["totals"]["now"] = now;
if( argc >= 4 ) {
Storage["totals"]["buffer"] = argv[2];
}
Storage["totals"]["buffer"] = argv[1];
if (!StatsSocket.connected()){
StatsSocket = Socket::Connection("/tmp/ddv_statistics", true);
}