X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fhttpd.cpp;h=782d18b7e2f7b2924bbf4e23365494dcfe423be0;hb=0c95058b25adce6f634279bc7feb04158242e63e;hp=28ed783872ff2ab18bf1b1bf8e175b0dd520835c;hpb=539609eb56b496e6eff8a5e0a92fa0325936a5d7;p=nageru

diff --git a/shared/httpd.cpp b/shared/httpd.cpp
index 28ed783..782d18b 100644
--- a/shared/httpd.cpp
+++ b/shared/httpd.cpp
@@ -26,6 +26,7 @@ using namespace std;
 HTTPD::HTTPD()
 {
 	global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
+	global_metrics.add("num_connected_multicam_clients", &metric_num_connected_multicam_clients, Metrics::TYPE_GAUGE);
 }
 
 HTTPD::~HTTPD()
@@ -58,11 +59,13 @@ void HTTPD::stop()
 	}
 }
 
-void HTTPD::add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
+void HTTPD::add_data(StreamType stream_type, const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
 {
 	unique_lock<mutex> lock(streams_mutex);
 	for (Stream *stream : streams) {
-		stream->add_data(buf, size, keyframe ? Stream::DATA_TYPE_KEYFRAME : Stream::DATA_TYPE_OTHER, time, timebase);
+		if (stream->get_stream_type() == stream_type) {
+			stream->add_data(buf, size, keyframe ? Stream::DATA_TYPE_KEYFRAME : Stream::DATA_TYPE_OTHER, time, timebase);
+		}
 	}
 }
 
@@ -87,6 +90,12 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 	} else {
 		framing = HTTPD::Stream::FRAMING_RAW;
 	}
+	HTTPD::StreamType stream_type;
+	if (strcmp(url, "/multicam.mp4") == 0) {
+		stream_type = HTTPD::StreamType::MULTICAM_STREAM;
+	} else {
+		stream_type = HTTPD::StreamType::MAIN_STREAM;
+	}
 
 	if (strcmp(url, "/metrics") == 0) {
 		string contents = global_metrics.serialize();
@@ -121,13 +130,16 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
 		return ret;
 	}
 
-	HTTPD::Stream *stream = new HTTPD::Stream(this, framing);
-	stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER, AV_NOPTS_VALUE, AVRational{ 1, 0 });
+	HTTPD::Stream *stream = new HTTPD::Stream(this, framing, stream_type);
+	stream->add_data(header[stream_type].data(), header[stream_type].size(), Stream::DATA_TYPE_HEADER, AV_NOPTS_VALUE, AVRational{ 1, 0 });
 	{
 		unique_lock<mutex> lock(streams_mutex);
 		streams.insert(stream);
 	}
 	++metric_num_connected_clients;
+	if (stream_type == HTTPD::StreamType::MULTICAM_STREAM) {
+		++metric_num_connected_multicam_clients;
+	}
 	*con_cls = stream;
 
 	// Does not strictly have to be equal to MUX_BUFFER_SIZE.
@@ -148,6 +160,9 @@ void HTTPD::free_stream(void *cls)
 {
 	HTTPD::Stream *stream = (HTTPD::Stream *)cls;
 	HTTPD *httpd = stream->get_parent();
+	if (stream->get_stream_type() == HTTPD::StreamType::MULTICAM_STREAM) {
+		--httpd->metric_num_connected_multicam_clients;
+	}
 	{
 		unique_lock<mutex> lock(httpd->streams_mutex);
 		delete stream;