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

commit before doing something really stupid

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-09-10 13:04:34 +02:00 • committed by Thulinma
parent bc019e5d1f
commit 51d5b3b65f
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/connectors/conn_http_progressive_ogg.cpp
View file

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

6
src/converters/ogg2dtsc.cpp
View file

@ -16,7 +16,7 @@ namespace Converters{
class oggTrack{ class oggTrack{
public: public:
oggTrack() : lastTime(), parsedHeaders(false) { } oggTrack() : lastTime(0), parsedHeaders(false) { }
codecType codec; codecType codec;
std::string name; std::string name;
long long unsigned int dtscID; long long unsigned int dtscID;
@ -69,7 +69,7 @@ namespace Converters{
trackData[sNum].name = tID.str(); trackData[sNum].name = tID.str();
} }
//if Serial number is available in mapping //if Serial number is available in mapping
if(trackData.find(sNum)!=trackData.end()){ if(trackData.find(sNum)!=trackData.end()){//create DTSC from OGG page
int offset = 0; int offset = 0;
for (std::deque<unsigned int>::iterator it = oggPage.getSegmentTableDeque().begin(); it != oggPage.getSegmentTableDeque().end(); it++){ for (std::deque<unsigned int>::iterator it = oggPage.getSegmentTableDeque().begin(); it != oggPage.getSegmentTableDeque().end(); it++){
if (trackData[sNum].parsedHeaders){ if (trackData[sNum].parsedHeaders){
@ -96,7 +96,7 @@ namespace Converters{
} }
std::cout << DTSCOut.toNetPacked(); std::cout << DTSCOut.toNetPacked();
}else{ }else{//if we ouput a header:
//switch on codec //switch on codec
switch(trackData[sNum].codec){ switch(trackData[sNum].codec){
case THEORA:{ case THEORA:{