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

Made HTTP Dynamic more efficient and less verbose.

Browse source
This commit is contained in:
Thulinma 2012-09-08 13:26:31 +02:00
parent 1f255ec7a4
commit c3dbab31cb
1 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/conn_http_dynamic.cpp
View file

@ -70,7 +70,7 @@ namespace Connector_HTTP{
std::string Result; std::string Result;
Result.append((char*)abst.GetBoxedData(), (int)abst.GetBoxedDataSize()); Result.append((char*)abst.GetBoxedData(), (int)abst.GetBoxedDataSize());
#if DEBUG >= 4 #if DEBUG >= 8
std::cout << "Sending bootstrap:" << std::endl << abst.toPrettyString(0) << std::endl; std::cout << "Sending bootstrap:" << std::endl << abst.toPrettyString(0) << std::endl;
#endif #endif
return Base64::encode(Result); return Base64::encode(Result);
@ -105,7 +105,7 @@ namespace Connector_HTTP{
"<media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId + "/\"></media>\n" "<media streamId=\"1\" bootstrapInfoId=\"bootstrap1\" url=\"" + MovieId + "/\"></media>\n"
"</manifest>\n"; "</manifest>\n";
} }
#if DEBUG >= 4 #if DEBUG >= 8
std::cerr << "Sending this manifest:" << std::endl << Result << std::endl; std::cerr << "Sending this manifest:" << std::endl << Result << std::endl;
#endif #endif
return Result; return Result;
@ -113,11 +113,10 @@ namespace Connector_HTTP{
/// Main function for Connector_HTTP_Dynamic /// Main function for Connector_HTTP_Dynamic
int Connector_HTTP_Dynamic(Socket::Connection conn){ int Connector_HTTP_Dynamic(Socket::Connection conn){
std::string FlashBuf; std::stringstream FlashBuf;
int flashbuf_nonempty = 0; int flashbuf_nonempty = 0;
FLV::Tag tmp;//temporary tag, for init data FLV::Tag tmp;//temporary tag, for init data
std::queue<std::string> Flash_FragBuffer;//Fragment buffer
DTSC::Stream Strm;//Incoming stream buffer. DTSC::Stream Strm;//Incoming stream buffer.
HTTP::Parser HTTP_R, HTTP_S;//HTTP Receiver en HTTP Sender. HTTP::Parser HTTP_R, HTTP_S;//HTTP Receiver en HTTP Sender.
@ -226,17 +225,6 @@ namespace Connector_HTTP{
#endif #endif
inited = true; inited = true;
} }
if ((Flash_RequestPending > 0) && !Flash_FragBuffer.empty()){
HTTP_S.Clean();
HTTP_S.SetHeader("Content-Type","video/mp4");
HTTP_S.SetBody(MP4::mdatFold(Flash_FragBuffer.front()));
Flash_FragBuffer.pop();
conn.Send(HTTP_S.BuildResponse("200", "OK"));
Flash_RequestPending--;
#if DEBUG >= 3
fprintf(stderr, "Sending a video fragment. %i left in buffer, %i requested\n", (int)Flash_FragBuffer.size(), Flash_RequestPending);
#endif
}
unsigned int now = time(0); unsigned int now = time(0);
if (now != lastStats){ if (now != lastStats){
lastStats = now; lastStats = now;
@ -274,29 +262,35 @@ namespace Connector_HTTP{
if (!receive_marks && Strm.metadata.isMember("length")){receive_marks = true;} if (!receive_marks && Strm.metadata.isMember("length")){receive_marks = true;}
if ((Strm.getPacket(0).isMember("keyframe") && !receive_marks) || Strm.lastType() == DTSC::PAUSEMARK){ if ((Strm.getPacket(0).isMember("keyframe") && !receive_marks) || Strm.lastType() == DTSC::PAUSEMARK){
if (flashbuf_nonempty || Strm.lastType() == DTSC::PAUSEMARK){ if (flashbuf_nonempty || Strm.lastType() == DTSC::PAUSEMARK){
Flash_FragBuffer.push(FlashBuf);
while (Flash_FragBuffer.size() > 2){
Flash_FragBuffer.pop();
}
#if DEBUG >= 4 #if DEBUG >= 4
fprintf(stderr, "Received a %s fragment of %i packets. Now %i in buffer.\n", Strm.getPacket(0)["datatype"].asString().c_str(), flashbuf_nonempty, (int)Flash_FragBuffer.size()); fprintf(stderr, "Received a %s fragment of %i packets.\n", Strm.getPacket(0)["datatype"].asString().c_str(), flashbuf_nonempty);
#endif
if (Flash_RequestPending > 0){
HTTP_S.Clean();
HTTP_S.SetHeader("Content-Type","video/mp4");
HTTP_S.SetBody(MP4::mdatFold(FlashBuf.str()));
conn.Send(HTTP_S.BuildResponse("200", "OK"));
Flash_RequestPending--;
#if DEBUG >= 3
fprintf(stderr, "Sending a fragment\n");
#endif #endif
} }
FlashBuf.clear(); }
FlashBuf.str("");
flashbuf_nonempty = 0; flashbuf_nonempty = 0;
//fill buffer with init data, if needed. //fill buffer with init data, if needed.
if (Strm.metadata.isMember("audio") && Strm.metadata["audio"].isMember("init")){ if (Strm.metadata.isMember("audio") && Strm.metadata["audio"].isMember("init")){
tmp.DTSCAudioInit(Strm); tmp.DTSCAudioInit(Strm);
FlashBuf.append(tmp.data, tmp.len); FlashBuf.write(tmp.data, tmp.len);
} }
if (Strm.metadata.isMember("video") && Strm.metadata["video"].isMember("init")){ if (Strm.metadata.isMember("video") && Strm.metadata["video"].isMember("init")){
tmp.DTSCVideoInit(Strm); tmp.DTSCVideoInit(Strm);
FlashBuf.append(tmp.data, tmp.len); FlashBuf.write(tmp.data, tmp.len);
} }
} }
if (Strm.lastType() == DTSC::VIDEO || Strm.lastType() == DTSC::AUDIO){ if (Strm.lastType() == DTSC::VIDEO || Strm.lastType() == DTSC::AUDIO){
++flashbuf_nonempty; ++flashbuf_nonempty;
FlashBuf.append(tag.data, tag.len); FlashBuf.write(tag.data, tag.len);
} }
}else{ }else{
if (pending_manifest && !Strm.metadata.isNull()){ if (pending_manifest && !Strm.metadata.isNull()){