Support input from pipes (subprocesses).

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index e7c447af52eb310da0d18b5a83cbc7272dfd5933..890cc9ef91256b92145e58dcc3425831fa0747fc 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,15 +1,19 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <pthread.h>
 #include <stddef.h>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "input.h"
+#include "metacube2.h"
+#include "stream.h"
 
 class InputProto;
 
+// Despite the name, covers input over both HTTP and pipes, both typically
+// wrapped in Metacube.
 class HTTPInput : public Input {
 public:
        HTTPInput(const std::string &url, Input::Encoding encoding);
@@ -33,6 +37,10 @@ private:
        // Open a socket that connects to the given host and port. Does DNS resolving.
        int lookup_and_connect(const std::string &host, const std::string &port);
 
+       // Open a child process with the given command line (given to /bin/sh).
+       // Returns a pipe to its standard output.
+       int open_child_process(const std::string &cmdline);
+
        // Parses a HTTP response. Returns false if it not a 200.
        bool parse_response(const std::string &response);
 
@@ -44,6 +52,8 @@ private:
        // and outputs a warning.
        void drop_pending_data(size_t num_bytes);
 
+       void process_metacube_metadata_block(const metacube2_block_header &hdr, const char *payload, uint32_t payload_size);
+
        enum State {
                NOT_CONNECTED,
                SENDING_REQUEST,
@@ -84,27 +94,33 @@ private:
 
        // If <pending_data> starts with a Metacube header,
        // this is true.
-       bool has_metacube_header;
+       bool has_metacube_header = false;
 
        // The socket we are downloading on (or -1).
-       int sock;
+       int sock = -1;
 
        // Mutex protecting <stats>.
-       mutable pthread_mutex_t stats_mutex;
+       mutable std::mutex stats_mutex;
 
        // The current statistics for this connection. Protected by <stats_mutex>.
        InputStats stats;
 
        // Number of (started) connection attempts since last data byte was successfully read.
-       unsigned num_connection_attempts;
+       unsigned num_connection_attempts = 0;
 
        // If set, don't log anything related to connections.
        // (Only set if we've had enough unsuccessful connection attempts.)
-       bool suppress_logging;
+       bool suppress_logging = false;
 
        // Last time we made a connection with logging enabled.
        // (Initially at some point before the epoch.)
-       timespec last_verbose_connection;
+       timespec last_verbose_connection { -3600, 0 };
+
+       // If we've received a Metacube2 PTS metadata block, it belongs to the
+       // next regular block we receive, and is stored here in the meantime.
+       // If we haven't received one yet (or we've already received the
+       // corresponding data block), this is empty, ie., timebase_num == 0.
+       RationalPTS next_block_pts;
 };
 
 #endif  // !defined(_HTTPINPUT_H)