X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=shared%2Fhttpd.h;h=dae5cad627b7e056e41fe3f1901a51201f4fc066;hb=bcd177e1daf5a63d7bf877bc5d30d8803dfd472c;hp=8c3c8105c5b959155abbd19d95b10a1fcfc0ffa6;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru

diff --git a/shared/httpd.h b/shared/httpd.h
index 8c3c810..dae5cad 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,8 @@ extern "C" {
 #include <libavutil/rational.h>
 }
 
+#include "shared/shared_defs.h"
+
 struct MHD_Connection;
 struct MHD_Daemon;
 
@@ -34,13 +38,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,11 +66,19 @@ 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();
 	}
+	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,
@@ -79,8 +99,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);
@@ -93,7 +113,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;
@@ -103,11 +123,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.
@@ -116,10 +139,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_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)