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

Fixed ogg problems with sintel.ogv. Note that sintel.ogv was already slightly corrupt.

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-08-29 13:06:19 +02:00 • committed by Thulinma
parent fcd697e6bb
commit 8099d035a7
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/connectors/conn_http_progressive_ogg.cpp
View file

@ -160,7 +160,7 @@ namespace Connector_HTTP {
}
//parse DTSC to Ogg here
long long unsigned int temp = Strm.getPacket()["trackid"].asInt();
if(prevGran[temp] != Strm.getPacket()["granule"].asInt() && DTSCBuffer[temp].size() != 0){
if((prevGran[temp] != Strm.getPacket()["granule"].asInt() || prevGran[temp] == -1) && DTSCBuffer[temp].size() != 0){
curOggPage.readDTSCVector(DTSCBuffer[temp], oggMeta.DTSCID2OGGSerial[temp], oggMeta.DTSCID2seqNum[temp]);
conn.SendNow((char*)curOggPage.getPage(), curOggPage.getPageSize());
DTSCBuffer[temp].clear();
@ -168,11 +168,10 @@ namespace Connector_HTTP {
if (Strm.lastType() == DTSC::PAUSEMARK){
conn.close();
}
if (Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
//long long unsigned int prevID = Strm.getPacket()["trackid"].asInt();
//if (Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
DTSCBuffer[temp].push_back(Strm.getPacket());
prevGran[temp] = Strm.getPacket()["granule"].asInt();
}
//}
}
}else{
Util::sleep(1);