Add functionality for MJPEG export.

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index 9782dca7ba7807ab45c0e1994cd6a25642623086..8d33e75a4f6b5bde8e6f8b79aa23ffa007e8351f 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -30,13 +30,7 @@ HTTPD::HTTPD()
 
 HTTPD::~HTTPD()
 {
-       if (mhd) {
-               MHD_quiesce_daemon(mhd);
-               for (Stream *stream : streams) {
-                       stream->stop();
-               }
-               MHD_stop_daemon(mhd);
-       }
+       stop();
 }
 
 void HTTPD::start(int port)
@@ -52,11 +46,25 @@ void HTTPD::start(int port)
        }
 }
 
-void HTTPD::add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase)
+void HTTPD::stop()
+{
+       if (mhd) {
+               MHD_quiesce_daemon(mhd);
+               for (Stream *stream : streams) {
+                       stream->stop();
+               }
+               MHD_stop_daemon(mhd);
+               mhd = nullptr;
+       }
+}
+
+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);
+               }
        }
 }
 
@@ -81,6 +89,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();
@@ -115,8 +129,8 @@ 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);