X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;h=6c757a19ff29224f1049c2fc8554d4c24f36af0a;hp=9a9982a3541d489f72b63a18228f1e1d1910acca;hb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3;hpb=00cf4a1ffcb987ef6d27fcf49811fd5ef572a985

diff --git a/stream.h b/stream.h
index 9a9982a..6c757a1 100644
--- a/stream.h
+++ b/stream.h
@@ -8,22 +8,18 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/uio.h>
+#include <deque>
 #include <string>
 #include <vector>
 
 class StreamProto;
 struct Client;
 
-enum StreamStartSuitability {
-	NOT_SUITABLE_FOR_STREAM_START,
-	SUITABLE_FOR_STREAM_START,
-};
-
 struct Stream {
 	// Must be in sync with StreamConfig::Encoding.
 	enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
 
-	Stream(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding);
+	Stream(const std::string &stream_id, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding, Encoding src_encoding);
 	~Stream();
 
 	// Serialization/deserialization.
@@ -50,6 +46,9 @@ struct Stream {
 	// be Metacube, for reflecting to another Cubemap instance).
 	Encoding encoding;
 
+	// What encoding we expect the incoming data to be in (usually Metacube).
+	Encoding src_encoding;
+
 	// The stream data itself, stored in a circular buffer.
 	//
 	// We store our data in a file, so that we can send the data to the
@@ -73,11 +72,11 @@ struct Stream {
 
 	// How many bytes this stream have received. Can very well be larger
 	// than <backlog_size>, since the buffer wraps.
-	size_t bytes_received;
+	size_t bytes_received = 0;
 
-	// The last point in the stream that is suitable to start new clients at
-	// (after having sent the header). -1 if no such point exists yet.
-	ssize_t last_suitable_starting_point;
+	// A list of points in the stream that is suitable to start new clients at
+	// (after having sent the header). Empty if no such point exists yet.
+	std::deque<size_t> suitable_starting_points;
 	
 	// Clients that are in SENDING_DATA, but that we don't listen on,
 	// because we currently don't have any data for them.
@@ -89,13 +88,13 @@ struct Stream {
 	std::vector<Client *> to_process;
 
 	// Maximum pacing rate for the stream.
-	uint32_t pacing_rate;
+	uint32_t pacing_rate = ~0U;
 
 	// Queued data, if any. Protected by <queued_data_mutex>.
 	// The data pointers in the iovec are owned by us.
 	struct DataElement {
 		iovec data;
-		StreamStartSuitability suitable_for_stream_start;
+		uint16_t metacube_flags;
 	};
 	std::vector<DataElement> queued_data;
 
@@ -106,7 +105,7 @@ struct Stream {
 
 	// Add more data to <queued_data>, adding Metacube headers if needed.
 	// Does not take ownership of <data>.
-	void add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
+	void add_data_deferred(const char *data, size_t bytes, uint16_t metacube_flags);
 
 	// Add queued data to the stream, if any.
 	// You should hold the owning Server's <mutex>.
@@ -117,8 +116,14 @@ private:
 
 	// Adds data directly to the stream file descriptor, without adding headers or
 	// going through <queued_data>.
-	// You should hold the owning Server's <mutex>.
+	// You should hold the owning Server's <mutex>, and probably call
+	// remove_obsolete_starting_points() afterwards.
 	void add_data_raw(const std::vector<DataElement> &data);
+
+	// Remove points from <suitable_starting_points> that are no longer
+	// in the backlog.
+	// You should hold the owning Server's <mutex>.
+	void remove_obsolete_starting_points();
 };
 
 #endif  // !defined(_STREAM_H)