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

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 3159f33982b80b1f1116907a50539042648ee1f1..2c663fbce37dd3d4e851a05de866bc7ceb9fb7e6 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -73,14 +73,14 @@ int ServerPool::lookup_stream_by_url(const string &url) const
        return servers[0].lookup_stream_by_url(url);
 }
 
-int ServerPool::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding)
+int ServerPool::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding)
 {
        // Adding more HTTP streams after UDP streams would cause the UDP stream
        // indices to move around, which is obviously not good.
        assert(udp_streams.empty());
 
        for (int i = 0; i < num_servers; ++i) {
-               int stream_index = servers[i].add_stream(url, backlog_size, prebuffering_bytes, encoding);
+               int stream_index = servers[i].add_stream(url, backlog_size, prebuffering_bytes, encoding, src_encoding);
                assert(stream_index == num_http_streams);
        }
        return num_http_streams++;
@@ -163,10 +163,10 @@ void ServerPool::add_data(int stream_index, const char *data, size_t bytes, Stre
        }
 }
 
-void ServerPool::add_ping(const std::string &url, const std::string &allow_origin)
+void ServerPool::add_gen204(const std::string &url, const std::string &allow_origin)
 {
        for (int i = 0; i < num_servers; ++i) {
-               servers[i].add_ping(url, allow_origin);
+               servers[i].add_gen204(url, allow_origin);
        }
 }
 
@@ -221,3 +221,10 @@ void ServerPool::set_encoding(int stream_index, Stream::Encoding encoding)
                servers[i].set_encoding(stream_index, encoding);
        }       
 }
+
+void ServerPool::set_src_encoding(int stream_index, Stream::Encoding encoding)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].set_src_encoding(stream_index, encoding);
+       }
+}