Add support for forced prebuffering.

[cubemap] / stream.cpp

diff --git a/stream.cpp b/stream.cpp
index 6bb86c41e0fc8332bfe4f08a207708d3613fef45..df131932435fd9a095edc50ec50c3c099a66a5a7 100644 (file)
--- 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)
 {
@@ -59,25 +60,8 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
                exit(1);
        }
 
-       // Split old-style headers into HTTP and video headers.
-       if (!serialized.header().empty()) {
-               string header = serialized.header();
-               size_t split = header.find("\r\n\r\n");
-               if (split == string::npos) {
-                       http_header = header;
-                       stream_header = "";
-               } else {
-                       http_header = header.substr(0, split + 2);  // Split off the second \r\n.
-                       stream_header = header.substr(split, string::npos);
-               }
-       }
-
-       // Older versions did not set last_suitable_starting_point.
-       if (serialized.has_last_suitable_starting_point()) {
-               last_suitable_starting_point = serialized.last_suitable_starting_point();
-       } else {
-               last_suitable_starting_point = bytes_received;
-       }
+       assert(serialized.has_last_suitable_starting_point());
+       last_suitable_starting_point = serialized.last_suitable_starting_point();
 
        pthread_mutex_init(&queued_data_mutex, NULL);
 }
@@ -89,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);