Add suppor for raw (non-Metacube) inputs over HTTP. Only really useful for TS.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index 894d8e946a3235b3a23fb32382f4364b38e2187f..823204d5b1cff4c264d348b70a731a93e29f1949 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,8 +1,10 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <vector>
+#include <pthread.h>
+#include <stddef.h>
 #include <string>
+#include <vector>
 
 #include "input.h"
 
@@ -10,14 +12,20 @@ class InputProto;
 
 class HTTPInput : public Input {
 public:
-       HTTPInput(const std::string &stream_id, const std::string &url);
+       HTTPInput(const std::string &url, Input::Encoding encoding);
 
        // Serialization/deserialization.
        HTTPInput(const InputProto &serialized);
        virtual InputProto serialize() const;
+       
+       virtual void close_socket();
 
        virtual std::string get_url() const { return url; }
 
+       virtual void add_destination(int stream_index);
+
+       virtual InputStats get_stats() const;
+
 private:
        // Actually does the download.
        virtual void do_work();
@@ -45,12 +53,15 @@ private:
        };
        State state;
 
-       std::string stream_id;
+       std::vector<int> stream_indices;
 
        // The URL and its parsed components.
        std::string url;
        std::string host, port, path;
 
+       // What the input stream is to be interpreted as (normally Metacube).
+       Input::Encoding encoding;
+
        // The HTTP request, with headers and all.
        // Only relevant for SENDING_REQUEST.
        std::string request;
@@ -62,9 +73,12 @@ private:
        // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
        std::string response;
 
-       // The HTTP respones headers we want to give clients for this input.
+       // The HTTP response headers we want to give clients for this input.
        std::string http_header;
 
+       // The stream heder we want to give clients for this input.
+       std::string stream_header;
+
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 
@@ -73,7 +87,13 @@ private:
        bool has_metacube_header;
 
        // The socket we are downloading on (or -1).
-       int sock;       
+       int sock;
+
+       // Mutex protecting <stats>.
+       mutable pthread_mutex_t stats_mutex;
+
+       // The current statistics for this connection. Protected by <stats_mutex>.
+       InputStats stats;
 };
 
 #endif  // !defined(_HTTPINPUT_H)