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()
}
}
-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);
+ }
}
}
} 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();
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.
{
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;