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

String copies omitted

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2014-01-20 10:49:50 +01:00
parent 6b78cad546
commit 9812ab6f41
4 changed files with 104 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/connectors/conn_http_progressive_ogg.cpp
View file

@ -41,7 +41,6 @@ namespace Connector_HTTP {
//OGG::Page curOggPage;
OGG::converter oggConv;
std::map <long long unsigned int, std::vector<JSON::Value> > DTSCBuffer;
std::set <long long unsigned int> sendReady;
//std::map <long long unsigned int, long long unsigned int> prevGran;
std::vector<unsigned int> curSegTable;
long long int currID = 0;
@ -127,17 +126,13 @@ namespace Connector_HTTP {
oggConv.readDTSCHeader(Strm.metadata);
conn.SendNow((char*)oggConv.parsedPages.c_str(), oggConv.parsedPages.size());
progressive_has_sent_header = true;
//setting sendReady to not ready
sendReady.clear();
}
//parse DTSC to Ogg here
if (Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
currID = Strm.getPacket()["trackid"].asInt();
DTSCBuffer[currID].push_back(Strm.getPacket());
std::string tmpString = oggConv.readDTSCVector(DTSCBuffer[currID]);
conn.SendNow((char*)tmpString.c_str(), tmpString.size());
DTSCBuffer[currID].clear();
sendReady.insert(currID);
std::string tmpString;
oggConv.readDTSCVector(Strm.getPacket(), tmpString);
conn.SendNow(tmpString);
}
if (Strm.lastType() == DTSC::PAUSEMARK){
conn.close();