static int ffserver_save_avoption(const char *opt, const char *arg, int type,
FFServerConfig *config);
-static void vreport_config_error(const char *filename, int line_num, int log_level,
- int *errors, const char *fmt, va_list vl);
-static void report_config_error(const char *filename, int line_num, int log_level,
- int *errors, const char *fmt, ...);
+static void vreport_config_error(const char *filename, int line_num,
+ int log_level, int *errors, const char *fmt,
+ va_list vl);
+static void report_config_error(const char *filename, int line_num,
+ int log_level, int *errors, const char *fmt,
+ ...);
#define ERROR(...) report_config_error(config->filename, config->line_num,\
AV_LOG_ERROR, &config->errors, __VA_ARGS__)
{
const char *p;
char *q;
- int quote;
+ int quote = 0;
p = *pp;
- while (av_isspace(*p)) p++;
q = buf;
- quote = 0;
+
+ while (av_isspace(*p)) p++;
+
if (*p == '\"' || *p == '\'')
quote = *p++;
- for(;;) {
- if (quote) {
- if (*p == quote)
- break;
- } else {
- if (av_isspace(*p))
- break;
- }
- if (*p == '\0')
+
+ while (*p != '\0') {
+ if (quote && *p == quote || !quote && av_isspace(*p))
break;
if ((q - buf) < buf_size - 1)
*q++ = *p;
p++;
}
+
*q = '\0';
if (quote && *p == quote)
p++;
else if (av_strcasecmp(arg, "deny") == 0)
acl.action = IP_DENY;
else {
- fprintf(stderr, "%s:%d: ACL action '%s' is not ALLOW or DENY\n",
+ fprintf(stderr, "%s:%d: ACL action '%s' should be ALLOW or DENY.\n",
filename, line_num, arg);
errors++;
}
ffserver_get_arg(arg, sizeof(arg), &p);
if (resolve_host(&acl.first, arg)) {
- fprintf(stderr, "%s:%d: ACL refers to invalid host or IP address '%s'\n",
+ fprintf(stderr,
+ "%s:%d: ACL refers to invalid host or IP address '%s'\n",
filename, line_num, arg);
errors++;
} else
else if (ext_acl)
naclp = &ext_acl;
else {
- fprintf(stderr, "%s:%d: ACL found not in <stream> or <feed>\n",
+ fprintf(stderr, "%s:%d: ACL found not in <Stream> or <Feed>\n",
filename, line_num);
errors++;
}
av_dict_copy(&recommended, *opts, 0);
av_opt_set_dict2(av->priv_data, opts, AV_OPT_SEARCH_CHILDREN);
av_opt_set_dict2(av, opts, AV_OPT_SEARCH_CHILDREN);
+
if (av_dict_count(*opts))
av_log(NULL, AV_LOG_WARNING,
- "Something is wrong, %d options are not set!\n", av_dict_count(*opts));
+ "Something is wrong, %d options are not set!\n",
+ av_dict_count(*opts));
+
+ if (!config->stream_use_defaults) {
+ switch(av->codec_type) {
+ case AVMEDIA_TYPE_AUDIO:
+ if (av->bit_rate == 0)
+ report_config_error(config->filename, config->line_num,
+ AV_LOG_ERROR, &config->errors,
+ "audio bit rate is not set\n");
+ if (av->sample_rate == 0)
+ report_config_error(config->filename, config->line_num,
+ AV_LOG_ERROR, &config->errors,
+ "audio sample rate is not set\n");
+ break;
+ case AVMEDIA_TYPE_VIDEO:
+ if (av->width == 0 || av->height == 0)
+ report_config_error(config->filename, config->line_num,
+ AV_LOG_ERROR, &config->errors,
+ "video size is not set\n");
+ break;
+ default:
+ av_assert0(0);
+ }
+ goto done;
+ }
+
+ /* stream_use_defaults = true */
- if (config->stream_use_defaults) {
- //TODO: reident
/* compute default parameters */
switch(av->codec_type) {
case AVMEDIA_TYPE_AUDIO:
if (!av_dict_get(recommended, "rc_eq", NULL, 0)) {
av->rc_eq = av_strdup("tex^qComp");
av_dict_set(&recommended, "rc_eq", "tex^qComp", 0);
- WARNING("Setting default value for video rate control equation = %s. "
- "Use NoDefaults to disable it.\n",
+ WARNING("Setting default value for video rate control equation = "
+ "%s. Use NoDefaults to disable it.\n",
av->rc_eq);
}
if (!av_dict_get(recommended, "maxrate", NULL, 0)) {
default:
abort();
}
- } else {
- switch(av->codec_type) {
- case AVMEDIA_TYPE_AUDIO:
- if (av->bit_rate == 0)
- report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors, "audio bit rate is not set\n");
- if (av->sample_rate == 0)
- report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors, "audio sample rate is not set\n");
- break;
- case AVMEDIA_TYPE_VIDEO:
- if (av->width == 0 || av->height == 0)
- report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors, "video size is not set\n");
- break;
- default:
- av_assert0(0);
- }
- }
+done:
st = av_mallocz(sizeof(AVStream));
if (!st)
return;
stream->streams[stream->nb_streams++] = st;
}
-static int ffserver_set_codec(AVCodecContext *ctx, const char *codec_name, FFServerConfig *config)
+static int ffserver_set_codec(AVCodecContext *ctx, const char *codec_name,
+ FFServerConfig *config)
{
int ret;
AVCodec *codec = avcodec_find_encoder_by_name(codec_name);
if (!codec || codec->type != ctx->codec_type) {
report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors, "Invalid codec name: %s\n", codec_name);
+ &config->errors,
+ "Invalid codec name: '%s'\n", codec_name);
return 0;
}
if (ctx->codec_id == AV_CODEC_ID_NONE && !ctx->priv_data) {
ctx->codec = codec;
}
if (ctx->codec_id != codec->id)
- report_config_error(config->filename, config->line_num, AV_LOG_ERROR, &config->errors,
- "Inconsistent configuration: trying to set %s codec option, but %s codec is used previously\n",
+ report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
+ &config->errors,
+ "Inconsistent configuration: trying to set '%s' "
+ "codec option, but '%s' codec is used previously\n",
codec_name, avcodec_get_name(ctx->codec_id));
return 0;
}
continue;
e|= sscanf(line, "%999[^=]=%999[^\n]\n", tmp, tmp2) - 2;
if(e){
- av_log(NULL, AV_LOG_ERROR, "%s: Invalid syntax: '%s'\n", filename, line);
+ av_log(NULL, AV_LOG_ERROR, "%s: Invalid syntax: '%s'\n", filename,
+ line);
ret = AVERROR(EINVAL);
break;
}
- if ((!strcmp(tmp, "acodec") && avctx->codec_type == AVMEDIA_TYPE_AUDIO) ||
- !strcmp(tmp, "vcodec") && avctx->codec_type == AVMEDIA_TYPE_VIDEO)
+ if (!strcmp(tmp, "acodec") && avctx->codec_type == AVMEDIA_TYPE_AUDIO ||
+ !strcmp(tmp, "vcodec") && avctx->codec_type == AVMEDIA_TYPE_VIDEO)
{
if (ffserver_set_codec(avctx, tmp2, config) < 0)
break;
return ret;
}
-static AVOutputFormat *ffserver_guess_format(const char *short_name, const char *filename, const char *mime_type)
+static AVOutputFormat *ffserver_guess_format(const char *short_name,
+ const char *filename,
+ const char *mime_type)
{
AVOutputFormat *fmt = av_guess_format(short_name, filename, mime_type);
return fmt;
}
-static void vreport_config_error(const char *filename, int line_num, int log_level, int *errors, const char *fmt, va_list vl)
+static void vreport_config_error(const char *filename, int line_num,
+ int log_level, int *errors, const char *fmt,
+ va_list vl)
{
av_log(NULL, log_level, "%s:%d: ", filename, line_num);
av_vlog(NULL, log_level, fmt, vl);
(*errors)++;
}
-static void report_config_error(const char *filename, int line_num, int log_level, int *errors, const char *fmt, ...)
+static void report_config_error(const char *filename, int line_num,
+ int log_level, int *errors,
+ const char *fmt, ...)
{
va_list vl;
va_start(vl, fmt);
va_end(vl);
}
-static int ffserver_set_int_param(int *dest, const char *value, int factor, int min, int max,
- FFServerConfig *config, const char *error_msg, ...)
+static int ffserver_set_int_param(int *dest, const char *value, int factor,
+ int min, int max, FFServerConfig *config,
+ const char *error_msg, ...)
{
int tmp;
char *tailp;
return AVERROR(EINVAL);
}
-static int ffserver_set_float_param(float *dest, const char *value, float factor, float min, float max,
- FFServerConfig *config, const char *error_msg, ...)
+static int ffserver_set_float_param(float *dest, const char *value,
+ float factor, float min, float max,
+ FFServerConfig *config,
+ const char *error_msg, ...)
{
double tmp;
char *tailp;
return AVERROR(EINVAL);
}
-static int ffserver_save_avoption(const char *opt, const char *arg, int type, FFServerConfig *config)
+static int ffserver_save_avoption(const char *opt, const char *arg, int type,
+ FFServerConfig *config)
{
static int hinted = 0;
int ret = 0;
//explicit private option
snprintf(buff, sizeof(buff), "%s", opt);
codec_name = buff;
- option = strchr(buff, ':');
+ if(!(option = strchr(buff, ':'))){
+ report_config_error(config->filename, config->line_num,
+ AV_LOG_ERROR, &config->errors,
+ "Syntax error. Unmatched ':'\n");
+ return -1;
+
+ }
buff[option - buff] = '\0';
option++;
if ((ret = ffserver_set_codec(ctx, codec_name, config)) < 0)
option = opt;
}
- o = av_opt_find(ctx, option, NULL, type | AV_OPT_FLAG_ENCODING_PARAM, AV_OPT_SEARCH_CHILDREN);
- if (!o && (!strcmp(option, "time_base") || !strcmp(option, "pixel_format") ||
- !strcmp(option, "video_size") || !strcmp(option, "codec_tag")))
+ o = av_opt_find(ctx, option, NULL, type | AV_OPT_FLAG_ENCODING_PARAM,
+ AV_OPT_SEARCH_CHILDREN);
+ if (!o &&
+ (!strcmp(option, "time_base") || !strcmp(option, "pixel_format") ||
+ !strcmp(option, "video_size") || !strcmp(option, "codec_tag")))
o = av_opt_find(ctx, option, NULL, 0, 0);
if (!o) {
report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors, "Option not found: %s\n", opt);
+ &config->errors, "Option not found: '%s'\n", opt);
if (!hinted && ctx->codec_id == AV_CODEC_ID_NONE) {
hinted = 1;
- report_config_error(config->filename, config->line_num, AV_LOG_ERROR, NULL,
- "If '%s' is a codec private option, then prefix it with codec name, "
- "for example '%s:%s %s' or define codec earlier.\n",
- opt, avcodec_get_name(guessed_codec_id) ,opt, arg);
+ report_config_error(config->filename, config->line_num,
+ AV_LOG_ERROR, NULL, "If '%s' is a codec private"
+ "option, then prefix it with codec name, for "
+ "example '%s:%s %s' or define codec earlier.\n",
+ opt, avcodec_get_name(guessed_codec_id) ,opt,
+ arg);
}
} else if ((ret = av_opt_set(ctx, option, arg, AV_OPT_SEARCH_CHILDREN)) < 0) {
report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
&config->errors, "Invalid value for option %s (%s): %s\n", opt,
arg, av_err2str(ret));
} else if ((e = av_dict_get(*dict, option, NULL, 0))) {
- if ((o->type == AV_OPT_TYPE_FLAGS) && arg && (arg[0] == '+' || arg[0] == '-'))
+ if ((o->type == AV_OPT_TYPE_FLAGS) && arg &&
+ (arg[0] == '+' || arg[0] == '-'))
return av_dict_set(dict, option, arg, AV_DICT_APPEND);
report_config_error(config->filename, config->line_num, AV_LOG_ERROR,
- &config->errors,
- "Redeclaring value of the option %s, previous value: %s\n",
- opt, e->value);
+ &config->errors, "Redeclaring value of option '%s'."
+ "Previous value was: '%s'.\n", opt, e->value);
} else if (av_dict_set(dict, option, arg, 0) < 0) {
return AVERROR(ENOMEM);
}
char arg[1024];
if (!av_strcasecmp(cmd, "Port") || !av_strcasecmp(cmd, "HTTPPort")) {
if (!av_strcasecmp(cmd, "Port"))
- WARNING("Port option is deprecated, use HTTPPort instead\n");
+ WARNING("Port option is deprecated. Use HTTPPort instead.\n");
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, 1, 65535, config,
"Invalid port: %s\n", arg);
if (val < 1024)
- WARNING("Trying to use IETF assigned system port: %d\n", val);
+ WARNING("Trying to use IETF assigned system port: '%d'\n", val);
config->http_addr.sin_port = htons(val);
- } else if (!av_strcasecmp(cmd, "HTTPBindAddress") || !av_strcasecmp(cmd, "BindAddress")) {
+ } else if (!av_strcasecmp(cmd, "HTTPBindAddress") ||
+ !av_strcasecmp(cmd, "BindAddress")) {
if (!av_strcasecmp(cmd, "BindAddress"))
- WARNING("BindAddress option is deprecated, use HTTPBindAddress instead\n");
+ WARNING("BindAddress option is deprecated. Use HTTPBindAddress "
+ "instead.\n");
ffserver_get_arg(arg, sizeof(arg), p);
if (resolve_host(&config->http_addr.sin_addr, arg))
- ERROR("Invalid host/IP address: %s\n", arg);
+ ERROR("Invalid host/IP address: '%s'\n", arg);
} else if (!av_strcasecmp(cmd, "NoDaemon")) {
- WARNING("NoDaemon option has no effect, you should remove it\n");
+ WARNING("NoDaemon option has no effect. You should remove it.\n");
} else if (!av_strcasecmp(cmd, "RTSPPort")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, 1, 65535, config,
ffserver_set_int_param(&val, arg, 0, 1, 65535, config,
"Invalid MaxHTTPConnections: %s\n", arg);
config->nb_max_http_connections = val;
- if (config->nb_max_connections > config->nb_max_http_connections)
- ERROR("Inconsistent configuration: MaxClients(%d) > MaxHTTPConnections(%d)\n",
- config->nb_max_connections, config->nb_max_http_connections);
+ if (config->nb_max_connections > config->nb_max_http_connections) {
+ ERROR("Inconsistent configuration: MaxClients(%d) > "
+ "MaxHTTPConnections(%d)\n", config->nb_max_connections,
+ config->nb_max_http_connections);
+ }
} else if (!av_strcasecmp(cmd, "MaxClients")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, 1, 65535, config,
- "Invalid MaxClients: %s\n", arg);
+ "Invalid MaxClients: '%s'\n", arg);
config->nb_max_connections = val;
- if (config->nb_max_connections > config->nb_max_http_connections)
- ERROR("Inconsistent configuration: MaxClients(%d) > MaxHTTPConnections(%d)\n",
- config->nb_max_connections, config->nb_max_http_connections);
+ if (config->nb_max_connections > config->nb_max_http_connections) {
+ ERROR("Inconsistent configuration: MaxClients(%d) > "
+ "MaxHTTPConnections(%d)\n", config->nb_max_connections,
+ config->nb_max_http_connections);
+ }
} else if (!av_strcasecmp(cmd, "MaxBandwidth")) {
int64_t llval;
char *tailp;
errno = 0;
llval = strtoll(arg, &tailp, 10);
if (llval < 10 || llval > 10000000 || tailp[0] || errno)
- ERROR("Invalid MaxBandwidth: %s\n", arg);
+ ERROR("Invalid MaxBandwidth: '%s'\n", arg);
else
config->max_bandwidth = llval;
} else if (!av_strcasecmp(cmd, "CustomLog")) {
- if (!config->debug)
- ffserver_get_arg(config->logfilename, sizeof(config->logfilename), p);
+ if (!config->debug) {
+ ffserver_get_arg(config->logfilename, sizeof(config->logfilename),
+ p);
+ }
} else if (!av_strcasecmp(cmd, "LoadModule")) {
ERROR("Loadable modules are no longer supported\n");
} else if (!av_strcasecmp(cmd, "NoDefaults")) {
feed->child_argv[i] =
av_asprintf("http://%s:%d/%s",
- (config->http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
- inet_ntoa(config->http_addr.sin_addr), ntohs(config->http_addr.sin_port),
- feed->filename);
+ (config->http_addr.sin_addr.s_addr == INADDR_ANY) ?
+ "127.0.0.1" : inet_ntoa(config->http_addr.sin_addr),
+ ntohs(config->http_addr.sin_port), feed->filename);
if (!feed->child_argv[i])
return AVERROR(ENOMEM);
} else if (!av_strcasecmp(cmd, "ACL")) {
ffserver_parse_acl_row(NULL, feed, NULL, *p, config->filename,
config->line_num);
- } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
+ } else if (!av_strcasecmp(cmd, "File") ||
+ !av_strcasecmp(cmd, "ReadOnlyFile")) {
ffserver_get_arg(feed->feed_filename, sizeof(feed->feed_filename), p);
feed->readonly = !av_strcasecmp(cmd, "ReadOnlyFile");
} else if (!av_strcasecmp(cmd, "Truncate")) {
if (!arg[0]) {
feed->truncate = 1;
} else {
- WARNING("Truncate N syntax in configuration file is deprecated, "
- "use Truncate alone with no arguments\n");
+ WARNING("Truncate N syntax in configuration file is deprecated. "
+ "Use Truncate alone with no arguments.\n");
feed->truncate = strtod(arg, NULL);
}
} else if (!av_strcasecmp(cmd, "FileMaxSize")) {
fsize *= 1024 * 1024 * 1024;
break;
default:
- ERROR("Invalid file size: %s\n", arg);
+ ERROR("Invalid file size: '%s'\n", arg);
break;
}
feed->feed_max_size = (int64_t)fsize;
- if (feed->feed_max_size < FFM_PACKET_SIZE*4)
- ERROR("Feed max file size is too small, must be at least %d\n",
- FFM_PACKET_SIZE*4);
+ if (feed->feed_max_size < FFM_PACKET_SIZE*4) {
+ ERROR("Feed max file size is too small. Must be at least %d.\n",
+ FFM_PACKET_SIZE*4);
+ }
} else if (!av_strcasecmp(cmd, "</Feed>")) {
*pfeed = NULL;
} else {
strcpy(arg, "mjpeg");
stream->fmt = ffserver_guess_format(arg, NULL, NULL);
if (!stream->fmt)
- ERROR("Unknown Format: %s\n", arg);
+ ERROR("Unknown Format: '%s'\n", arg);
}
if (stream->fmt) {
config->guessed_audio_codec_id = stream->fmt->audio_codec;
ffserver_get_arg(arg, sizeof(arg), p);
stream->ifmt = av_find_input_format(arg);
if (!stream->ifmt)
- ERROR("Unknown input format: %s\n", arg);
+ ERROR("Unknown input format: '%s'\n", arg);
} else if (!av_strcasecmp(cmd, "FaviconURL")) {
if (stream->stream_type == STREAM_TYPE_STATUS)
ffserver_get_arg(stream->feed_filename,
for (i = 0; i < strlen(cmd); i++)
key[i] = av_tolower(cmd[i]);
key[i] = 0;
- WARNING("'%s' option in configuration file is deprecated, "
- "use 'Metadata %s VALUE' instead\n", cmd, key);
+ WARNING("Deprecated '%s' option in configuration file. Use "
+ "'Metadata %s VALUE' instead.\n", cmd, key);
if (av_dict_set(&stream->metadata, key, arg, 0) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "Metadata")) {
float f;
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_float_param(&f, arg, 1000, -FLT_MAX, FLT_MAX, config,
- "Invalid %s: %s\n", cmd, arg);
- if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f), AV_OPT_FLAG_AUDIO_PARAM, config) < 0)
+ "Invalid %s: '%s'\n", cmd, arg);
+ if (ffserver_save_avoption_int("ab", (int64_t)lrintf(f),
+ AV_OPT_FLAG_AUDIO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "AudioChannels")) {
ffserver_get_arg(arg, sizeof(arg), p);
if (dash) {
*dash = '\0';
dash++;
- if (ffserver_set_int_param(&minrate, arg, 1000, 0, INT_MAX, config, "Invalid %s: %s", cmd, arg) >= 0 &&
- ffserver_set_int_param(&maxrate, dash, 1000, 0, INT_MAX, config, "Invalid %s: %s", cmd, arg) >= 0) {
+ if (ffserver_set_int_param(&minrate, arg, 1000, 0, INT_MAX, config, "Invalid %s: '%s'", cmd, arg) >= 0 &&
+ ffserver_set_int_param(&maxrate, dash, 1000, 0, INT_MAX, config, "Invalid %s: '%s'", cmd, arg) >= 0) {
if (ffserver_save_avoption_int("minrate", minrate, AV_OPT_FLAG_VIDEO_PARAM, config) < 0 ||
ffserver_save_avoption_int("maxrate", maxrate, AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
}
} else
- ERROR("Incorrect format for VideoBitRateRange -- should be "
- "<min>-<max>: %s\n", arg);
+ ERROR("Incorrect format for VideoBitRateRange. It should be "
+ "<min>-<max>: '%s'.\n", arg);
} else if (!av_strcasecmp(cmd, "Debug")) {
ffserver_get_arg(arg, sizeof(arg), p);
if (ffserver_save_avoption("debug", arg, AV_OPT_FLAG_AUDIO_PARAM, config) < 0 ||
} else if (!av_strcasecmp(cmd, "VideoBufferSize")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 8*1024, 0, INT_MAX, config,
- "Invalid %s: %s", cmd, arg);
+ "Invalid %s: '%s'", cmd, arg);
if (ffserver_save_avoption_int("bufsize", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "VideoBitRateTolerance")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 1000, INT_MIN, INT_MAX, config,
- "Invalid %s: %s", cmd, arg);
+ "Invalid %s: '%s'", cmd, arg);
if (ffserver_save_avoption_int("bt", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "VideoBitRate")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 1000, INT_MIN, INT_MAX, config,
- "Invalid %s: %s", cmd, arg);
+ "Invalid %s: '%s'", cmd, arg);
if (ffserver_save_avoption_int("b", val, AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "VideoSize")) {
ffserver_get_arg(arg, sizeof(arg), p);
pix_fmt = av_get_pix_fmt(arg);
if (pix_fmt == AV_PIX_FMT_NONE)
- ERROR("Unknown pixel format: %s\n", arg);
+ ERROR("Unknown pixel format: '%s'\n", arg);
else if (ffserver_save_avoption("pixel_format", arg, AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "VideoGopSize")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_get_arg(arg2, sizeof(arg2), p);
if (!av_strcasecmp(cmd, "AVOptionVideo"))
- ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_VIDEO_PARAM, config);
+ ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_VIDEO_PARAM,
+ config);
else
- ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_AUDIO_PARAM, config);
+ ret = ffserver_save_avoption(arg, arg2, AV_OPT_FLAG_AUDIO_PARAM,
+ config);
if (ret < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "AVPresetVideo") ||
} else if (!av_strcasecmp(cmd, "VideoTag")) {
ffserver_get_arg(arg, sizeof(arg), p);
if (strlen(arg) == 4 &&
- ffserver_save_avoption_int("codec_tag", MKTAG(arg[0], arg[1], arg[2], arg[3]),
+ ffserver_save_avoption_int("codec_tag",
+ MKTAG(arg[0], arg[1], arg[2], arg[3]),
AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
goto nomem;
} else if (!av_strcasecmp(cmd, "BitExact")) {
} else if (!av_strcasecmp(cmd, "Qscale")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, INT_MIN, INT_MAX, config,
- "Invalid Qscale: %s\n", arg);
+ "Invalid Qscale: '%s'\n", arg);
if (ffserver_save_avoption("flags", "+qscale", AV_OPT_FLAG_VIDEO_PARAM, config) < 0 ||
ffserver_save_avoption_int("global_quality", FF_QP2LAMBDA * val,
AV_OPT_FLAG_VIDEO_PARAM, config) < 0)
} else if (!av_strcasecmp(cmd, "MulticastAddress")) {
ffserver_get_arg(arg, sizeof(arg), p);
if (resolve_host(&stream->multicast_ip, arg))
- ERROR("Invalid host/IP address: %s\n", arg);
+ ERROR("Invalid host/IP address: '%s'\n", arg);
stream->is_multicast = 1;
stream->loop = 1; /* default is looping */
} else if (!av_strcasecmp(cmd, "MulticastPort")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, 1, 65535, config,
- "Invalid MulticastPort: %s\n", arg);
+ "Invalid MulticastPort: '%s'\n", arg);
stream->multicast_port = val;
} else if (!av_strcasecmp(cmd, "MulticastTTL")) {
ffserver_get_arg(arg, sizeof(arg), p);
ffserver_set_int_param(&val, arg, 0, INT_MIN, INT_MAX, config,
- "Invalid MulticastTTL: %s\n", arg);
+ "Invalid MulticastTTL: '%s'\n", arg);
stream->multicast_ttl = val;
} else if (!av_strcasecmp(cmd, "NoLoop")) {
stream->loop = 0;
if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm")) {
if (config->dummy_actx->codec_id == AV_CODEC_ID_NONE)
config->dummy_actx->codec_id = config->guessed_audio_codec_id;
- if (!config->no_audio && config->dummy_actx->codec_id != AV_CODEC_ID_NONE) {
+ if (!config->no_audio &&
+ config->dummy_actx->codec_id != AV_CODEC_ID_NONE) {
AVCodecContext *audio_enc = avcodec_alloc_context3(avcodec_find_encoder(config->dummy_actx->codec_id));
add_codec(stream, audio_enc, config);
}
if (config->dummy_vctx->codec_id == AV_CODEC_ID_NONE)
config->dummy_vctx->codec_id = config->guessed_video_codec_id;
- if (!config->no_video && config->dummy_vctx->codec_id != AV_CODEC_ID_NONE) {
+ if (!config->no_video &&
+ config->dummy_vctx->codec_id != AV_CODEC_ID_NONE) {
AVCodecContext *video_enc = avcodec_alloc_context3(avcodec_find_encoder(config->dummy_vctx->codec_id));
add_codec(stream, video_enc, config);
}
avcodec_free_context(&config->dummy_vctx);
avcodec_free_context(&config->dummy_actx);
*pstream = NULL;
- } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
+ } else if (!av_strcasecmp(cmd, "File") ||
+ !av_strcasecmp(cmd, "ReadOnlyFile")) {
ffserver_get_arg(stream->feed_filename, sizeof(stream->feed_filename),
p);
} else if (!av_strcasecmp(cmd, "UseDefaults")) {
return AVERROR(ENOMEM);
}
-static int ffserver_parse_config_redirect(FFServerConfig *config, const char *cmd, const char **p,
+static int ffserver_parse_config_redirect(FFServerConfig *config,
+ const char *cmd, const char **p,
FFServerStream **predirect)
{
FFServerStream *redirect;
av_assert0(config);
- config->line_num = 0;
f = fopen(filename, "r");
if (!f) {
ret = AVERROR(errno);
}
config->first_stream = NULL;
- last_stream = &config->first_stream;
config->first_feed = NULL;
- last_feed = &config->first_feed;
config->errors = config->warnings = 0;
- for(;;) {
- if (fgets(line, sizeof(line), f) == NULL)
- break;
+ last_stream = &config->first_stream;
+ last_feed = &config->first_feed;
+
+ config->line_num = 0;
+ while (fgets(line, sizeof(line), f) != NULL) {
config->line_num++;
p = line;
while (av_isspace(*p))
if (opening && (stream || feed || redirect)) {
ERROR("Already in a tag\n");
} else {
- if ((ret = ffserver_parse_config_feed(config, cmd, &p, &feed)) < 0)
+ ret = ffserver_parse_config_feed(config, cmd, &p, &feed);
+ if (ret < 0)
break;
if (opening) {
- /* add in stream list */
+ /* add in stream & feed list */
*last_stream = feed;
- last_stream = &feed->next;
- /* add in feed list */
*last_feed = feed;
+ last_stream = &feed->next;
last_feed = &feed->next_feed;
}
}
if (opening && (stream || feed || redirect)) {
ERROR("Already in a tag\n");
} else {
- if ((ret = ffserver_parse_config_stream(config, cmd, &p, &stream)) < 0)
+ ret = ffserver_parse_config_stream(config, cmd, &p, &stream);
+ if (ret < 0)
break;
if (opening) {
/* add in stream list */
if (opening && (stream || feed || redirect))
ERROR("Already in a tag\n");
else {
- if ((ret = ffserver_parse_config_redirect(config, cmd, &p, &redirect)) < 0)
+ ret = ffserver_parse_config_redirect(config, cmd, &p,
+ &redirect);
+ if (ret < 0)
break;
if (opening) {
/* add in stream list */
}
}
if (stream || feed || redirect)
- ERROR("Not closed tag %s\n", stream ? "<Stream>" : (feed ? "<Feed>" : "<Redirect>"));
+ ERROR("Missing closing </%s> tag\n",
+ stream ? "Stream" : (feed ? "Feed" : "Redirect"));
fclose(f);
if (ret < 0)