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

MP4 code sanitised, DTSC2MP4 removed from makefile

Browse source
This commit is contained in:
Oswald Auguste de Bruin 2013-12-12 16:35:19 +01:00 • committed by Thulinma
parent 77c5aa0687
commit f0b126ee9c
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -36,7 +36,6 @@ namespace Connector_HTTP {
//MP4 specific variables //MP4 specific variables
MP4::DTSC2MP4Converter Conv; MP4::DTSC2MP4Converter Conv;
std::set<MP4::keyPart>::iterator keyPartIt;
unsigned int lastStats = 0;//Indicates the last time that we have sent stats to the server socket. unsigned int lastStats = 0;//Indicates the last time that we have sent stats to the server socket.
@ -74,10 +73,9 @@ namespace Connector_HTTP {
HTTP_S.protocol = "HTTP/1.0"; HTTP_S.protocol = "HTTP/1.0";
conn.SendNow(HTTP_S.BuildResponse("200", "OK")); //no SetBody = unknown length - this is intentional, we will stream the entire file conn.SendNow(HTTP_S.BuildResponse("200", "OK")); //no SetBody = unknown length - this is intentional, we will stream the entire file
conn.SendNow(Conv.DTSCMeta2MP4Header(Strm.metadata));//SENDING MP4HEADER conn.SendNow(Conv.DTSCMeta2MP4Header(Strm.metadata));//SENDING MP4HEADER
keyPartIt = Conv.keyParts.begin();
{//using scope to have cmd not declared after action {//using scope to have cmd not declared after action
std::stringstream cmd; std::stringstream cmd;
cmd << "t 1 2";//<< (*keyPartIt).trackID; cmd << "t 1 2";
cmd << "\ns 0"; cmd << "\ns 0";
cmd << "\np\n"; cmd << "\np\n";
ss.SendNow(cmd.str()); ss.SendNow(cmd.str());
@ -128,17 +126,7 @@ namespace Connector_HTTP {
if (ss.spool()){ if (ss.spool()){
while (Strm.parsePacket(ss.Received())){ while (Strm.parsePacket(ss.Received())){
if (Strm.lastType() == DTSC::PAUSEMARK){ if (Strm.lastType() == DTSC::PAUSEMARK){
/*keyPartIt++;
if (keyPartIt != Conv.keyParts.end()){
//Instruct player
std::stringstream cmd;
cmd << "t "<< (*keyPartIt).trackID;
cmd << "\ns " << (*keyPartIt).time;
cmd << "\no\n";
ss.SendNow(cmd.str());
}else{//if keyparts.end, then we reached the end of the file*/
conn.close(); conn.close();
//}
}else if(Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){ }else if(Strm.lastType() == DTSC::AUDIO || Strm.lastType() == DTSC::VIDEO){
//parse DTSC to MP4 here //parse DTSC to MP4 here
conn.SendNow(Strm.lastData());//send out and clear Converter buffer conn.SendNow(Strm.lastData());//send out and clear Converter buffer