Make the Metacube block size warning a bit less aggressive, as WebM seems to generate...

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index e22e0a5970a25f3bc628ed77a6ff561f5620ad9f..3bee5d675fde7385fc61307ac1ad14d8648f9edc 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -458,7 +458,7 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                uint32_t size = ntohl(hdr->size);
                uint32_t flags = ntohl(hdr->flags);
 
-               if (size > 65535) {
+               if (size > 262144) {
                        log(WARNING, "[%s] Metacube block of %d bytes (flags=%x); corrupted header?",
                                url.c_str(), size, flags);
                }
@@ -475,9 +475,15 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                        for (size_t i = 0; i < stream_indices.size(); ++i) {
                                servers->set_header(stream_indices[i], http_header, header);
                        }
-               } else { 
+               } else {
+                       StreamStartSuitability suitable_for_stream_start;
+                       if (flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) {
+                               suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START;
+                       } else {
+                               suitable_for_stream_start = SUITABLE_FOR_STREAM_START;
+                       }
                        for (size_t i = 0; i < stream_indices.size(); ++i) {
-                               servers->add_data(stream_indices[i], inner_data, size);
+                               servers->add_data(stream_indices[i], inner_data, size, suitable_for_stream_start);
                        }
                }