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

Fixed HTTP Dynamic (F4V) processing.

Browse source
This commit is contained in:
Thulinma 2012-05-22 15:11:14 +02:00
parent 2c5055840d
commit 331fac9146
4 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/mp4.cpp
View file

@ -187,7 +187,7 @@ void ABST::SetVersion( bool NewVersion) {
} }
void ABST::SetReserved( ) { void ABST::SetReserved( ) {
Container->SetPayload((uint32_t)4,Box::uint32_to_uint8(0)); SetPayload((uint32_t)4,Box::uint32_to_uint8(0));
} }
void ABST::WriteContent( ) { void ABST::WriteContent( ) {

1
lib/mp4.h
View file

@ -75,7 +75,6 @@ namespace MP4{
std::vector<abst_qualityentry> Qualities; std::vector<abst_qualityentry> Qualities;
std::vector<Box *> SegmentRunTables; std::vector<Box *> SegmentRunTables;
std::vector<Box *> FragmentRunTables; std::vector<Box *> FragmentRunTables;
Box * Container;
};//ABST Box };//ABST Box
struct afrt_fragmentrunentry { struct afrt_fragmentrunentry {

29
src/conn_http.cpp
View file

@ -164,7 +164,6 @@ namespace Connector_HTTP{
int ReqFragment = -1; int ReqFragment = -1;
int temp; int temp;
int Flash_RequestPending = 0; int Flash_RequestPending = 0;
bool Flash_ManifestSent = false;
unsigned int lastStats = 0; unsigned int lastStats = 0;
//int CurrentFragment = -1; later herbruiken? //int CurrentFragment = -1; later herbruiken?
@ -172,7 +171,9 @@ namespace Connector_HTTP{
//only parse input if available or not yet init'ed //only parse input if available or not yet init'ed
if (HTTP_R.Read(conn, ready4data)){ if (HTTP_R.Read(conn, ready4data)){
handler = HANDLER_PROGRESSIVE; handler = HANDLER_PROGRESSIVE;
#if DEBUG >= 4
std::cout << "Received request: " << HTTP_R.url << std::endl; std::cout << "Received request: " << HTTP_R.url << std::endl;
#endif
if ((HTTP_R.url.find("Seg") != std::string::npos) && (HTTP_R.url.find("Frag") != std::string::npos)){handler = HANDLER_FLASH;} if ((HTTP_R.url.find("Seg") != std::string::npos) && (HTTP_R.url.find("Frag") != std::string::npos)){handler = HANDLER_FLASH;}
if (HTTP_R.url.find("f4m") != std::string::npos){handler = HANDLER_FLASH;} if (HTTP_R.url.find("f4m") != std::string::npos){handler = HANDLER_FLASH;}
if (HTTP_R.url == "/crossdomain.xml"){ if (HTTP_R.url == "/crossdomain.xml"){
@ -185,7 +186,7 @@ namespace Connector_HTTP{
printf("Sending crossdomain.xml file\n"); printf("Sending crossdomain.xml file\n");
#endif #endif
} }
if (HTTP_R.url.substr(0, 7) == "/embed_" && HTTP_R.url.substr(HTTP_R.url.length() - 3, 3) == ".js"){ if (HTTP_R.url.length() > 10 && HTTP_R.url.substr(0, 7) == "/embed_" && HTTP_R.url.substr(HTTP_R.url.length() - 3, 3) == ".js"){
streamname = HTTP_R.url.substr(7, HTTP_R.url.length() - 10); streamname = HTTP_R.url.substr(7, HTTP_R.url.length() - 10);
JSON::Value ServConf = JSON::fromFile("/tmp/mist/streamlist"); JSON::Value ServConf = JSON::fromFile("/tmp/mist/streamlist");
std::string response; std::string response;
@ -218,24 +219,29 @@ namespace Connector_HTTP{
temp = HTTP_R.url.find("Frag") + 4; temp = HTTP_R.url.find("Frag") + 4;
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( "Quality: %s, Seg %d Frag %d\n", Quality.c_str(), Segment, ReqFragment);
printf( "Movie: %s, Quality: %s, Seg %d Frag %d\n", Movie.c_str(), Quality.c_str(), Segment, ReqFragment);
#endif #endif
Flash_RequestPending++; Flash_RequestPending++;
}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("/"));
}
streamname = Movie;
if( !Flash_ManifestSent ) {
HTTP_S.Clean(); HTTP_S.Clean();
HTTP_S.SetHeader("Content-Type","text/xml"); HTTP_S.SetHeader("Content-Type","text/xml");
HTTP_S.SetHeader("Cache-Control","no-cache"); HTTP_S.SetHeader("Cache-Control","no-cache");
HTTP_S.SetBody(BuildManifest(Movie)); std::string manifest = BuildManifest(Movie);
#if DEBUG >= 4
printf("Manifest: %s\n", manifest.c_str());
#endif
HTTP_S.SetBody(manifest);
HTTP_S.SendResponse(conn, "200", "OK"); HTTP_S.SendResponse(conn, "200", "OK");
Flash_ManifestSent = true;//stop manifest from being sent multiple times #if DEBUG >= 3
std::cout << "Sent manifest" << std::endl; printf("Sent manifest\n");
#endif
} }
#if DEBUG >= 4
printf( "Movie: %s\n", Movie.c_str());
#endif
streamname = Movie;
ready4data = true; ready4data = true;
}//FLASH handler }//FLASH handler
if (handler == HANDLER_PROGRESSIVE){ if (handler == HANDLER_PROGRESSIVE){
@ -244,6 +250,9 @@ namespace Connector_HTTP{
streamname = HTTP_R.url.substr(0, HTTP_R.url.size()-4);//strip the extension streamname = HTTP_R.url.substr(0, HTTP_R.url.size()-4);//strip the extension
/// \todo VoD streams will need support for position reading from the URL parameters /// \todo VoD streams will need support for position reading from the URL parameters
ready4data = true; ready4data = true;
#if DEBUG >= 4
printf( "Opening progressive stream: %s\n", streamname.c_str());
#endif
}//PROGRESSIVE handler }//PROGRESSIVE handler
HTTP_R.CleanForNext(); //clean for any possinble next requests HTTP_R.CleanForNext(); //clean for any possinble next requests
} }

1
src/server_setup.h
View file

@ -60,7 +60,6 @@ void signal_handler (int signum){
/// Any incoming connections will be accepted and start up the function #MAINHANDLER, /// Any incoming connections will be accepted and start up the function #MAINHANDLER,
/// which should be defined before including server_setup.cpp. /// which should be defined before including server_setup.cpp.
/// The default port is set by define #DEFAULT_PORT. /// The default port is set by define #DEFAULT_PORT.
/// The configuration file section is set by define #CONFIGSECT.
int main(int argc, char ** argv){ int main(int argc, char ** argv){
Socket::Connection S;//placeholder for incoming connections Socket::Connection S;//placeholder for incoming connections