X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=4be673c864410e9ddfda17675e9d9137b672da71;hp=d57157822aa93939c9250940bec1cf4132f212cb;hb=e0b47eba2f5ec1aca1d02adc9fb4ffc7293d5c0f;hpb=ae994771c0747d43bd1ed422224f4caacb95ca9f

diff --git a/stream.cpp b/stream.cpp
index d571578..4be673c 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -1,18 +1,23 @@
+#include <assert.h>
 #include <errno.h>
-#include <stdio.h>
+#include <netinet/in.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <string>
 #include <vector>
 
+#include "log.h"
+#include "metacube.h"
 #include "state.pb.h"
 #include "stream.h"
 #include "util.h"
 
 using namespace std;
 
-Stream::Stream(const string &stream_id, size_t backlog_size)
+Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding)
 	: stream_id(stream_id),
+	  encoding(encoding),
 	  data_fd(make_tempfile("")),
           backlog_size(backlog_size),
 	  bytes_received(0),
@@ -26,20 +31,16 @@ Stream::Stream(const string &stream_id, size_t backlog_size)
 Stream::~Stream()
 {
 	if (data_fd != -1) {
-		int ret;
-		do {
-			ret = close(data_fd);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			perror("close");
-		}
+		safe_close(data_fd);
 	}
 }
 
-Stream::Stream(const StreamProto &serialized)
+Stream::Stream(const StreamProto &serialized, int data_fd)
 	: stream_id(serialized.stream_id()),
-	  header(serialized.header()),
-	  data_fd(make_tempfile(serialized.data())),
+	  http_header(serialized.http_header()),
+	  stream_header(serialized.stream_header()),
+	  encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
+	  data_fd(data_fd),
 	  backlog_size(serialized.backlog_size()),
 	  bytes_received(serialized.bytes_received()),
 	  mark_pool(NULL)
@@ -47,28 +48,78 @@ Stream::Stream(const StreamProto &serialized)
 	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);
+		}
+	}
 }
 
 StreamProto Stream::serialize()
 {
 	StreamProto serialized;
-	serialized.set_header(header);
-	if (!read_tempfile(data_fd, serialized.mutable_data())) {  // Closes data_fd.
-		exit(1);
-	}
+	serialized.set_http_header(http_header);
+	serialized.set_stream_header(stream_header);
+	serialized.add_data_fds(data_fd);
 	serialized.set_backlog_size(backlog_size);
 	serialized.set_bytes_received(bytes_received);
 	serialized.set_stream_id(stream_id);
 	data_fd = -1;
 	return serialized;
 }
+	
+void Stream::set_backlog_size(size_t new_size)
+{
+	if (backlog_size == new_size) {
+		return;
+	}
+
+	string existing_data;
+	if (!read_tempfile_and_close(data_fd, &existing_data)) {
+		exit(1);
+	}
+
+	// Unwrap the data so it's no longer circular.
+	if (bytes_received <= backlog_size) {
+		existing_data.resize(bytes_received);
+	} else {
+		size_t pos = bytes_received % backlog_size;
+		existing_data = existing_data.substr(pos, string::npos) +
+			existing_data.substr(0, pos);
+	}
+
+	// See if we need to discard data.
+	if (new_size < existing_data.size()) {
+		size_t to_discard = existing_data.size() - new_size;
+		existing_data = existing_data.substr(to_discard, string::npos);
+	}
+
+	// Create a new, empty data file.
+	data_fd = make_tempfile("");
+	if (data_fd == -1) {
+		exit(1);
+	}
+	backlog_size = new_size;
+
+	// Now cheat a bit by rewinding, and adding all the old data back.
+	bytes_received -= existing_data.size();
+	add_data_raw(existing_data.data(), existing_data.size());
+}
 
 void Stream::put_client_to_sleep(Client *client)
 {
 	sleeping_clients.push_back(client);
 }
 
-void Stream::add_data(const char *data, ssize_t bytes)
+void Stream::add_data_raw(const char *data, ssize_t bytes)
 {
 	size_t pos = bytes_received % backlog_size;
 	bytes_received += bytes;
@@ -81,7 +132,7 @@ void Stream::add_data(const char *data, ssize_t bytes)
 				continue;
 			}
 			if (ret == -1) {
-				perror("pwrite");
+				log_perror("pwrite");
 				// Dazed and confused, but trying to continue...
 				break;
 			}
@@ -99,7 +150,7 @@ void Stream::add_data(const char *data, ssize_t bytes)
 			continue;
 		}
 		if (ret == -1) {
-			perror("pwrite");
+			log_perror("pwrite");
 			// Dazed and confused, but trying to continue...
 			break;
 		}
@@ -107,12 +158,38 @@ void Stream::add_data(const char *data, ssize_t bytes)
 		data += ret;
 		bytes -= ret;
 	}
+}
 
-	wake_up_all_clients();
+void Stream::add_data_deferred(const char *data, size_t bytes)
+{
+	if (encoding == Stream::STREAM_ENCODING_RAW) {
+		queued_data.append(string(data, data + bytes));
+	} else if (encoding == STREAM_ENCODING_METACUBE) {
+		metacube_block_header hdr;
+		memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync));
+		hdr.size = htonl(bytes);
+		hdr.flags = htonl(0);
+
+		char *block = new char[bytes + sizeof(hdr)];
+		memcpy(block, &hdr, sizeof(hdr));
+		memcpy(block + sizeof(hdr), data, bytes);
+		queued_data.append(string(block, block + bytes + sizeof(hdr)));
+		delete[] block;
+	} else {
+		assert(false);
+	}
 }
 
-void Stream::wake_up_all_clients()
+void Stream::process_queued_data()
 {
+	if (queued_data.empty()) {
+		return;
+	}
+
+	add_data_raw(queued_data.data(), queued_data.size());
+	queued_data.clear();
+
+	// We have more data, so wake up all clients.
 	if (to_process.empty()) {
 		swap(sleeping_clients, to_process);
 	} else {