X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=4947c3fbd7fdf11a43b8456a78f4a0c80812c58f;hp=f2ba5d43dccc561ef530cf2445ea302f3a555e05;hb=6889a665614e926437484a556124a5ff60363568;hpb=1c6b126fe95eb0465383ba225da764757eba05c0

diff --git a/stream.h b/stream.h
index f2ba5d4..4947c3f 100644
--- a/stream.h
+++ b/stream.h
@@ -11,7 +11,6 @@
 #include <string>
 #include <vector>
 
-class MarkPool;
 class StreamProto;
 struct Client;
 
@@ -24,7 +23,7 @@ struct Stream {
 	// 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(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding);
 	~Stream();
 
 	// Serialization/deserialization.
@@ -34,6 +33,11 @@ struct Stream {
 	// Changes the backlog size, restructuring the data as needed.
 	void set_backlog_size(size_t new_size);
 
+	// Mutex protecting <queued_data> and <queued_data_last_starting_point>.
+	// Note that if you want to hold both this and the owning server's
+	// <mutex> you will need to take <mutex> before this one.
+	mutable pthread_mutex_t queued_data_mutex;
+
 	std::string url;
 
 	// The HTTP response header, without the trailing double newline.
@@ -59,6 +63,14 @@ struct Stream {
 	// How many bytes <data_fd> can hold (the buffer size).
 	size_t backlog_size;
 
+	// How many bytes we need to have in the backlog before we start
+	// sending (in practice, we will then send all of them at once,
+	// and then start sending at the normal rate thereafter).
+	// This is basically to force a buffer on the client, which can help
+	// if the client expects us to be able to fill up the buffer much
+	// faster than realtime (ie., it expects a static file).
+	size_t prebuffering_bytes;
+
 	// How many bytes this stream have received. Can very well be larger
 	// than <backlog_size>, since the buffer wraps.
 	size_t bytes_received;
@@ -76,15 +88,15 @@ struct Stream {
 	// <sleeping_clients>).
 	std::vector<Client *> to_process;
 
-	// What pool to fetch marks from, or NULL.
-	MarkPool *mark_pool;
+	// Maximum pacing rate for the stream.
+	uint32_t pacing_rate;
 
-	// Queued data, if any. Protected by the owning Server's <queued_data_mutex>.
+	// Queued data, if any. Protected by <queued_data_mutex>.
 	// The data pointers in the iovec are owned by us.
 	std::vector<iovec> queued_data;
 
 	// Index of the last element in queued_data that is suitable to start streaming at.
-	// -1 if none.
+	// -1 if none. Protected by <queued_data_mutex>.
 	int queued_data_last_starting_point;
 
 	// Put client to sleep, since there is no more data for it; we will on
@@ -94,11 +106,10 @@ struct Stream {
 
 	// Add more data to <queued_data>, adding Metacube headers if needed.
 	// Does not take ownership of <data>.
-	// You should hold the owning Server's <queued_data_mutex>.
 	void add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
 
 	// Add queued data to the stream, if any.
-	// You should hold the owning Server's <mutex> _and_ <queued_data_mutex>.
+	// You should hold the owning Server's <mutex>.
 	void process_queued_data();
 
 private: