X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=httpinput.cpp;h=7967c76c1ab81599ad6d1368fa4e60c9d2ac0dd6;hp=4b34e85ddd146d5a2dd240aea551bd9498757f14;hb=58dd753c464d917dc446e2cbb4c01fd750d4eb87;hpb=1135808bf9df44b879994e6dac07a31eb78c2fdb

diff --git a/httpinput.cpp b/httpinput.cpp
index 4b34e85..7967c76 100644
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <math.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <poll.h>
@@ -248,7 +249,7 @@ bool HTTPInput::parse_response(const string &request)
 		return false;
 	}
 
-	multimap<string, string> parameters = extract_headers(lines, url);
+	unordered_multimap<string, string> parameters = extract_headers(lines, url);
 
 	// Remove “Content-encoding: metacube”.
 	// TODO: Make case-insensitive.
@@ -568,7 +569,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 
 	if (encoding == Input::INPUT_ENCODING_RAW) {
 		for (int stream_index : stream_indices) {
-			servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0);
+			servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0, /*pts=*/RationalPTS());
 		}
 		return;
 	}
@@ -659,8 +660,9 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
 				}
 			}
 			for (int stream_index : stream_indices) {
-				servers->add_data(stream_index, inner_data, size, flags);
+				servers->add_data(stream_index, inner_data, size, flags, next_block_pts);
 			}
+			next_block_pts = RationalPTS();
 		}
 
 		// Consume the block. This isn't the most efficient way of dealing with things
@@ -703,25 +705,36 @@ void HTTPInput::process_metacube_metadata_block(const metacube2_block_header &hd
 	}
 
 	uint64_t type = be64toh(*(const uint64_t *)payload);
-	if (type != METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP) {
-		// Unknown metadata block, ignore.
-		return;
-	}
-
-	timespec now;
-	clock_gettime(CLOCK_REALTIME, &now);
+	if (type == METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP) {
+		timespec now;
+		clock_gettime(CLOCK_REALTIME, &now);
+
+		const metacube2_timestamp_packet *pkt = (const metacube2_timestamp_packet *)payload;
+		if (payload_size != sizeof(*pkt)) {
+			log(WARNING, "[%s] Metacube timestamp block of wrong size (%d bytes); ignoring.",
+				url.c_str(), payload_size);
+			return;
+		}
 
-	const metacube2_timestamp_packet *pkt = (const metacube2_timestamp_packet *)payload;
-	if (payload_size != sizeof(*pkt)) {
-		log(WARNING, "[%s] Metacube timestamp block of wrong size (%d bytes); ignoring.",
-			url.c_str(), payload_size);
+		double elapsed = now.tv_sec - be64toh(pkt->tv_sec) +
+			1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec)));
+		{
+			lock_guard<mutex> lock(stats_mutex);
+			stats.latency_sec = elapsed;
+		}
+	} else if (type == METACUBE_METADATA_TYPE_NEXT_BLOCK_PTS) {
+		const metacube2_pts_packet *pkt = (const metacube2_pts_packet *)payload;
+		if (payload_size != sizeof(*pkt)) {
+			log(WARNING, "[%s] Metacube pts block of wrong size (%d bytes); ignoring.",
+				url.c_str(), payload_size);
+			return;
+		}
+		next_block_pts.pts = be64toh(pkt->pts);
+		next_block_pts.timebase_num = be64toh(pkt->timebase_num);
+		next_block_pts.timebase_den = be64toh(pkt->timebase_den);
+	} else {
+		// Unknown metadata block, ignore
+		log(INFO, "[%s] Metadata block %llu\n", url.c_str(), type);
 		return;
 	}
-
-	double elapsed = now.tv_sec - be64toh(pkt->tv_sec) +
-		1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec)));
-	{
-		lock_guard<mutex> lock(stats_mutex);
-		stats.latency_sec = elapsed;
-	}
 }