RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_lensfun: display list of possible values if user supplied none

This commit is contained in:
Paul B Mahol 2021-02-05 15:26:10 +01:00
parent 8b78eb312d
commit d16293e76c
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavfilter/vf_lensfun.c
View File

@ -136,20 +136,6 @@ static av_cold int init(AVFilterContext *ctx)
const lfCamera **cameras; const lfCamera **cameras;
const lfLens **lenses; const lfLens **lenses;
if (!lensfun->make) {
av_log(ctx, AV_LOG_FATAL, "Option \"make\" not specified\n");
return AVERROR(EINVAL);
} else if (!lensfun->model) {
av_log(ctx, AV_LOG_FATAL, "Option \"model\" not specified\n");
return AVERROR(EINVAL);
} else if (!lensfun->lens_model) {
av_log(ctx, AV_LOG_FATAL, "Option \"lens_model\" not specified\n");
return AVERROR(EINVAL);
}
lensfun->lens = lf_lens_create();
lensfun->camera = lf_camera_create();
db = lf_db_create(); db = lf_db_create();
if (lf_db_load(db) != LF_NO_ERROR) { if (lf_db_load(db) != LF_NO_ERROR) {
lf_db_destroy(db); lf_db_destroy(db);
@ -157,6 +143,29 @@ static av_cold int init(AVFilterContext *ctx)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!lensfun->make || !lensfun->model) {
const lfCamera *const *cameras = lf_db_get_cameras(db);
av_log(ctx, AV_LOG_FATAL, "Option \"make\" or option \"model\" not specified\n");
av_log(ctx, AV_LOG_INFO, "Available values for \"make\" and \"model\":\n");
for (int i = 0; cameras && cameras[i]; i++)
av_log(ctx, AV_LOG_INFO, "\t%s\t%s\n", cameras[i]->Maker, cameras[i]->Model);
lf_db_destroy(db);
return AVERROR(EINVAL);
} else if (!lensfun->lens_model) {
const lfLens *const *lenses = lf_db_get_lenses(db);
av_log(ctx, AV_LOG_FATAL, "Option \"lens_model\" not specified\n");
av_log(ctx, AV_LOG_INFO, "Available values for \"lens_model\":\n");
for (int i = 0; lenses && lenses[i]; i++)
av_log(ctx, AV_LOG_INFO, "\t%s\t(make %s)\n", lenses[i]->Model, lenses[i]->Maker);
lf_db_destroy(db);
return AVERROR(EINVAL);
}
lensfun->lens = lf_lens_create();
lensfun->camera = lf_camera_create();
cameras = lf_db_find_cameras(db, lensfun->make, lensfun->model); cameras = lf_db_find_cameras(db, lensfun->make, lensfun->model);
if (cameras && *cameras) { if (cameras && *cameras) {
lf_camera_copy(lensfun->camera, *cameras); lf_camera_copy(lensfun->camera, *cameras);