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

Fixes a few minor errors in MistPlayer.

Browse source
This commit is contained in:
Thulinma 2013-03-21 14:56:17 +01:00
parent 46710d2446
commit f18dc5d85e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/buffer/player.cpp
View file

@ -75,7 +75,11 @@ int main(int argc, char** argv){
DTSC::File source = DTSC::File(conf.getString("filename")); DTSC::File source = DTSC::File(conf.getString("filename"));
JSON::Value meta = source.getMeta(); JSON::Value meta = source.getMeta();
//send the header
std::string meta_str = meta.toNetPacked();
in_out.Send(meta_str);
if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) && meta.isMember("video")){ if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) && meta.isMember("video")){
//file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first //file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first
std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl; std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl;
@ -94,12 +98,6 @@ int main(int argc, char** argv){
Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true); Socket::Connection StatsSocket = Socket::Connection("/tmp/mist/statistics", true);
int lasttime = Util::epoch(); //time last packet was sent int lasttime = Util::epoch(); //time last packet was sent
//send the header
std::string meta_str = meta.toNetPacked();
in_out.Send(meta_str);
if (meta.isMember("keytime"))
if (meta["video"]["keyms"].asInt() < 11){ if (meta["video"]["keyms"].asInt() < 11){
meta["video"]["keyms"] = (long long int)1000; meta["video"]["keyms"] = (long long int)1000;
} }