videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavfi/lut3d: move lut3d init to its definition scope.

This commit is contained in:
Clément Bœsch 2013-05-27 20:39:44 +02:00
parent 158d96e3f0
commit ae5738248a
1 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
libavfilter/vf_lut3d.c
View File

@ -410,60 +410,6 @@ static void set_identity_matrix(LUT3DContext *lut3d, int size)
}
}
#if CONFIG_LUT3D_FILTER
/* TODO: move to the CONFIG_LUT3D_FILTER definition scope at the bottom */
static av_cold int lut3d_init(AVFilterContext *ctx)
{
int ret;
FILE *f;
const char *ext;
LUT3DContext *lut3d = ctx->priv;
if (!lut3d->file) {
set_identity_matrix(lut3d, 32);
return 0;
}
f = fopen(lut3d->file, "r");
if (!f) {
ret = AVERROR(errno);
av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret));
return ret;
}
ext = strrchr(lut3d->file, '.');
if (!ext) {
av_log(ctx, AV_LOG_ERROR, "Unable to guess the format from the extension\n");
ret = AVERROR_INVALIDDATA;
goto end;
}
ext++;
if (!av_strcasecmp(ext, "dat")) {
lut3d->lutsize = 33;
ret = parse_dat(ctx, f);
} else if (!av_strcasecmp(ext, "3dl")) {
ret = parse_3dl(ctx, f);
} else if (!av_strcasecmp(ext, "cube")) {
ret = parse_cube(ctx, f);
} else if (!av_strcasecmp(ext, "m3d")) {
ret = parse_m3d(ctx, f);
} else {
av_log(ctx, AV_LOG_ERROR, "Unrecognized '.%s' file type\n", ext);
ret = AVERROR(EINVAL);
}
if (!ret && !lut3d->lutsize) {
av_log(ctx, AV_LOG_ERROR, "3D LUT is empty\n");
ret = AVERROR_INVALIDDATA;
}
end:
fclose(f);
return ret;
}
#endif
static int query_formats(AVFilterContext *ctx)
{
static const enum AVPixelFormat pix_fmts[] = {
@ -583,6 +529,57 @@ static const AVOption lut3d_options[] = {
AVFILTER_DEFINE_CLASS(lut3d);
static av_cold int lut3d_init(AVFilterContext *ctx)
{
int ret;
FILE *f;
const char *ext;
LUT3DContext *lut3d = ctx->priv;
if (!lut3d->file) {
set_identity_matrix(lut3d, 32);
return 0;
}
f = fopen(lut3d->file, "r");
if (!f) {
ret = AVERROR(errno);
av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret));
return ret;
}
ext = strrchr(lut3d->file, '.');
if (!ext) {
av_log(ctx, AV_LOG_ERROR, "Unable to guess the format from the extension\n");
ret = AVERROR_INVALIDDATA;
goto end;
}
ext++;
if (!av_strcasecmp(ext, "dat")) {
lut3d->lutsize = 33;
ret = parse_dat(ctx, f);
} else if (!av_strcasecmp(ext, "3dl")) {
ret = parse_3dl(ctx, f);
} else if (!av_strcasecmp(ext, "cube")) {
ret = parse_cube(ctx, f);
} else if (!av_strcasecmp(ext, "m3d")) {
ret = parse_m3d(ctx, f);
} else {
av_log(ctx, AV_LOG_ERROR, "Unrecognized '.%s' file type\n", ext);
ret = AVERROR(EINVAL);
}
if (!ret && !lut3d->lutsize) {
av_log(ctx, AV_LOG_ERROR, "3D LUT is empty\n");
ret = AVERROR_INVALIDDATA;
}
end:
fclose(f);
return ret;
}
static const AVFilterPad lut3d_inputs[] = {
{
.name = "default",