X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=14162f58e5a960cc37e35cb18796e270c883714e;hp=7116a73f7e8ab9a3bf3fec9d6973275aa0f23307;hb=235107473ceef239747e9995365489899aa90cca;hpb=00cf4a1ffcb987ef6d27fcf49811fd5ef572a985

diff --git a/server.cpp b/server.cpp
index 7116a73..14162f5 100644
--- a/server.cpp
+++ b/server.cpp
@@ -337,8 +337,18 @@ 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;
-	// FIXME: We should reset last_suitable_starting_point at this point.
 }
 	
 void Server::set_pacing_rate(int stream_index, uint32_t pacing_rate)
@@ -463,30 +473,30 @@ sending_header_or_error_again:
 		// words, we won't send any of the backlog, but we'll start
 		// sending immediately as we get the next keyframe block.
 		// This is postcondition #3.
+		Stream *stream = client->stream;
 		if (client->stream_pos == size_t(-2)) {
 			client->stream_pos = std::min<size_t>(
-			    client->stream->bytes_received - client->stream->backlog_size,
+			    stream->bytes_received - stream->backlog_size,
 			    0);
 			client->state = Client::SENDING_DATA;
+			goto 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->stream_pos = stream->bytes_received;
 			client->state = Client::WAITING_FOR_KEYFRAME;
 		}
-		client->stream->put_client_to_sleep(client);
-		return;
+		// Fall through.
 	}
 	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.
 	}
@@ -504,6 +514,7 @@ sending_header_or_error_again:
 		// Fall through.
 	}
 	case Client::SENDING_DATA: {
+sending_data:
 		skip_lost_data(client);
 		Stream *stream = client->stream;