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

Merge branch 'master' of octo.ddvtech.com:pls

Browse source
This commit is contained in:
Erik Zandvliet 2011-03-19 19:09:57 +01:00
commit bbffd87ec6
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Connector_HTTP/main.cpp
View file

@ -6,6 +6,7 @@
#define DEBUG 4 #define DEBUG 4
#include <iostream> #include <iostream>
#include <queue>
#include <cstdlib> #include <cstdlib>
#include <cstdio> #include <cstdio>
#include <cmath> #include <cmath>
@ -126,6 +127,8 @@ int mainHandler(int CONN_fd){
std::string FlashBuf; std::string FlashBuf;
std::string FlashMeta; std::string FlashMeta;
bool Flash_ManifestSent = false; bool Flash_ManifestSent = false;
int Flash_RequestPending = 0;
std::queue<std::string> Flash_FragBuffer;
FLV_Pack * tag = 0; FLV_Pack * tag = 0;
HTTPReader HTTP_R, HTTP_S;//HTTP Receiver en HTTP Sender. HTTPReader HTTP_R, HTTP_S;//HTTP Receiver en HTTP Sender.
@ -175,16 +178,9 @@ int mainHandler(int CONN_fd){
ReqFragment = atoi( HTTP_R.url.substr(temp).c_str() ); ReqFragment = atoi( HTTP_R.url.substr(temp).c_str() );
#if DEBUG >= 4 #if DEBUG >= 4
printf( "URL: %s\n", HTTP_R.url.c_str()); printf( "URL: %s\n", HTTP_R.url.c_str());
printf( "Movie Identifier: %s\n", Movie.c_str() ); printf( "Movie: %s, Quality: %s, Seg %d Frag %d\n", Movie.c_str(), Quality.c_str(), Segment, ReqFragment);
printf( "Quality Modifier: %s\n", Quality.c_str() );
printf( "Segment: %d\n", Segment );
printf( "Fragment: %d\n", ReqFragment );
#endif #endif
HTTP_S.Clean(); Flash_RequestPending++;
HTTP_S.SetHeader("Content-Type","video/mp4");
HTTP_S.SetBody(Interface::mdatFold(FlashBuf));
FlashBuf = "";
HTTP_S.SendResponse(CONN_fd, "200", "OK");//schrijf de HTTP response header
}else{ }else{
Movie = HTTP_R.url.substr(1); Movie = HTTP_R.url.substr(1);
Movie = Movie.substr(0,Movie.find("/")); Movie = Movie.substr(0,Movie.find("/"));
@ -233,6 +229,17 @@ int mainHandler(int CONN_fd){
#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(Interface::mdatFold(Flash_FragBuffer.front()));
Flash_FragBuffer.pop();
HTTP_S.SendResponse(CONN_fd, "200", "OK");//schrijf de HTTP response header
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
}
retval = epoll_wait(sspoller, events, 1, 1); retval = epoll_wait(sspoller, events, 1, 1);
switch (DDV_ready(ss)){ switch (DDV_ready(ss)){
case 0: case 0:
@ -246,6 +253,15 @@ int mainHandler(int CONN_fd){
if (FLV_GetPacket(tag, ss)){//able to read a full packet? if (FLV_GetPacket(tag, ss)){//able to read a full packet?
if (handler == HANDLER_FLASH){ if (handler == HANDLER_FLASH){
if(tag->data[0] != 0x12 ) { if(tag->data[0] != 0x12 ) {
if (tag->isKeyframe){
if (FlashBuf != ""){
Flash_FragBuffer.push(FlashBuf);
#if DEBUG >= 4
fprintf(stderr, "Received a fragment. Now %i in buffer.\n", (int)Flash_FragBuffer.size());
#endif
}
FlashBuf = "";
}
FlashBuf.append(tag->data,tag->len); FlashBuf.append(tag->data,tag->len);
} else { } else {
FlashMeta = ""; FlashMeta = "";