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;
}
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);
}
if (*params) {
if (!(param = av_get_token(¶ms, "|")))
return AVERROR(ENOMEM);
- params++; /* skip ':' */
+ if (*params)
+ params++; /* skip ':' */
ret = set_param(ctx, info, i, param);
av_free(param);
if (ret < 0)
return ret;
}
-
- av_log(ctx, AV_LOG_VERBOSE,
- "idx:%d name:'%s' type:%s explanation:'%s' ",
- i, info.name,
- info.type == F0R_PARAM_BOOL ? "bool" :
- info.type == F0R_PARAM_DOUBLE ? "double" :
- info.type == F0R_PARAM_COLOR ? "color" :
- info.type == F0R_PARAM_POSITION ? "position" :
- info.type == F0R_PARAM_STRING ? "string" : "unknown",
- info.explanation);
-
-#ifdef DEBUG
- av_log(ctx, AV_LOG_DEBUG, "value:");
- switch (info.type) {
- void *v;
- double d;
- char s[128];
- f0r_param_color_t col;
- f0r_param_position_t pos;
-
- case F0R_PARAM_BOOL:
- v = &d;
- s->get_param_value(s->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "%s", d >= 0.5 && d <= 1.0 ? "y" : "n");
- break;
- case F0R_PARAM_DOUBLE:
- v = &d;
- s->get_param_value(s->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "%f", d);
- break;
- case F0R_PARAM_COLOR:
- v = &col;
- s->get_param_value(s->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "%f/%f/%f", col.r, col.g, col.b);
- break;
- case F0R_PARAM_POSITION:
- v = &pos;
- s->get_param_value(s->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "%f/%f", pos.x, pos.y);
- break;
- default: /* F0R_PARAM_STRING */
- v = s;
- s->get_param_value(s->instance, v, i);
- av_log(ctx, AV_LOG_DEBUG, "'%s'\n", s);
- break;
- }
-#endif
- av_log(ctx, AV_LOG_VERBOSE, "\n");
}
return 0;
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);
}
}
/* see: http://piksel.org/frei0r/1.2/spec/1.2/spec/group__pluglocations.html */
- if ((path = av_strdup(getenv("FREI0R_PATH")))) {
- char *p, *ptr = NULL;
- for (p = path; p = strtok_r(p, ":", &ptr); p = NULL)
- if (s->dl_handle = load_path(ctx, p, dl_name))
- break;
- av_free(path);
+ if (path = getenv("FREI0R_PATH")) {
+ while(*path) {
+ char *ptr = av_get_token((const char **)&path, ":");
+ if (!ptr)
+ return AVERROR(ENOMEM);
+ s->dl_handle = load_path(ctx, ptr, dl_name);
+ av_freep(&ptr);
+ if (s->dl_handle)
+ break; /* found */
+ if (*path)
+ path++; /* skip ':' */
+ }
}
if (!s->dl_handle && (path = getenv("HOME"))) {
char prefix[1024];
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);
}
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);
}
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" :
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);
}
{ NULL }
};
-AVFilter avfilter_vf_frei0r = {
+AVFilter ff_vf_frei0r = {
.name = "frei0r",
.description = NULL_IF_CONFIG_SMALL("Apply a frei0r effect."),
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;
outlink->w = s->w;
outlink->h = s->h;
outlink->time_base = s->time_base;
+ outlink->frame_rate = av_inv_q(s->time_base);
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);
+ }
+ if (!s->params) {
+ av_log(ctx, AV_LOG_ERROR, "frei0r filter parameters not set.\n");
return AVERROR(EINVAL);
}
{ NULL }
};
-AVFilter avfilter_vsrc_frei0r_src = {
+AVFilter ff_vsrc_frei0r_src = {
.name = "frei0r_src",
.description = NULL_IF_CONFIG_SMALL("Generate a frei0r source."),