stream.prebuffering_bytes = atoi(prebuffer_it->second.c_str());
}
- // Parse encoding.
+ // Parse output encoding.
map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
if (encoding_parm_it == line.parameters.end() ||
encoding_parm_it->second == "raw") {
return false;
}
+ // 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") {
+ stream.src_encoding = StreamConfig::STREAM_ENCODING_METACUBE;
+ } else if (src_encoding_parm_it->second == "raw") {
+ stream.src_encoding = StreamConfig::STREAM_ENCODING_RAW;
+ } else {
+ log(ERROR, "Parameter 'src_encoding' must be either 'raw' or 'metacube' (default)");
+ return false;
+ }
+
// Parse the pacing rate, converting from kilobits to bytes as needed.
map<string, string>::const_iterator pacing_rate_it = line.parameters.find("pacing_rate_kbit");
if (pacing_rate_it == line.parameters.end()) {
return true;
}
-bool parse_ping(const ConfigLine &line, Config *config)
+bool parse_gen204(const ConfigLine &line, Config *config)
{
if (line.arguments.size() != 1) {
- log(ERROR, "'ping' takes exactly one argument");
+ log(ERROR, "'gen204' takes exactly one argument");
return false;
}
- PingConfig ping;
- ping.url = line.arguments[0];
+ Gen204Config gen204;
+ gen204.url = line.arguments[0];
// Parse the CORS origin, if it exists.
map<string, string>::const_iterator allow_origin_it = line.parameters.find("allow_origin");
if (allow_origin_it != line.parameters.end()) {
- ping.allow_origin = allow_origin_it->second;
+ gen204.allow_origin = allow_origin_it->second;
}
- config->pings.push_back(ping);
+ config->pings.push_back(gen204);
return true;
}
if (!parse_udpstream(line, config)) {
return false;
}
- } else if (line.keyword == "ping") {
- if (!parse_ping(line, config)) {
+ } else if (line.keyword == "gen204") {
+ if (!parse_gen204(line, config)) {
return false;
}
} else if (line.keyword == "error_log") {