MistProcLivepeer port from Livepeer branch

Author: Thulinma

lib/downloader.cpp

@@ -5,6 +5,8 @@
 #include "ev.h"
 #include "timing.h"
 
+static const std::string emptyString;
+
 namespace HTTP{
 
   Downloader::Downloader(){
@@ -613,6 +615,11 @@ namespace HTTP{
     return false;
   }
 
+  const std::string & Downloader::getCookie() const {
+    if (!extraHeaders.count("Cookie")) { return emptyString; }
+    return extraHeaders.at("Cookie");
+  }
+
   bool Downloader::canContinue(const HTTP::URL &link){
     if (getStatusCode() == 401){
       // retry with authentication

lib/downloader.h

@@ -29,6 +29,7 @@ namespace HTTP{
     bool continueNonBlocking(Util::DataCallback &cb);
 
     std::string getHeader(const std::string &headerName);
+    const std::string & getCookie() const;
     std::string &getStatusText();
     uint32_t getStatusCode();
     bool isOk();           ///< True if the request was successful.

src/output/output.cpp

@@ -133,11 +133,7 @@ namespace Mist{
     if (myConn){
       setBlocking(true);
       //Make sure that if the socket is a non-stdio socket, we close it when forking
-      if (myConn.getSocket() > 2){
-        Util::Procs::socketList.insert(myConn.getSocket());
-      }
-    }else{
-      WARN_MSG("Warning: MistOut created with closed socket!");
+      if (myConn.getSocket() > 2) { Util::Procs::socketList.insert(myConn.getSocket()); }
     }
     sentHeader = false;
     isRecordingToFile = false;

src/process/process_av.cpp

@@ -441,8 +441,7 @@ namespace Mist{
   public:
     bool isRecording(){return false;}
 
-    ProcessSource(Socket::Connection &c) : Output(c){
-      closeMyConn();
+    ProcessSource(Socket::Connection & c) : Output(c) {
       targetParams["keeptimes"] = true;
       realTime = 0;
       convertCtx = NULL;
@@ -458,7 +457,7 @@ namespace Mist{
       softDecodeFormat = AV_PIX_FMT_NONE;
       hw_decode_ctx = 0;
       skippedFrames = 99999; //< Init high so that it does not skip the first keyframe
-    };
+    }
 
     ~ProcessSource(){
       if (convertCtx){
@@ -1863,7 +1862,7 @@ void sourceThread(){
     video_select = Mist::opt["source_track"].asStringRef();
   }
   conf.getOption("target", true).append("-");
-  Socket::Connection S(1, 0);
+  Socket::Connection S;
   Mist::ProcessSource out(S);
   MEDIUM_MSG("Running source thread...");
   out.run();