X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fhttpd.h;h=6c9a254307aee03f5b15b347e32c7a521a863b9a;hb=9ffd4f03f314cc6e0254449593def95c9bc203d6;hp=5b2b266c36e70788b2daabe018251d50392fcd7a;hpb=539609eb56b496e6eff8a5e0a92fa0325936a5d7;p=nageru

diff --git a/shared/httpd.h b/shared/httpd.h
index 5b2b266..6c9a254 100644
--- a/shared/httpd.h
+++ b/shared/httpd.h
@@ -31,10 +31,15 @@ public:
 	HTTPD();
 	~HTTPD();
 
+	enum StreamType {
+		MAIN_STREAM,
+		MULTICAM_STREAM,
+		NUM_STREAM_TYPES
+	};
+
 	// Should be called before start().
-	void set_header(const std::string &data)
-	{
-		header = data;
+	void set_header(StreamType stream_type, const std::string &data) {
+		header[stream_type] = data;
 	}
 
 	// Should be called before start() (due to threading issues).
@@ -49,11 +54,14 @@ public:
 
 	void start(int port);
 	void stop();
-	void add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase);
+	void add_data(StreamType stream_type, 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();
+	}
 
 private:
 	static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -74,8 +82,8 @@ private:
 			FRAMING_RAW,
 			FRAMING_METACUBE
 		};
-		Stream(HTTPD *parent, Framing framing)
-			: parent(parent), framing(framing) {}
+		Stream(HTTPD *parent, Framing framing, StreamType stream_type)
+			: parent(parent), framing(framing), stream_type(stream_type) {}
 
 		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);
@@ -88,6 +96,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; }
 
 	private:
 		HTTPD *parent;
@@ -97,8 +106,10 @@ 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;
 	};
 
 	MHD_Daemon *mhd = nullptr;
@@ -109,10 +120,11 @@ private:
 		CORSPolicy cors_policy;
 	};
 	std::unordered_map<std::string, Endpoint> endpoints;
-	std::string header;
+	std::string header[NUM_STREAM_TYPES];
 
 	// 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};
 };
 
 #endif  // !defined(_HTTPD_H)