X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;fp=server.h;h=da2076498f010785ae8d1a8954dc5d5920a7d83b;hp=2fe4f15184a62699c6bcb8c89606ffa95f9559e8;hb=20e85bd6901355cc40a6cfb4c0deb7232d9aa63f;hpb=061988af511f42da3cd584b4d983177504ddc177

diff --git a/server.h b/server.h
index 2fe4f15..da20764 100644
--- a/server.h
+++ b/server.h
@@ -52,20 +52,32 @@ public:
 	// and the order between them are undefined.
 	// XXX: header should ideally be ordered with respect to data.
 	void add_client_deferred(int sock, Acceptor *acceptor);
-	void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags);
+	void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags, const RationalPTS &pts);
 
 	// These should not be called while running, since that would violate
 	// threading assumptions (ie., that epoll is only called from one thread
 	// at the same time).
 	CubemapStateProto serialize(std::unordered_map<const std::string *, size_t> *short_response_pool);
 	void add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses);
-	int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding);
+	int add_stream(const std::string &url,
+	               const std::string &hls_url,
+	               size_t bytes_received,
+	               size_t prebuffering_bytes,
+	               Stream::Encoding encoding,
+	               Stream::Encoding src_encoding,
+	               unsigned hls_frag_duration,
+	               size_t hls_backlog_margin,
+	               const std::string &allow_origin);
 	int add_stream_from_serialized(const StreamProto &stream, int data_fd);
 	int lookup_stream_by_url(const std::string &url) const;
 	void set_backlog_size(int stream_index, size_t new_size);
 	void set_prebuffering_bytes(int stream_index, size_t new_amount);
 	void set_encoding(int stream_index, Stream::Encoding encoding);
 	void set_src_encoding(int stream_index, Stream::Encoding encoding);
+	void set_hls_frag_duration(int stream_index, unsigned hls_frag_duration);
+	void set_hls_backlog_margin(int stream_index, size_t hls_backlog_margin);
+	void set_allow_origin(int stream_index, const std::string &allow_origin);
+	void register_hls_url(int stream_index, const std::string &hls_url);
 	void add_gen204(const std::string &url, const std::string &allow_origin);
 	void create_tls_context_for_acceptor(const Acceptor *acceptor);
 
@@ -94,7 +106,7 @@ private:
 	std::vector<std::unique_ptr<Stream>> streams;
 
 	// Map from URL to index into <streams>.
-	std::map<std::string, int> stream_url_map;
+	std::map<std::string, int> stream_url_map, stream_hls_url_map;
 
 	// Map from URL to CORS Allow-Origin header (or empty string).
 	std::map<std::string, std::string> ping_url_map;
@@ -170,9 +182,13 @@ private:
 	// Parse the HTTP request. Returns a HTTP status code (200/204/400/404).
 	int parse_request(Client *client);
 
-	// Construct the HTTP header, and set the client into
+	// Construct the HTTP header for a regular stream, and set the client into
 	// the SENDING_HEADER state.
-	void construct_header(Client *client);
+	void construct_stream_header(Client *client);
+
+	// Construct a HLS playlist (or get it from the cache), and set the client into
+	// the SENDING_HEADER state.
+	void construct_hls_playlist(Client *client);
 
 	// Construct a generic error with the given line, and set the client into
 	// the SENDING_SHORT_RESPONSE state.