X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=d762869e281572278c3603afc0bbd70d657ceb19;hp=a4aa642b1b81cbb5a336cd138e3fe8d94122c6f7;hb=9abb89bcf7940e2ada9d708f86a218a56334f68d;hpb=9bb20b7dd0bcea9de1daf4cac29263d74924ce5a diff --git a/stream.h b/stream.h index a4aa642..d762869 100644 --- a/stream.h +++ b/stream.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -15,20 +16,30 @@ class StreamProto; struct Client; struct Stream { - Stream(const std::string &stream_id, size_t backlog_size); + // Must be in sync with StreamConfig::Encoding. + enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE }; + + Stream(const std::string &stream_id, size_t backlog_size, Encoding encoding); ~Stream(); // Serialization/deserialization. - Stream(const StreamProto &serialized); + Stream(const StreamProto &serialized, int data_fd); StreamProto serialize(); // Changes the backlog size, restructuring the data as needed. void set_backlog_size(size_t new_size); - std::string stream_id; + std::string url; + + // The HTTP response header, without the trailing double newline. + std::string http_header; + + // The video stream header (if any). + std::string stream_header; - // The HTTP response header, plus the video stream header (if any). - std::string header; + // What encoding we apply to the outgoing data (usually raw, but can also + // be Metacube, for reflecting to another Cubemap instance). + Encoding encoding; // The stream data itself, stored in a circular buffer. // @@ -59,20 +70,31 @@ struct Stream { // What pool to fetch marks from, or NULL. MarkPool *mark_pool; + // Queued data, if any. Protected by the owning Server's . + // The data pointers in the iovec are owned by us. + std::vector queued_data; + // Put client to sleep, since there is no more data for it; we will on // longer listen on POLLOUT until we get more data. Also, it will be put // in the list of clients to wake up when we do. void put_client_to_sleep(Client *client); - // Add more input data to the stream. You should probably call wake_up_all_clients() - // after that. - void add_data(const char *data, ssize_t bytes); + // Add more data to , adding Metacube headers if needed. + // Does not take ownership of . + // You should hold the owning Server's . + void add_data_deferred(const char *data, size_t bytes); - // We have more data, so mark all clients that are sleeping as ready to go. - void wake_up_all_clients(); + // Add queued data to the stream, if any. + // You should hold the owning Server's _and_ . + void process_queued_data(); private: Stream(const Stream& other); + + // Adds data directly to the stream file descriptor, without adding headers or + // going through . + // You should hold the owning Server's . + void add_data_raw(const std::vector &data); }; #endif // !defined(_STREAM_H)