X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=state.proto;h=5d38a6bd06df19f66e09baad11b21ee00f83214c;hb=3b8ad87137cff7522ed12f4675d5ff26933bc94a;hp=1d5cf1702ee3081ef1e9a94e611256221979067a;hpb=656d6863b47e1791a310397d88e25fa897e05012;p=cubemap

diff --git a/state.proto b/state.proto
index 1d5cf17..5d38a6b 100644
--- a/state.proto
+++ b/state.proto
@@ -8,21 +8,28 @@ message ClientProto {
 	optional string stream_id = 4;
 	optional bytes header_or_error = 5;
 	optional int64 header_or_error_bytes_sent = 6;
-	optional int64 bytes_sent = 7;
+	optional int64 stream_pos = 7;
+	optional int64 bytes_sent = 10;
+	optional int64 bytes_lost = 11;
+	optional int64 num_loss_events = 12;
 };
 
 // Corresponds to struct Stream.
 message StreamProto {
-	optional bytes header = 1;
+	optional bytes http_header = 6;
+	optional bytes stream_header = 7;
 	optional bytes data = 2;
-	optional int64 data_size = 3;
+	optional int64 backlog_size = 5 [default=1048576];
+	optional int64 bytes_received = 3;
 	optional string stream_id = 4;
+
+	// Older versions stored the HTTP and video headers together in this field.
+	optional bytes header = 1;
 };
 
 // Corresponds to class Input.
 message InputProto {
 	optional int32 state = 1;
-	optional string stream_id = 2;
 	optional string url = 3;
 	optional bytes request = 4;
 	optional int32 request_bytes_sent = 5;
@@ -33,12 +40,17 @@ message InputProto {
 	optional int32 sock = 9;
 };
 
+// Corresponds to class Acceptor.
+message AcceptorProto {
+	optional int32 server_sock = 1;
+	optional int32 port = 2;
+};
+
 message CubemapStateProto {
 	optional int64 serialize_start_sec = 6;
 	optional int64 serialize_start_usec = 7;
 	repeated ClientProto clients = 1;
 	repeated StreamProto streams = 2;
 	repeated InputProto inputs = 5;
-	optional int32 server_sock = 3;
-	optional int32 port = 4;
+	repeated AcceptorProto acceptors = 8;
 };