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

Update of DTSCFix to DTSCv2

Browse source
This commit is contained in:
Erik Zandvliet 2013-04-29 10:47:43 +02:00
parent e76b957e84
commit 02c10bc1b2
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/converters/dtscfix.cpp
View file

@ -47,14 +47,22 @@ namespace Converters {
std::map<std::string,int> trackIDs; std::map<std::string,int> trackIDs;
std::map<std::string,HeaderEntryDTSC> trackData; std::map<std::string,HeaderEntryDTSC> trackData;
long long int nowpack = 0; long long int nowpack = 0;
std::string currentID; std::string currentID;
int nextFreeID = 0; int nextFreeID = 0;
for (JSON::ObjIter it = meta["tracks"].ObjBegin(); it != meta["tracks"].ObjEnd(); it++){
trackIDs.insert(std::pair<std::string,int>(it->first,it->second["trackid"].asInt()));
if (it->second["trackid"].asInt() >= nextFreeID){
nextFreeID = it->second["trackid"].asInt() + 1;
}
}
F.seekNext(); F.seekNext();
while ( !F.getJSON().isNull()){ while ( !F.getJSON().isNull()){
if (F.getJSON()["packetid"].asInt() == 0){ if (F.getJSON()["trackid"].asInt() == 0){
if (F.getJSON()["datatype"].asString() == "video"){ if (F.getJSON()["datatype"].asString() == "video"){
currentID = "video0"; currentID = "video0";
trackData[currentID].packetID = 0; trackData[currentID].packetID = 0;
@ -73,10 +81,13 @@ namespace Converters {
} }
trackData[currentID].type = F.getJSON()["datatype"].asString(); trackData[currentID].type = F.getJSON()["datatype"].asString();
}else{ }else{
fprintf(stderr, "Found an unknown package with packetid 0 and datatype %s\n",F.getJSON()["datatype"].asString().c_str());
F.seekNext(); F.seekNext();
continue; continue;
} }
} }
}else{
fprintf(stderr, "Found a v2 packet\n");
} }
if (F.getJSON()["time"].asInt() >= nowpack){ if (F.getJSON()["time"].asInt() >= nowpack){
nowpack = F.getJSON()["time"].asInt(); nowpack = F.getJSON()["time"].asInt();