X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.h;h=890cc9ef91256b92145e58dcc3425831fa0747fc;hp=894d8e946a3235b3a23fb32382f4364b38e2187f;hb=e3f2936e3c9ff3b5569759c1aaed16f03bf728f8;hpb=239a9eab1a2468b401183745a24b2fbd590a6998

diff --git a/httpinput.h b/httpinput.h
index 894d8e9..890cc9e 100644
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,23 +1,35 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
-#include <vector>
+#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 &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();
@@ -25,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);
 
@@ -36,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,
@@ -45,12 +63,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,18 +83,44 @@ 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;
 
 	// 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 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)