X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fhttpd.h;h=8d2a05eb1df89f56e8577234ed8a00b460d8d620;hb=5e77e932e6a5795882ecba1b3f62a26523863179;hp=2a628594c91beb2d556c8df3459ac526287f7d50;hpb=0c95058b25adce6f634279bc7feb04158242e63e;p=nageru

diff --git a/shared/httpd.h b/shared/httpd.h
index 2a62859..8d2a05e 100644
--- a/shared/httpd.h
+++ b/shared/httpd.h
@@ -3,6 +3,7 @@
 
 // A class dealing with stream output to HTTP.
 
+#include <assert.h>
 #include <atomic>
 #include <condition_variable>
 #include <deque>
@@ -13,6 +14,7 @@
 #include <stdint.h>
 #include <string>
 #include <sys/types.h>
+#include <map>
 #include <unordered_map>
 #include <utility>
 
@@ -20,6 +22,10 @@ extern "C" {
 #include <libavutil/rational.h>
 }
 
+#include <microhttpd.h>
+
+#include "shared/shared_defs.h"
+
 struct MHD_Connection;
 struct MHD_Daemon;
 
@@ -34,13 +40,21 @@ public:
 	enum StreamType {
 		MAIN_STREAM,
 		MULTICAM_STREAM,
-		NUM_STREAM_TYPES
+		SIPHON_STREAM   // The only one that can have stream_index != 0.
+	};
+	struct StreamID {
+		StreamType type;
+		unsigned index;
+
+		bool operator< (const StreamID &other) const {
+			if (type != other.type)
+				return type < other.type;
+			return index < other.index;
+		}
+		bool operator== (const StreamID &other) const {
+			return (type == other.type && index == other.index);
+		}
 	};
-
-	// Should be called before start().
-	void set_header(StreamType stream_type, const std::string &data) {
-		header[stream_type] = data;
-	}
 
 	// Should be called before start() (due to threading issues).
 	enum CORSPolicy {
@@ -54,7 +68,8 @@ public:
 
 	void start(int port);
 	void stop();
-	void add_data(StreamType stream_type, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase);
+	void set_header(StreamID stream_id, const std::string &data);
+	void add_data(StreamID stream_id, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase);
 	int64_t get_num_connected_clients() const
 	{
 		return metric_num_connected_clients.load();
@@ -62,17 +77,29 @@ public:
 	int64_t get_num_connected_multicam_clients() const {
 		return metric_num_connected_multicam_clients.load();
 	}
+	int64_t get_num_connected_siphon_clients(unsigned stream_idx) const {
+		assert(stream_idx < MAX_VIDEO_CARDS);
+		return metric_num_connected_siphon_clients[stream_idx].load();
+	}
 
 private:
-	static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
-	                                      const char *url, const char *method,
-	                                      const char *version, const char *upload_data,
-	                                      size_t *upload_data_size, void **con_cls);
-
-	int answer_to_connection(MHD_Connection *connection,
-	                         const char *url, const char *method,
-	                         const char *version, const char *upload_data,
-	                         size_t *upload_data_size, void **con_cls);
+	// libmicrohttpd 0.9.71 broke the type of MHD_YES/MHD_NO, causing
+	// compilation errors for C++ and undefined behavior for C.
+#if MHD_VERSION >= 0x00097002
+	using MHD_Result = ::MHD_Result;
+#else
+	using MHD_Result = int;
+#endif
+
+	static MHD_Result answer_to_connection_thunk(void *cls, MHD_Connection *connection,
+	                                             const char *url, const char *method,
+	                                             const char *version, const char *upload_data,
+	                                             size_t *upload_data_size, void **con_cls);
+
+	MHD_Result answer_to_connection(MHD_Connection *connection,
+	                                const char *url, const char *method,
+	                                const char *version, const char *upload_data,
+	                                size_t *upload_data_size, void **con_cls);
 
 	static void free_stream(void *cls);
 
@@ -82,8 +109,8 @@ private:
 			FRAMING_RAW,
 			FRAMING_METACUBE
 		};
-		Stream(HTTPD *parent, Framing framing, StreamType stream_type)
-			: parent(parent), framing(framing), stream_type(stream_type) {}
+		Stream(HTTPD *parent, Framing framing, StreamID stream_id)
+			: parent(parent), framing(framing), stream_id(stream_id) {}
 
 		static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
 		ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
@@ -96,7 +123,7 @@ private:
 		void add_data(const char *buf, size_t size, DataType data_type, int64_t time, AVRational timebase);
 		void stop();
 		HTTPD *get_parent() const { return parent; }
-		StreamType get_stream_type() const { return stream_type; }
+		StreamID get_stream_id() const { return stream_id; }
 
 	private:
 		HTTPD *parent;
@@ -106,11 +133,14 @@ private:
 		bool should_quit = false;  // Under <buffer_mutex>.
 		std::condition_variable has_buffered_data;
 		std::deque<std::string> buffered_data;  // Protected by <buffer_mutex>.
-		size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <mutex>.
+		size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <buffer_mutex>.
+		size_t buffered_data_bytes = 0;  // The sum of all size() in buffered_data. Protected by <buffer_mutex>.
 		size_t seen_keyframe = false;
-		StreamType stream_type;
+		StreamID stream_id;
 	};
 
+	void add_data_locked(StreamID stream_id, const char *buf, size_t size, Stream::DataType data_type, int64_t time, AVRational timebase);
+
 	MHD_Daemon *mhd = nullptr;
 	std::mutex streams_mutex;
 	std::set<Stream *> streams;  // Not owned.
@@ -119,11 +149,12 @@ private:
 		CORSPolicy cors_policy;
 	};
 	std::unordered_map<std::string, Endpoint> endpoints;
-	std::string header[NUM_STREAM_TYPES];
+	std::map<StreamID, std::string> header;
 
 	// Metrics.
 	std::atomic<int64_t> metric_num_connected_clients{0};
 	std::atomic<int64_t> metric_num_connected_multicam_clients{0};
+	std::atomic<int64_t> metric_num_connected_siphon_clients[MAX_VIDEO_CARDS] {{0}};
 };
 
 #endif  // !defined(_HTTPD_H)