Pull the file muxing out of the HTTPD. (It was pretty ugly all along.)

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index d546feec22180ab4c9bf7fe10be417d9f7b6dff5..55a81c20e59ffa125ef59a28320e98aa0f34c494 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -1,8 +1,7 @@
 #ifndef _HTTPD_H
 #define _HTTPD_H
 
-// A class dealing with stream output, both to HTTP (thus the class name)
-// and to local output files. Since we generally have very few outputs
+// A class dealing with stream output to HTTP. Since we generally have very few outputs
 // (end clients are not meant to connect directly to our stream; it should be
 // transcoded by something else and then sent to a reflector), we don't need to
 // care a lot about performance. Thus, we solve this by the simplest possible
@@ -16,8 +15,8 @@
 #include <deque>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <string>
-#include <vector>
 
 struct MHD_Connection;
 
@@ -27,9 +26,11 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 
+#include "mux.h"
+
 class HTTPD {
 public:
-       HTTPD(const char *output_filename, int width, int height);
+       HTTPD(int width, int height);
        void start(int port);
        void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
 
@@ -46,20 +47,14 @@ private:
 
        static void free_stream(void *cls);
 
-       class Mux {
-       public:
-               Mux(AVFormatContext *avctx, int width, int height);  // Takes ownership of avctx.
-               ~Mux();
-               void add_packet(const AVPacket &pkt, int64_t pts, int64_t dts);
+       static void request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
+
+       void request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
 
-       private:
-               AVFormatContext *avctx;
-               AVStream *avstream_video, *avstream_audio;
-       };
 
        class Stream {
        public:
-               Stream(AVOutputFormat *oformat, int width, int height);
+               Stream(AVOutputFormat *oformat, int width, int height, int time_base);
 
                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);
@@ -70,18 +65,18 @@ private:
                static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
                int write_packet(uint8_t *buf, int buf_size);
 
-               std::unique_ptr<Mux> mux;
-
                std::mutex buffer_mutex;
                std::condition_variable has_buffered_data;
                std::deque<std::string> buffered_data;  // 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 <mutex>.
+
+               std::unique_ptr<Mux> mux;  // Must come last to be destroyed before buffered_data, since the destructor can write bytes.
        };
 
-       std::vector<Stream *> streams;  // Not owned.
+       std::mutex streams_mutex;
+       std::set<Stream *> streams;  // Not owned.
 
        int width, height;
-       std::unique_ptr<Mux> file_mux;  // To local disk.
 };
 
 #endif  // !defined(_HTTPD_H)