X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=httpd.h;h=1ff5c51108facf03ca1b0d8fc2f076a63938e595;hb=817fffe1ef3bd87f2387395f49487cf5255d8daf;hp=878a184d12858341287a17f20d22e03a1e19bc83;hpb=2f4224d7c48b3b22bcb24eb622fe6705fa16375f;p=nageru

diff --git a/httpd.h b/httpd.h
index 878a184..1ff5c51 100644
--- 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;
 
@@ -27,18 +31,29 @@ public:
 	HTTPD();
 	~HTTPD();
 
+	enum StreamType {
+		MAIN_STREAM,
+		MULTICAM_STREAM,
+		NUM_STREAM_TYPES
+	};
+
 	// Should be called before start().
-	void set_header(const std::string &data) {
-		header = data;
+	void set_header(StreamType stream_type, const std::string &data) {
+		header[stream_type] = data;
 	}
 
 	// 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(StreamType stream_type, 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();
 	}
@@ -63,7 +78,8 @@ private:
 			FRAMING_RAW,
 			FRAMING_METACUBE
 		};
-		Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
+		Stream(HTTPD *parent, Framing framing, StreamType stream_type)
+			: parent(parent), framing(framing), stream_type(stream_type) {}
 
 		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);
@@ -73,9 +89,10 @@ 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; }
+		StreamType get_stream_type() const { return stream_type; }
 
 	private:
 		HTTPD *parent;
@@ -87,13 +104,18 @@ private:
 		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;
+		StreamType stream_type;
 	};
 
 	MHD_Daemon *mhd = nullptr;
 	std::mutex streams_mutex;
 	std::set<Stream *> streams;  // Not owned.
-	std::unordered_map<std::string, EndpointCallback> endpoints;
-	std::string header;
+	struct Endpoint {
+		EndpointCallback callback;
+		CORSPolicy cors_policy;
+	};
+	std::unordered_map<std::string, Endpoint> endpoints;
+	std::string header[NUM_STREAM_TYPES];
 
 	// Metrics.
 	std::atomic<int64_t> metric_num_connected_clients{0};