X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=df131932435fd9a095edc50ec50c3c099a66a5a7;hp=23f478902d3f6f1dd055511c6b33562bd8860c0a;hb=b57530552825a13a3cd1924bda99e5e237c722a4;hpb=9bb62cbda887f69e570a3ea0fd28b564c5adc2c9

diff --git a/stream.cpp b/stream.cpp
index 23f4789..df13193 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,14 +19,14 @@
 
 using namespace std;
 
-Stream::Stream(const string &url, size_t backlog_size, Encoding encoding)
+Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding)
 	: url(url),
 	  encoding(encoding),
 	  data_fd(make_tempfile("")),
           backlog_size(backlog_size),
+	  prebuffering_bytes(prebuffering_bytes),
 	  bytes_received(0),
 	  last_suitable_starting_point(-1),
-	  mark_pool(NULL),
 	  pacing_rate(~0U),
 	  queued_data_last_starting_point(-1)
 {
@@ -50,8 +51,8 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
 	  encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
 	  data_fd(data_fd),
 	  backlog_size(serialized.backlog_size()),
+	  prebuffering_bytes(serialized.prebuffering_bytes()),
 	  bytes_received(serialized.bytes_received()),
-	  mark_pool(NULL),
 	  pacing_rate(~0U),
 	  queued_data_last_starting_point(-1)
 {
@@ -72,6 +73,7 @@ StreamProto Stream::serialize()
 	serialized.set_stream_header(stream_header);
 	serialized.add_data_fds(data_fd);
 	serialized.set_backlog_size(backlog_size);
+	serialized.set_prebuffering_bytes(prebuffering_bytes);
 	serialized.set_bytes_received(bytes_received);
 	serialized.set_last_suitable_starting_point(last_suitable_starting_point);
 	serialized.set_url(url);