Rename queued_data_last_starting_point to queued_data_last_starting_point_index,...

[cubemap] / stream.cpp

diff --git a/stream.cpp b/stream.cpp
index b7a92c2293832e7d77c3b0c8b4c20e604b195a44..7f4bce8c5825380f0be1b7e2ddfec9fcc328b903 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,15 +19,16 @@
 
 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),
-         queued_data_last_starting_point(-1)
+         pacing_rate(~0U),
+         queued_data_last_starting_point_index(-1)
 {
        if (data_fd == -1) {
                exit(1);
@@ -49,33 +51,17 @@ 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),
-         queued_data_last_starting_point(-1)
+         pacing_rate(~0U),
+         queued_data_last_starting_point_index(-1)
 {
        if (data_fd == -1) {
                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);
 }
@@ -87,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);
@@ -221,7 +208,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
        assert(suitable_for_stream_start == SUITABLE_FOR_STREAM_START ||
               suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START);
        if (suitable_for_stream_start == SUITABLE_FOR_STREAM_START) {
-               queued_data_last_starting_point = queued_data.size();
+               queued_data_last_starting_point_index = queued_data.size();
        }
 
        if (encoding == Stream::STREAM_ENCODING_METACUBE) {
@@ -259,7 +246,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
 void Stream::process_queued_data()
 {
        std::vector<iovec> queued_data_copy;
-       int queued_data_last_starting_point_copy = -1;
+       int queued_data_last_starting_point_index_copy = -1;
 
        // Hold the lock for as short as possible, since add_data_raw() can possibly
        // write to disk, which might disturb the input thread.
@@ -270,15 +257,15 @@ void Stream::process_queued_data()
                }
 
                swap(queued_data, queued_data_copy);
-               swap(queued_data_last_starting_point, queued_data_last_starting_point_copy);
+               swap(queued_data_last_starting_point_index, queued_data_last_starting_point_index_copy);
        }
 
        // Update the last suitable starting point for the stream,
        // if the queued data contains such a starting point.
-       assert(queued_data_last_starting_point_copy < ssize_t(queued_data_copy.size()));
-       if (queued_data_last_starting_point_copy >= 0) {
+       assert(queued_data_last_starting_point_index_copy < ssize_t(queued_data_copy.size()));
+       if (queued_data_last_starting_point_index_copy >= 0) {
                last_suitable_starting_point = bytes_received;
-               for (int i = 0; i < queued_data_last_starting_point_copy; ++i) {
+               for (int i = 0; i < queued_data_last_starting_point_index_copy; ++i) {
                        last_suitable_starting_point += queued_data_copy[i].iov_len;
                }
        }