Add suppor for raw (non-Metacube) inputs over HTTP. Only really useful for TS.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index c98feb46e3bb2e09f5913c1ea31a018e02680075..057a48cbe08e516be02f756ce4aeac3701672ee2 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -24,7 +24,7 @@ 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.
@@ -51,6 +51,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