X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=a418d1c660d409b0ea85162696f9a33de01dc330;hp=33a335ab2e036b903c4d89e87cc22d838dbdd160;hb=52d37b2815f4b144fbac899b7f9548353a6fbe3c;hpb=d72af7eae68766b62560bdb171302bcc44d98ec2

diff --git a/server.cpp b/server.cpp
index 33a335a..a418d1c 100644
--- a/server.cpp
+++ b/server.cpp
@@ -337,6 +337,17 @@ void Server::set_header(int stream_index, const string &http_header, const strin
 	MutexLock lock(&mutex);
 	assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
 	streams[stream_index]->http_header = http_header;
+
+	if (stream_header != streams[stream_index]->stream_header) {
+		// We cannot start at any of the older starting points anymore,
+		// since they'd get the wrong header for the stream (not to mention
+		// that a changed header probably means the stream restarted,
+		// which means any client starting on the old one would probably
+		// stop playing properly at the change point). Next block
+		// should be a suitable starting point (if not, something is
+		// pretty strange), so it will fill up again soon enough.
+		streams[stream_index]->suitable_starting_points.clear();
+	}
 	streams[stream_index]->stream_header = stream_header;
 }
 	
@@ -468,8 +479,6 @@ sending_header_or_error_again:
 			    0);
 			client->state = Client::SENDING_DATA;
 		} else {
-			// client->stream_pos should be -1, but it might not be,
-			// if we have clients from an older version.
 			client->stream_pos = client->stream->bytes_received;
 			client->state = Client::WAITING_FOR_KEYFRAME;
 		}
@@ -478,14 +487,15 @@ sending_header_or_error_again:
 	}
 	case Client::WAITING_FOR_KEYFRAME: {
 		Stream *stream = client->stream;
-		if (ssize_t(client->stream_pos) > stream->last_suitable_starting_point) {
+		if (stream->suitable_starting_points.empty() ||
+		    client->stream_pos > stream->suitable_starting_points.back()) {
 			// We haven't received a keyframe since this stream started waiting,
 			// so keep on waiting for one.
 			// This is postcondition #3.
 			stream->put_client_to_sleep(client);
 			return;
 		}
-		client->stream_pos = stream->last_suitable_starting_point;
+		client->stream_pos = stream->suitable_starting_points.back();
 		client->state = Client::PREBUFFERING;
 		// Fall through.
 	}
@@ -495,6 +505,7 @@ sending_header_or_error_again:
 		assert(bytes_to_send <= stream->backlog_size);
 		if (bytes_to_send < stream->prebuffering_bytes) {
 			// We don't have enough bytes buffered to start this client yet.
+			// This is postcondition #3.
 			stream->put_client_to_sleep(client);
 			return;
 		}