mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-25 04:30:02 +00:00
vf_frei0r: adjust error messages
This commit is contained in:
parent
5c9c305d14
commit
8accddeb58
@ -81,7 +81,7 @@ static void *load_sym(AVFilterContext *ctx, const char *sym_name)
|
||||
Frei0rContext *s = ctx->priv;
|
||||
void *sym = dlsym(s->dl_handle, sym_name);
|
||||
if (!sym)
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module\n", sym_name);
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not find symbol '%s' in loaded module.\n", sym_name);
|
||||
return sym;
|
||||
}
|
||||
|
||||
@ -129,7 +129,7 @@ static int set_param(AVFilterContext *ctx, f0r_param_info_t info, int index, cha
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'\n",
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid value '%s' for parameter '%s'.\n",
|
||||
param, info.name);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
@ -198,11 +198,11 @@ static int set_params(AVFilterContext *ctx, const char *params)
|
||||
default: /* F0R_PARAM_STRING */
|
||||
v = s;
|
||||
s->get_param_value(s->instance, v, i);
|
||||
av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
|
||||
av_log(ctx, AV_LOG_DEBUG, "'%s'", s);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
av_log(ctx, AV_LOG_VERBOSE, "\n");
|
||||
av_log(ctx, AV_LOG_VERBOSE, ".\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -213,7 +213,7 @@ static void *load_path(AVFilterContext *ctx, const char *prefix, const char *nam
|
||||
char path[1024];
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s%s", prefix, name, SLIBSUF);
|
||||
av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'\n", path);
|
||||
av_log(ctx, AV_LOG_DEBUG, "Looking for frei0r effect in '%s'.\n", path);
|
||||
return dlopen(path, RTLD_NOW|RTLD_LOCAL);
|
||||
}
|
||||
|
||||
@ -249,7 +249,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
|
||||
if (!s->dl_handle)
|
||||
s->dl_handle = load_path(ctx, "/usr/lib/frei0r-1/", dl_name);
|
||||
if (!s->dl_handle) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'\n", dl_name);
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not find module '%s'.\n", dl_name);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
@ -265,7 +265,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
|
||||
return AVERROR(EINVAL);
|
||||
|
||||
if (f0r_init() < 0) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module");
|
||||
av_log(ctx, AV_LOG_ERROR, "Could not init the frei0r module.\n");
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
@ -273,7 +273,7 @@ static av_cold int frei0r_init(AVFilterContext *ctx,
|
||||
pi = &s->plugin_info;
|
||||
if (pi->plugin_type != type) {
|
||||
av_log(ctx, AV_LOG_ERROR,
|
||||
"Invalid type '%s' for the plugin\n",
|
||||
"Invalid type '%s' for this plugin\n",
|
||||
pi->plugin_type == F0R_PLUGIN_TYPE_FILTER ? "filter" :
|
||||
pi->plugin_type == F0R_PLUGIN_TYPE_SOURCE ? "source" :
|
||||
pi->plugin_type == F0R_PLUGIN_TYPE_MIXER2 ? "mixer2" :
|
||||
@ -320,7 +320,7 @@ static int config_input_props(AVFilterLink *inlink)
|
||||
if (s->destruct && s->instance)
|
||||
s->destruct(s->instance);
|
||||
if (!(s->instance = s->construct(inlink->w, inlink->h))) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance");
|
||||
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
@ -427,13 +427,13 @@ static av_cold int source_init(AVFilterContext *ctx)
|
||||
AVRational frame_rate_q;
|
||||
|
||||
if (av_parse_video_size(&s->w, &s->h, s->size) < 0) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'\n", s->size);
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'.\n", s->size);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
if (av_parse_video_rate(&frame_rate_q, s->framerate) < 0 ||
|
||||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", s->framerate);
|
||||
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'.\n", s->framerate);
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
s->time_base.num = frame_rate_q.den;
|
||||
@ -456,7 +456,7 @@ static int source_config_props(AVFilterLink *outlink)
|
||||
if (s->destruct && s->instance)
|
||||
s->destruct(s->instance);
|
||||
if (!(s->instance = s->construct(outlink->w, outlink->h))) {
|
||||
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance");
|
||||
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance.\n");
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user