Write 1.4.0 changelog.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 0a092aaadd3e7c3a926c2920925277764958a858..902745a5845b85d5e873914189057846c3a90585 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -1,22 +1,32 @@
 #ifndef _HTTPD_H
 #define _HTTPD_H
 
-#include <microhttpd.h>
+// A class dealing with stream output to HTTP.
+
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <condition_variable>
 #include <deque>
-#include <string>
 #include <mutex>
-#include <condition_variable>
-#include <vector>
+#include <set>
+#include <string>
 
-extern "C" {
-#include <libavformat/avformat.h>
-}
+struct MHD_Connection;
+struct MHD_Daemon;
 
 class HTTPD {
 public:
        HTTPD();
+       ~HTTPD();
+
+       // Should be called before start().
+       void set_header(const std::string &data) {
+               header = data;
+       }
+
        void start(int port);
-       void add_packet(const AVPacket &pkt);
+       void add_data(const char *buf, size_t size, bool keyframe);
 
 private:
        static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -31,31 +41,43 @@ private:
 
        static void free_stream(void *cls);
 
+
        class Stream {
        public:
-               Stream(AVOutputFormat *oformat);
-               ~Stream();
+               enum Framing {
+                       FRAMING_RAW,
+                       FRAMING_METACUBE
+               };
+               Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
 
                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);
 
-               void add_packet(const AVPacket &pkt);
+               enum DataType {
+                       DATA_TYPE_HEADER,
+                       DATA_TYPE_KEYFRAME,
+                       DATA_TYPE_OTHER
+               };
+               void add_data(const char *buf, size_t size, DataType data_type);
+               void stop();
+               HTTPD *get_parent() const { return parent; }
 
        private:
-               static int write_packet_thunk(void *opaque, uint8_t *buf, int buf_size);
-               int write_packet(uint8_t *buf, int buf_size);
-
-               AVIOContext *avio;
-               AVFormatContext *avctx;
-               AVStream *avstream_video, *avstream_audio;
+               HTTPD *parent;
+               Framing framing;
 
                std::mutex buffer_mutex;
+               bool should_quit = false;  // Under <buffer_mutex>.
                std::condition_variable has_buffered_data;
-               std::deque<std::string> buffered_data;  // Protected by <mutex>.
+               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 seen_keyframe = false;
        };
 
-       std::vector<Stream *> streams;  // Not owned.
+       MHD_Daemon *mhd = nullptr;
+       std::mutex streams_mutex;
+       std::set<Stream *> streams;  // Not owned.
+       std::string header;
 };
 
 #endif  // !defined(_HTTPD_H)