X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.h;h=1ee1f8f5c4d134e3066ec65f6923b74effc2489a;hp=2273e7dd2782535684fa92be5c4b5ad86140d52a;hb=e713e8e65d60ea97c788418692b22ac328a610b0;hpb=cbdce14899459aca2e5331b6e1a969c359d28880

diff --git a/httpinput.h b/httpinput.h
index 2273e7d..1ee1f8f 100644
--- a/httpinput.h
+++ b/httpinput.h
@@ -2,16 +2,22 @@
 #define _HTTPINPUT_H 1
 
 #include <stddef.h>
+#include <sys/types.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);
+	HTTPInput(const std::string &url, Input::Encoding encoding);
 
 	// Serialization/deserialization.
 	HTTPInput(const InputProto &serialized);
@@ -32,6 +38,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);
 
@@ -43,6 +53,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,
@@ -58,6 +70,9 @@ private:
 	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;
@@ -80,16 +95,36 @@ 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;
+
+	// pid of the cihld process (or -1).
+	pid_t child_pid = -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 = 0;
+
+	// If set, don't log anything related to connections.
+	// (Only set if we've had enough unsuccessful connection attempts.)
+	bool suppress_logging = false;
+
+	// Last time we made a connection with logging enabled.
+	// (Initially at some point before the epoch.)
+	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)