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

Some small optimizations, added reference functions to JSON lib, fixed config commandline options.

Browse source
This commit is contained in:
Thulinma 2013-08-12 13:18:48 +02:00
parent 0c059f0ca3
commit ea71dd2d5c
7 changed files with 38 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/dtsc.cpp
View file

@ -222,10 +222,10 @@ void DTSC::Stream::addPacket(JSON::Value & newPack){
datapointertype = INVALID;
std::string tmp = "";
if (newPack.isMember("trackid")){
tmp = getTrackById(newPack["trackid"].asInt())["type"].asString();
tmp = getTrackById(newPack["trackid"].asInt())["type"].asStringRef();
}
if (newPack.isMember("datatype")){
tmp = newPack["datatype"].asString();
tmp = newPack["datatype"].asStringRef();
}
if (tmp == "video"){
datapointertype = VIDEO;
@ -300,7 +300,7 @@ void DTSC::Stream::addPacket(JSON::Value & newPack){
}
}
if (keySize){
metadata["tracks"][newTrack]["keys"][keySize - 1]["parts"].append((long long int)newPack["data"].asString().size());
metadata["tracks"][newTrack]["keys"][keySize - 1]["parts"].append((long long int)newPack["data"].asStringRef().size());
}
metadata["live"] = 1ll;
}
@ -468,7 +468,7 @@ DTSC::livePos DTSC::Stream::msSeek(unsigned int ms, std::set<int> & allowedTrack
std::set<int> seekTracks = allowedTracks;
livePos result = buffers.begin()->first;
for (std::set<int>::iterator it = allowedTracks.begin(); it != allowedTracks.end(); it++){
if (getTrackById(*it).isMember("type") && getTrackById(*it)["type"].asString() == "video"){
if (getTrackById(*it).isMember("type") && getTrackById(*it)["type"].asStringRef() == "video"){
int trackNo = *it;
seekTracks.clear();
seekTracks.insert(trackNo);