Remove input encoding for UDP streams.

Metacube input makes no sense for UDP; this was a bit too eager
copy-and-paste. And even worse, it had now become default.

diff --git a/config.cpp b/config.cpp
index 15fe88e5638b0dd79a84ff594ea5117e76b58c95..2e680b818c111ca02490688cc3ac1bcb34365204 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -330,18 +330,6 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
                }
        }
 
-       // Parse input encoding.
-       map<string, string>::const_iterator src_encoding_parm_it = line.parameters.find("src_encoding");
-       if (src_encoding_parm_it == line.parameters.end() ||
-           src_encoding_parm_it->second == "metacube") {
-               udpstream.src_encoding = StreamConfig::STREAM_ENCODING_METACUBE;
-       } else if (src_encoding_parm_it->second == "raw") {
-               udpstream.src_encoding = StreamConfig::STREAM_ENCODING_RAW;
-       } else {
-               log(ERROR, "Parameter 'src_encoding' must be either 'raw' or 'metacube' (default)");
-               return false;
-       }
-
        config->udpstreams.push_back(udpstream);
        return true;
 }

diff --git a/config.h b/config.h
index a230731cee52b3a89566ec3f2df143439f258d97..2e052876cd0a43e3bfa381c4db385dcc0a77abc2 100644 (file)
--- a/config.h
+++ b/config.h
@@ -26,7 +26,6 @@ struct UDPStreamConfig {
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        int ttl;  // Default is -1 (use operating system default).
        int multicast_iface_index;  // Default is -1 (use operating system default).
-       StreamConfig::Encoding src_encoding;
 };
 
 struct Gen204Config {

diff --git a/main.cpp b/main.cpp
index a7ad64c5748d07e8e7a2b6b66bacb01340d7b44d..ac86e5c5ab56765c034a710be511cc74c470f9c9 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -158,7 +158,7 @@ void create_config_inputs(const Config &config, multimap<InputKey, InputWithRefc
        }
        for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
                const UDPStreamConfig &udpstream_config = config.udpstreams[i];
-               create_config_input(udpstream_config.src, Input::Encoding(udpstream_config.src_encoding), inputs);
+               create_config_input(udpstream_config.src, Input::INPUT_ENCODING_RAW, inputs);
        }
 }
 
@@ -231,9 +231,8 @@ void create_streams(const Config &config,
                        udpstream_config.multicast_iface_index);
 
                string src = udpstream_config.src;
-               Input::Encoding src_encoding = Input::Encoding(udpstream_config.src_encoding);
                if (!src.empty()) {
-                       multimap<InputKey, InputWithRefcount>::iterator input_it = inputs->find(make_pair(src, src_encoding));
+                       multimap<InputKey, InputWithRefcount>::iterator input_it = inputs->find(make_pair(src, Input::INPUT_ENCODING_RAW));
                        assert(input_it != inputs->end());
                        input_it->second.input->add_destination(stream_index);
                        ++input_it->second.refcount;