Write 1.4.0 changelog.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 55a81c20e59ffa125ef59a28320e98aa0f34c494..902745a5845b85d5e873914189057846c3a90585 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -1,38 +1,32 @@
 #ifndef _HTTPD_H
 #define _HTTPD_H
 
-// 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
-// way, namely having one ffmpeg mux per output.
+// A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <condition_variable>
 #include <deque>
-#include <memory>
 #include <mutex>
 #include <set>
 #include <string>
 
 struct MHD_Connection;
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavformat/avio.h>
-}
-
-#include "mux.h"
+struct MHD_Daemon;
 
 class HTTPD {
 public:
-       HTTPD(int width, int height);
+       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, int64_t pts, int64_t dts);
+       void add_data(const char *buf, size_t size, bool keyframe);
 
 private:
        static int answer_to_connection_thunk(void *cls, MHD_Connection *connection,
@@ -47,36 +41,43 @@ private:
 
        static void free_stream(void *cls);
 
-       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);
-
 
        class Stream {
        public:
-               Stream(AVOutputFormat *oformat, int width, int height, int time_base);
+               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, int64_t pts, int64_t dts);
+               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);
+               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>.
-
-               std::unique_ptr<Mux> mux;  // Must come last to be destroyed before buffered_data, since the destructor can write bytes.
+               size_t seen_keyframe = false;
        };
 
+       MHD_Daemon *mhd = nullptr;
        std::mutex streams_mutex;
        std::set<Stream *> streams;  // Not owned.
-
-       int width, height;
+       std::string header;
 };
 
 #endif  // !defined(_HTTPD_H)