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

ogg2dtsc now outputs sensible values, theora only

Browse source
This commit is contained in:
Oswald de Bruin 2013-06-18 10:28:54 +02:00 • committed by Thulinma
parent ef98b5c284
commit 3ab6bfcf4c
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/converters/ogg2dtsc.cpp
View file

@ -88,21 +88,28 @@ namespace Converters{
std::cerr << "Theora Header Segment " << tHead.getHeaderType() << std::endl; std::cerr << "Theora Header Segment " << tHead.getHeaderType() << std::endl;
//fillDTSC header //fillDTSC header
switch(tHead.getHeaderType()){ switch(tHead.getHeaderType()){
case 0: //identification header case 0:{ //identification header
std::stringstream tID;
tID << "track" << trackData[sNum].dtscID;
trackData[sNum].fpks = ((long long int)tHead.getFRN() * 1000) / tHead.getFRD(); trackData[sNum].fpks = ((long long int)tHead.getFRN() * 1000) / tHead.getFRD();
DTSCHeader["tracks"][tID.str()]["fpks"] = trackData[sNum].fpks;
DTSCHeader["identification"] = std::string(curSeg+curPlace, curLength);
DTSCHeader["tracks"][tID.str()]["height"] = (long long)tHead.getPICH();
DTSCHeader["tracks"][tID.str()]["width"] = (long long)tHead.getPICW();
trackData[sNum].KFGShift = tHead.getKFGShift(); trackData[sNum].KFGShift = tHead.getKFGShift();
//std::cerr << trackData[sNum].fpks << std::endl; //std::cerr << trackData[sNum].fpks << std::endl;
break; break;}
case 1: //comment header case 1: //comment header
break; break;
case 2: //setup header, also the point to start writing the header case 2:{ //setup header, also the point to start writing the header
std::stringstream tID; std::stringstream tID;
tID << "track" << trackData[sNum].dtscID; tID << "track" << trackData[sNum].dtscID;
DTSCHeader["tracks"][tID.str()]["codec"] = "THEORA"; DTSCHeader["tracks"][tID.str()]["codec"] = "THEORA";
DTSCHeader["tracks"][tID.str()]["fpks"] = (long long)trackData[sNum].fpks; DTSCHeader["tracks"][tID.str()]["type"] = "video";
DTSCHeader["tracks"][tID.str()]["trackid"] = (long long)trackData[sNum].dtscID; //DTSCHeader["tracks"][tID.str()]["fpks"] = (long long)trackData[sNum].fpks;
std::cout << DTSCHeader.toNetPacked(); DTSCHeader["tracks"][tID.str()]["trackid"] = (long long)trackData[sNum].dtscID;
break; std::cout << DTSCHeader.toNetPacked();
break;}
} }
}else{//if the current segment is a movie part }else{//if the current segment is a movie part