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

Update to "keys" element instead of all different arrays.

Browse source
This commit is contained in:
Erik Zandvliet 2013-06-04 11:54:19 +02:00
parent 6bde0a3581
commit 7e3c97355f
5 changed files with 176 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/buffer/player.cpp
View file

@ -154,9 +154,7 @@ int main(int argc, char** argv){
json_sts["vod"]["meta"] = meta;
for (JSON::ObjIter oIt = json_sts["vod"]["meta"]["tracks"].ObjBegin(); oIt != json_sts["vod"]["meta"]["tracks"].ObjEnd(); oIt++){
oIt->second.removeMember("init");
oIt->second.removeMember("keytime");
oIt->second.removeMember("keybpos");
oIt->second.removeMember("keynum");
oIt->second.removeMember("keys");
oIt->second.removeMember("frags");
}
meta_sent = true;
@ -232,6 +230,7 @@ int main(int argc, char** argv){
playing = 0;
}
if (source.atKeyframe()){
///\todo Fix auto-delay on playing == -1.
if (playing == -1 && meta["video"]["keyms"].asInt() > now - lastTime){
Util::sleep(meta["video"]["keyms"].asInt() - (now - lastTime));
}