Release Nageru 1.7.2.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 878a184d12858341287a17f20d22e03a1e19bc83..57c649b61158c6f73b498aeca6556b97bc52f179 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -16,6 +16,10 @@
 #include <unordered_map>
 #include <utility>
 
+extern "C" {
+#include <libavutil/rational.h>
+}
+
 struct MHD_Connection;
 struct MHD_Daemon;
 
@@ -33,12 +37,17 @@ public:
        }
 
        // Should be called before start() (due to threading issues).
-       void add_endpoint(const std::string &url, const EndpointCallback &callback) {
-               endpoints[url] = callback;
+       enum CORSPolicy {
+               NO_CORS_POLICY,
+               ALLOW_ALL_ORIGINS
+       };
+       void add_endpoint(const std::string &url, const EndpointCallback &callback, CORSPolicy cors_policy) {
+               endpoints[url] = Endpoint{ callback, cors_policy };
        }
 
        void start(int port);
-       void add_data(const char *buf, size_t size, bool keyframe);
+       void stop();
+       void add_data(const char *buf, size_t size, bool keyframe, int64_t time, AVRational timebase);
        int64_t get_num_connected_clients() const {
                return metric_num_connected_clients.load();
        }
@@ -73,7 +82,7 @@ private:
                        DATA_TYPE_KEYFRAME,
                        DATA_TYPE_OTHER
                };
-               void add_data(const char *buf, size_t size, DataType data_type);
+               void add_data(const char *buf, size_t size, DataType data_type, int64_t time, AVRational timebase);
                void stop();
                HTTPD *get_parent() const { return parent; }
 
@@ -92,7 +101,11 @@ private:
        MHD_Daemon *mhd = nullptr;
        std::mutex streams_mutex;
        std::set<Stream *> streams;  // Not owned.
-       std::unordered_map<std::string, EndpointCallback> endpoints;
+       struct Endpoint {
+               EndpointCallback callback;
+               CORSPolicy cors_policy;
+       };
+       std::unordered_map<std::string, Endpoint> endpoints;
        std::string header;
 
        // Metrics.