Massive HTTP-based protocol code cleanup.

src/connectors/conn_http_dynamic.cpp

@@ -167,10 +167,6 @@ namespace Connector_HTTP {
     DTSC::Stream Strm; //Incoming stream buffer.
     HTTP::Parser HTTP_R, HTTP_S; //HTTP Receiver en HTTP Sender.
 
-    bool ready4data = false; //Set to true when streaming is to begin.
-    bool pending_manifest = false;
-    bool receive_marks = false; //when set to true, this stream will ignore keyframes and instead use pause marks
-    bool inited = false;
     Socket::Connection ss( -1);
     std::string streamname;
     std::string recBuffer = "";
@@ -178,8 +174,6 @@ namespace Connector_HTTP {
     std::string Quality;
     int Segment = -1;
     int ReqFragment = -1;
-    int temp;
-    int Flash_RequestPending = 0;
     unsigned int lastStats = 0;
     conn.setBlocking(false); //do not block on conn.spool() when no data is available
 
@@ -204,22 +198,20 @@ namespace Connector_HTTP {
           if ( !ss){
             ss = Util::Stream::getStream(streamname);
             if ( !ss.connected()){
-#if DEBUG >= 1
-              fprintf(stderr, "Could not connect to server!\n");
-#endif
-              ss.close();
               HTTP_S.Clean();
               HTTP_S.SetBody("No such stream is available on the system. Please try again.\n");
               conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
-              ready4data = false;
-              HTTP_R.Clean(); //clean for any possible next requests
               continue;
             }
             ss.setBlocking(false);
-            inited = true;
+            //make sure metadata is received
-            while ( !ss.spool()){
+            while ( !Strm.metadata){
+              if (ss.spool()){
+                while (Strm.parsePacket(ss.Received())){
+                  //do nothing
+                }
+              }
             }
-            Strm.parsePacket(ss.Received());
           }
           if (HTTP_R.url.find(".abst") != std::string::npos){
             HTTP_S.Clean();
@@ -233,67 +225,31 @@ namespace Connector_HTTP {
           if (HTTP_R.url.find("f4m") == std::string::npos){
             Quality = HTTP_R.url.substr(HTTP_R.url.find("/", 10) + 1);
             Quality = Quality.substr(0, Quality.find("Seg"));
+            int temp;
             temp = HTTP_R.url.find("Seg") + 3;
             Segment = atoi(HTTP_R.url.substr(temp, HTTP_R.url.find("-", temp) - temp).c_str());
             temp = HTTP_R.url.find("Frag") + 4;
             ReqFragment = atoi(HTTP_R.url.substr(temp).c_str());
-#if DEBUG >= 4
+#if DEBUG >= 5
             printf("Quality: %s, Seg %d Frag %d\n", Quality.c_str(), Segment, ReqFragment);
 #endif
             std::stringstream sstream;
             sstream << "f " << ReqFragment << "\no \n";
             ss.SendNow(sstream.str().c_str());
-            Flash_RequestPending++;
           }else{
-            if ( !Strm.metadata.isNull()){
+            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");
+            std::string manifest = BuildManifest(streamname, Strm.metadata);
-              if (Strm.metadata.isMember("length")){
+            HTTP_S.SetBody(manifest);
-                receive_marks = true;
+            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              }
-              std::string manifest = BuildManifest(streamname, Strm.metadata);
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-#if DEBUG >= 3
-              printf("Sent manifest\n");
-#endif
-              pending_manifest = false;
-            }else{
-              pending_manifest = true;
-            }
           }
-          ready4data = true;
           HTTP_R.Clean(); //clean for any possible next requests
         }
       }else{
-        if (Flash_RequestPending){
+        Util::sleep(1);
-          usleep(1000); //sleep 1ms
-        }else{
-          usleep(10000); //sleep 10ms
-        }
       }
-      if (ready4data){
+      if (ss.connected()){
-        if ( !inited){
-          //we are ready, connect the socket!
-          ss = Util::Stream::getStream(streamname);
-          if ( !ss.connected()){
-#if DEBUG >= 1
-            fprintf(stderr, "Could not connect to server!\n");
-#endif
-            ss.close();
-            HTTP_S.Clean();
-            HTTP_S.SetBody("No such stream is available on the system. Please try again.\n");
-            conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
-            ready4data = false;
-            continue;
-          }
-          ss.setBlocking(false);
-#if DEBUG >= 3
-          fprintf(stderr, "Everything connected, starting to send video data...\n");
-#endif
-          inited = true;
-        }
         unsigned int now = Util::epoch();
         if (now != lastStats){
           lastStats = now;
@@ -301,65 +257,14 @@ namespace Connector_HTTP {
         }
         if (ss.spool()){
           while (Strm.parsePacket(ss.Received())){
-            /*
+            if (Strm.lastType() == DTSC::PAUSEMARK){
-             if (Strm.getPacket(0).isMember("time")){
+              if (FlashBufSize){
-             if ( !Strm.metadata.isMember("firsttime")){
-             Strm.metadata["firsttime"] = Strm.getPacket(0)["time"];
-             }else{
-             if ( !Strm.metadata.isMember("length") || Strm.metadata["length"].asInt() == 0){
-             Strm.getPacket(0)["time"] = Strm.getPacket(0)["time"].asInt() - Strm.metadata["firsttime"].asInt();
-             }
-             }
-             Strm.metadata["lasttime"] = Strm.getPacket(0)["time"];
-             }
-             */
-            if (pending_manifest){
-              HTTP_S.Clean();
-              HTTP_S.SetHeader("Content-Type", "text/xml");
-              HTTP_S.SetHeader("Cache-Control", "no-cache");
-              if (Strm.metadata.isMember("length")){
-                receive_marks = true;
-              }
-              std::string manifest = BuildManifest(streamname, Strm.metadata);
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-#if DEBUG >= 3
-              printf("Sent manifest\n");
-#endif
-              pending_manifest = false;
-            }
-            if ( !receive_marks && Strm.metadata.isMember("length")){
-              receive_marks = true;
-            }
-            if ((Strm.getPacket(0).isMember("keyframe") && !receive_marks) || Strm.lastType() == DTSC::PAUSEMARK){
-#if DEBUG >= 4
-              fprintf(stderr, "Received a %s fragment of %i bytes.\n", Strm.getPacket(0)["datatype"].asString().c_str(), FlashBufSize);
-#endif
-              if (Flash_RequestPending > 0 && FlashBufSize){
-#if DEBUG >= 3
-                fprintf(stderr, "Sending a fragment...");
-#endif
-                //static std::string btstrp;
-                //btstrp = GenerateBootstrap(streamname, Strm.metadata, ReqFragment, FlashBufTime, Strm.getPacket(0)["time"]);
                 HTTP_S.Clean();
                 HTTP_S.SetHeader("Content-Type", "video/mp4");
                 HTTP_S.SetBody("");
                 std::string new_strap = GenerateBootstrap(streamname, Strm.metadata, 1, 0, 0);
                 HTTP_S.SetHeader("Content-Length", FlashBufSize + 8 + new_strap.size()); //32+33+btstrp.size());
                 conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-                //conn.SendNow("\x00\x00\x00\x21" "afra\x00\x00\x00\x00\x00\x00\x00\x03\xE8\x00\x00\x00\x01", 21);
-                //unsigned long tmptime = htonl(FlashBufTime << 32);
-                //conn.SendNow((char*)&tmptime, 4);
-                //tmptime = htonl(FlashBufTime & 0xFFFFFFFF);
-                //conn.SendNow((char*)&tmptime, 4);
-                //tmptime = htonl(65);
-                //conn.SendNow((char*)&tmptime, 4);
-
-                //conn.SendNow(btstrp);
-
-                //conn.SendNow("\x00\x00\x00\x18moof\x00\x00\x00\x10mfhd\x00\x00\x00\x00", 20);
-                //unsigned long fragno = htonl(ReqFragment);
-                //conn.SendNow((char*)&fragno, 4);
                 conn.SendNow(new_strap);
                 unsigned long size = htonl(FlashBufSize+8);
                 conn.SendNow((char*) &size, 4);
@@ -368,10 +273,6 @@ namespace Connector_HTTP {
                   conn.SendNow(FlashBuf.front());
                   FlashBuf.pop_front();
                 }
-                Flash_RequestPending--;
-#if DEBUG >= 3
-                fprintf(stderr, "Done\n");
-#endif
               }
               FlashBuf.clear();
               FlashBufSize = 0;
@@ -398,21 +299,6 @@ namespace Connector_HTTP {
               FlashBufSize += tmp.len;
             }
           }
-          if (pending_manifest && !Strm.metadata.isNull()){
-            HTTP_S.Clean();
-            HTTP_S.SetHeader("Content-Type", "text/xml");
-            HTTP_S.SetHeader("Cache-Control", "no-cache");
-            if (Strm.metadata.isMember("length")){
-              receive_marks = true;
-            }
-            std::string manifest = BuildManifest(streamname, Strm.metadata);
-            HTTP_S.SetBody(manifest);
-            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-#if DEBUG >= 3
-            printf("Sent manifest\n");
-#endif
-            pending_manifest = false;
-          }
         }
         if ( !ss.connected()){
           break;

src/connectors/conn_http_live.cpp

@@ -99,9 +99,6 @@ namespace Connector_HTTP {
     HTTP::Parser HTTP_R, HTTP_S; //HTTP Receiver en HTTP Sender.
 
     bool ready4data = false; //Set to true when streaming is to begin.
-    bool pending_manifest = false;
-    bool receive_marks = false; //when set to true, this stream will ignore keyframes and instead use pause marks
-    bool inited = false;
     Socket::Connection ss( -1);
     std::string streamname;
     std::string recBuffer = "";
@@ -122,7 +119,6 @@ namespace Connector_HTTP {
 
     int Segment = -1;
     int temp;
-    int Flash_RequestPending = 0;
     unsigned int lastStats = 0;
     conn.setBlocking(false); //do not block on conn.spool() when no data is available
 
@@ -147,9 +143,9 @@ namespace Connector_HTTP {
           if ( !ss){
             ss = Util::Stream::getStream(streamname);
             if ( !ss.connected()){
-#if DEBUG >= 1
+              #if DEBUG >= 1
               fprintf(stderr, "Could not connect to server!\n");
-#endif
+              #endif
               HTTP_S.Clean();
               HTTP_S.SetBody("No such stream is available on the system. Please try again.\n");
               conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
@@ -157,10 +153,14 @@ namespace Connector_HTTP {
               continue;
             }
             ss.setBlocking(false);
-            inited = true;
+            //make sure metadata is received
-            while ( !ss.spool()){
+            while ( !Strm.metadata){
+              if (ss.spool()){
+                while (Strm.parsePacket(ss.Received())){
+                  //do nothing
+                }
+              }
             }
-            Strm.parsePacket(ss.Received());
           }
           if (HTTP_R.url.find(".m3u") == std::string::npos){
             temp = HTTP_R.url.find("/", 5) + 1;
@@ -174,62 +174,26 @@ namespace Connector_HTTP {
               sstream << "o \n";
             }
             ss.SendNow(sstream.str().c_str());
-            Flash_RequestPending++;
           }else{
-            if (ss.spool()){
-              Strm.parsePacket(ss.Received());
-            }
             if (HTTP_R.url.find(".m3u8") != std::string::npos){
               manifestType = "audio/x-mpegurl";
             }else{
               manifestType = "audio/mpegurl";
             }
-            if ( !Strm.metadata.isNull()){
+            HTTP_S.Clean();
-              HTTP_S.Clean();
+            HTTP_S.SetHeader("Content-Type", manifestType);
-              HTTP_S.SetHeader("Content-Type", manifestType);
+            HTTP_S.SetHeader("Cache-Control", "no-cache");
-              HTTP_S.SetHeader("Cache-Control", "no-cache");
+            std::string manifest = BuildIndex(streamname, Strm.metadata);
-              if (Strm.metadata.isMember("length")){
+            HTTP_S.SetBody(manifest);
-                receive_marks = true;
+            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              }
-              std::string manifest = BuildIndex(streamname, Strm.metadata);
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              pending_manifest = false;
-            }else{
-              pending_manifest = true;
-            }
           }
           ready4data = true;
           HTTP_R.Clean(); //clean for any possible next requests
         }
       }else{
-        if (Flash_RequestPending){
+        Util::sleep(1);
-          usleep(1000); //sleep 1ms
-        }else{
-          usleep(10000); //sleep 10ms
-        }
       }
       if (ready4data){
-        if ( !inited){
-          //we are ready, connect the socket!
-          ss = Util::Stream::getStream(streamname);
-          if ( !ss.connected()){
-#if DEBUG >= 1
-            fprintf(stderr, "Could not connect to server!\n");
-#endif
-            ss.close();
-            HTTP_S.Clean();
-            HTTP_S.SetBody("No such stream is available on the system. Please try again.\n");
-            conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
-            ready4data = false;
-            continue;
-          }
-          ss.setBlocking(false);
-#if DEBUG >= 5
-          fprintf(stderr, "Everything connected, starting to send video data...\n");
-#endif
-          inited = true;
-        }
         unsigned int now = Util::epoch();
         if (now != lastStats){
           lastStats = now;
@@ -237,26 +201,9 @@ namespace Connector_HTTP {
         }
         if (ss.spool()){
           while (Strm.parsePacket(ss.Received())){
-            if (pending_manifest){
-              HTTP_S.Clean();
-              HTTP_S.protocol = "HTTP/1.1";
-              HTTP_S.SetHeader("Cache-Control", "no-cache");
-              if (Strm.metadata.isMember("length")){
-                receive_marks = true;
-              }
-              std::string manifest = BuildIndex(streamname, Strm.metadata);
-              HTTP_S.SetHeader("Content-Type", manifestType);
-              HTTP_S.SetHeader("Connection", "keep-alive");
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              pending_manifest = false;
-            }
-            if ( !receive_marks && Strm.metadata.isMember("length")){
-              receive_marks = true;
-            }
             if (Strm.lastType() == DTSC::PAUSEMARK){
               TSBuf.flush();
-              if (Flash_RequestPending > 0 && TSBuf.str().size()){
+              if (TSBuf.str().size()){
                 HTTP_S.Clean();
                 HTTP_S.protocol = "HTTP/1.1";
                 HTTP_S.SetHeader("Content-Type", "video/mp2t");
@@ -266,7 +213,6 @@ namespace Connector_HTTP {
                 conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
                 conn.SendNow(TSBuf.str().c_str(), TSBuf.str().size());
                 TSBuf.str("");
-                Flash_RequestPending--;
                 PacketNumber = 0;
               }
               TSBuf.str("");
@@ -345,20 +291,6 @@ namespace Connector_HTTP {
 
             }
           }
-          if (pending_manifest && !Strm.metadata.isNull()){
-            HTTP_S.Clean();
-            HTTP_S.protocol = "HTTP/1.1";
-            HTTP_S.SetHeader("Cache-Control", "no-cache");
-            if (Strm.metadata.isMember("length")){
-              receive_marks = true;
-            }
-            HTTP_S.SetHeader("Content-Type", manifestType);
-            HTTP_S.SetHeader("Connection", "keep-alive");
-            std::string manifest = BuildIndex(streamname, Strm.metadata);
-            HTTP_S.SetBody(manifest);
-            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-            pending_manifest = false;
-          }
         }
         if ( !ss.connected()){
           break;

src/connectors/conn_http_smooth.cpp

@@ -95,27 +95,20 @@ namespace Connector_HTTP {
   int Connector_HTTP_Dynamic(Socket::Connection conn){
     std::deque<std::string> FlashBuf;
     int FlashBufSize = 0;
-    long long int FlashBufTime = 0;
 
     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 and HTTP Sender.
 
     bool ready4data = false; //Set to true when streaming is to begin.
-    bool pending_manifest = false;
-    bool inited = false;
     Socket::Connection ss( -1);
     std::string streamname;
-    std::string recBuffer = "";
 
     bool wantsVideo = false;
     bool wantsAudio = false;
 
     std::string Quality;
-    int Segment = -1;
     long long int ReqFragment = -1;
-    int temp;
     std::string tempStr;
-    int Flash_RequestPending = 0;
     unsigned int lastStats = 0;
     conn.setBlocking(false); //do not block on conn.spool() when no data is available
 
@@ -136,24 +129,30 @@ namespace Connector_HTTP {
           std::cout << "Received request: " << HTTP_R.getUrl() << std::endl;
 #endif
           conn.setHost(HTTP_R.GetHeader("X-Origin"));
-          if (HTTP_R.url.find("Manifest") == std::string::npos){
+          streamname = HTTP_R.GetHeader("X-Stream");
-            streamname = HTTP_R.url.substr(8, HTTP_R.url.find("/", 8) - 12);
+          if ( !ss){
-            if ( !ss){
+            ss = Util::Stream::getStream(streamname);
-              ss = Util::Stream::getStream(streamname);
+            if ( !ss.connected()){
-              if ( !ss.connected()){
+              #if DEBUG >= 1
-#if DEBUG >= 1
+              fprintf(stderr, "Could not connect to server!\n");
-                fprintf(stderr, "Could not connect to server!\n");
+              #endif
-#endif
+              HTTP_S.Clean();
-                ss.close();
+              HTTP_S.SetBody("No such stream is available on the system. Please try again.\n");
-                HTTP_S.Clean();
+              conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
-                HTTP_S.SetBody("No such stream " + streamname + " is available on the system. Please try again.\n");
+              ready4data = false;
-                conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
+              continue;
-                ready4data = false;
-                continue;
-              }
-              ss.setBlocking(false);
-              inited = true;
             }
+            ss.setBlocking(false);
+            //make sure metadata is received
+            while ( !Strm.metadata){
+              if (ss.spool()){
+                while (Strm.parsePacket(ss.Received())){
+                  //do nothing
+                }
+              }
+            }
+          }
+          if (HTTP_R.url.find("Manifest") == std::string::npos){
             Quality = HTTP_R.url.substr(HTTP_R.url.find("/Q(", 8) + 3);
             Quality = Quality.substr(0, Quality.find(")"));
             tempStr = HTTP_R.url.substr(HTTP_R.url.find(")/") + 2);
@@ -170,49 +169,21 @@ namespace Connector_HTTP {
             std::stringstream sstream;
             sstream << "s " << (ReqFragment / 10000) << "\no \n";
             ss.SendNow(sstream.str().c_str());
-            Flash_RequestPending++;
           }else{
-            streamname = HTTP_R.url.substr(8, HTTP_R.url.find("/", 8) - 12);
+            HTTP_S.Clean();
-            if ( !Strm.metadata.isNull()){
+            HTTP_S.SetHeader("Content-Type", "text/xml");
-              HTTP_S.Clean();
+            HTTP_S.SetHeader("Cache-Control", "no-cache");
-              HTTP_S.SetHeader("Content-Type", "text/xml");
+            std::string manifest = BuildManifest(streamname, Strm.metadata);
-              HTTP_S.SetHeader("Cache-Control", "no-cache");
+            HTTP_S.SetBody(manifest);
-              std::string manifest = BuildManifest(streamname, Strm.metadata);
+            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              pending_manifest = false;
-            }else{
-              pending_manifest = true;
-            }
           }
           ready4data = true;
           HTTP_R.Clean(); //clean for any possible next requests
         }
       }else{
-        if (Flash_RequestPending){
+        Util::sleep(1);
-          usleep(1000); //sleep 1ms
-        }else{
-          usleep(10000); //sleep 10ms
-        }
       }
       if (ready4data){
-        if ( !inited){
-          //we are ready, connect the socket!
-          ss = Util::Stream::getStream(streamname);
-          if ( !ss.connected()){
-#if DEBUG >= 1
-            fprintf(stderr, "Could not connect to server!\n");
-#endif
-            ss.close();
-            HTTP_S.Clean();
-            HTTP_S.SetBody("No such stream " + streamname + " is available on the system. Please try again.\n");
-            conn.SendNow(HTTP_S.BuildResponse("404", "Not found"));
-            ready4data = false;
-            continue;
-          }
-          ss.setBlocking(false);
-          inited = true;
-        }
         unsigned int now = Util::epoch();
         if (now != lastStats){
           lastStats = now;
@@ -220,22 +191,8 @@ namespace Connector_HTTP {
         }
         if (ss.spool()){
           while (Strm.parsePacket(ss.Received())){
-            if (pending_manifest){
-              HTTP_S.Clean();
-              HTTP_S.SetHeader("Content-Type", "text/xml");
-              HTTP_S.SetHeader("Cache-Control", "no-cache");
-              std::string manifest = BuildManifest(streamname, Strm.metadata);
-              HTTP_S.SetBody(manifest);
-              conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-              pending_manifest = false;
-            }
             if (Strm.lastType() == DTSC::PAUSEMARK){
-#if DEBUG >= 4
+              if (FlashBufSize){
-              fprintf(stderr, "Received a %s fragment of %i bytes.\n", Strm.getPacket(0)["datatype"].asString().c_str(), FlashBufSize);
-#endif
-              if (Flash_RequestPending > 0 && FlashBufSize){
-                //static std::string btstrp;
-                //btstrp = GenerateBootstrap(streamname, Strm.metadata, ReqFragment, FlashBufTime, Strm.getPacket(0)["time"]);
                 HTTP_S.Clean();
                 HTTP_S.SetHeader("Content-Type", "video/mp4");
                 HTTP_S.SetBody("");
@@ -308,7 +265,6 @@ namespace Connector_HTTP {
                     }
                   }
                   traf_box.setContent(fragref_box, 3);
-                  std::cout << fragref_box.toPrettyString(6) << std::endl;
                 }
 
                 MP4::MOOF moof_box;
@@ -334,7 +290,6 @@ namespace Connector_HTTP {
                   conn.SendNow(FlashBuf.front());
                   FlashBuf.pop_front();
                 }
-                Flash_RequestPending--;
               }
               FlashBuf.clear();
               FlashBufSize = 0;
@@ -344,15 +299,6 @@ namespace Connector_HTTP {
               FlashBufSize += Strm.lastData().size();
             }
           }
-          if (pending_manifest && !Strm.metadata.isNull()){
-            HTTP_S.Clean();
-            HTTP_S.SetHeader("Content-Type", "text/xml");
-            HTTP_S.SetHeader("Cache-Control", "no-cache");
-            std::string manifest = BuildManifest(streamname, Strm.metadata);
-            HTTP_S.SetBody(manifest);
-            conn.SendNow(HTTP_S.BuildResponse("200", "OK"));
-            pending_manifest = false;
-          }
         }
         if ( !ss.connected()){
           break;