X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=3a9474a78bf0fcacebd3b7fdfe31dafc35a7303c;hp=d29b9246a06f76a776385bad4290f69b6cb171be;hb=b2d3112addcc8da422f08708db29435b45d85afa;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91

diff --git a/stream.h b/stream.h
index d29b924..3a9474a 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.
@@ -64,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;
@@ -81,11 +88,8 @@ 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.
-	int pacing_rate;
+	uint32_t pacing_rate;
 
 	// Queued data, if any. Protected by <queued_data_mutex>.
 	// The data pointers in the iovec are owned by us.
@@ -93,7 +97,7 @@ struct Stream {
 
 	// Index of the last element in queued_data that is suitable to start streaming at.
 	// -1 if none. Protected by <queued_data_mutex>.
-	int queued_data_last_starting_point;
+	int queued_data_last_starting_point_index;
 
 	// 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