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

Weird fix that made ogg work.

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-09-12 08:52:48 +02:00 • committed by Erik Zandvliet
parent bf485b1803
commit f3bed1ab94
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ogg.cpp
View file

@ -474,7 +474,7 @@ namespace OGG{
void Page::readDTSCVector(std::vector <JSON::Value> DTSCVec, unsigned int serial, unsigned int sequence){ void Page::readDTSCVector(std::vector <JSON::Value> DTSCVec, unsigned int serial, unsigned int sequence){
clear(); clear();
setVersion(); setVersion();
if (DTSCVec[0]["OggCont"] || DTSCVec[0]["granule"].asInt() == -1){//if it is a continue page, also for granule=0xFFFFFFFF if (DTSCVec[0]["OggCont"] ){//if it is a continue page, also for granule=0xFFFFFFFF
setHeaderType(1);//headertype 1 = Continue Page setHeaderType(1);//headertype 1 = Continue Page
}else if (DTSCVec[0]["OggEOS"]){ }else if (DTSCVec[0]["OggEOS"]){
setHeaderType(4);//headertype 4 = end of stream setHeaderType(4);//headertype 4 = end of stream
@ -482,6 +482,14 @@ namespace OGG{
setHeaderType(0);//headertype 0 = normal setHeaderType(0);//headertype 0 = normal
} }
setGranulePosition(DTSCVec[0]["granule"].asInt()); setGranulePosition(DTSCVec[0]["granule"].asInt());
for (unsigned int i = 1; i < DTSCVec.size(); i++){
if (DTSCVec[0]["granule"].asInt() != DTSCVec[i]["granule"].asInt()){
std::cerr << "Granule inconcistency!! " << DTSCVec[0]["granule"].asInt() << " != " << DTSCVec[i]["granule"].asInt() << std::endl;
}
if (DTSCVec[0]["trackid"].asInt() != DTSCVec[i]["trackid"].asInt()){
std::cerr << "Track ID inconcistency!! " << DTSCVec[0]["trackid"].asInt() << " != " <<DTSCVec[i]["trackid"].asInt() << std::endl;
}
}
setBitstreamSerialNumber(serial); setBitstreamSerialNumber(serial);
setPageSequenceNumber(sequence); setPageSequenceNumber(sequence);