X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.h;h=624ae33c6a3b10fac20577480df62f657dd9240d;hp=f13975524ebf3fb5f7cd11fbfc4595cf35839554;hb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3;hpb=bd694fdd3dd1417399aecead2c8b91fc4fe95ce8

diff --git a/input.h b/input.h
index f139755..624ae33 100644
--- a/input.h
+++ b/input.h
@@ -1,6 +1,9 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
+#include <math.h>
+#include <stddef.h>
+#include <time.h>
 #include <string>
 
 #include "thread.h"
@@ -8,14 +11,6 @@
 class Input;
 class InputProto;
 
-// Extremely rudimentary URL parsing.
-bool parse_url(const std::string &url, std::string *protocol, std::string *host, std::string *port, std::string *path);
-
-// Figure out the right type of input based on the URL, and create a new Input of the right type.
-// Will return NULL if unknown.
-Input *create_input(const std::string &url);
-Input *create_input(const InputProto &serialized);
-
 // Digested statistics for writing to logs etc.
 struct InputStats {
 	std::string url;
@@ -23,21 +18,33 @@ struct InputStats {
 	// The number of bytes we have received so far, including any Metacube headers.
 	//
 	// Not reset across connections.
-	size_t bytes_received;
+	size_t bytes_received = 0;
 
 	// The number of data bytes we have received so far (or more precisely,
 	// number of data bytes we have sent on to the stream). This excludes Metacube
-	// headers and corrupted data we've skipped.
+	// headers, metadata and corrupted data we've skipped.
 	//
 	// Not reset across connections.
-	size_t data_bytes_received;
+	size_t data_bytes_received = 0;
+
+	// Same, except counts only Metacube metadata.
+	size_t metadata_bytes_received = 0;
+
+	// When the current connection was initiated. -1 if we are not currently connected.
+	time_t connect_time = -1;
 
-	// TODO: Number of loss events and connection time might both be useful,
+	// Last latency measurement, HUGE_VAL if no measurement yet.
+	double latency_sec = HUGE_VAL;
+
+	// TODO: Number of loss events might both be useful,
 	// similar to for clients. Also, per-connection byte counters.
 };
 
 class Input : public Thread {
 public:
+	// Must be in sync with StreamConfig::Encoding.
+	enum Encoding { INPUT_ENCODING_RAW = 0, INPUT_ENCODING_METACUBE };
+
 	virtual ~Input();
 	virtual InputProto serialize() const = 0;
 	virtual std::string get_url() const = 0;
@@ -48,4 +55,12 @@ public:
 	virtual InputStats get_stats() const = 0;
 };
 
+// Extremely rudimentary URL parsing.
+bool parse_url(const std::string &url, std::string *protocol, std::string *user, std::string *host, std::string *port, std::string *path);
+
+// Figure out the right type of input based on the URL, and create a new Input of the right type.
+// Will return nullptr if unknown.
+Input *create_input(const std::string &url, Input::Encoding encoding);
+Input *create_input(const InputProto &serialized);
+
 #endif  // !defined(_INPUT_H)