New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Lens Camera Profiles (LCP) #1215

Merged

fabiencastan merged 29 commits into develop from LCPManagement

Mar 13, 2023

Contributor

demoulinv commented Sep 9, 2022 •

edited by fabiencastan

Loading

Description

Add Adobe LCP file management.

Features list

Load a lcp file indicated by the user (cameraInit) and extract geometry and vignetting models corresponding to camera setting (focal length, focus distance and aperture).
Automatic search of an appropriate lcp file in a database based on camera maker and model (optional) and lens model (cameraInit).
Apply correction model for geometry and vignetting (imageProcessing).

Implementation remarks

expat library has been used to read and load a lcp file.
For geometry correction, only radial models with 3 parameters can be applied. All models made available in Adobe database are like that but using the Adobe LCP creator to generate a model, up to 5 parameters can be used.
Geometry model parameters are stored using intrinsics.
Vignetting model parameters are stored as image metadata.

alicevision/Meshroom#1771

fabiencastan reviewed

View reviewed changes

src/software/pipeline/CMakeLists.txt Outdated Show resolved Hide resolved

demoulinv force-pushed the LCPManagement branch 2 times, most recently from 2d0f3de to 1a323ef Compare

September 13, 2022 08:12

fabiencastan mentioned this pull request

[CI] Upgrade deps: opencv, expat #1224

Merged

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/software/pipeline/main_cameraInit.cpp Outdated Show resolved Hide resolved

p12tic reviewed

View reviewed changes

src/software/pipeline/main_cameraInit.cpp Outdated Show resolved Hide resolved

demoulinv force-pushed the LCPManagement branch 3 times, most recently from 48644d0 to c78ff6e Compare

September 20, 2022 13:06

fabiencastan added this to the 2.5.0 milestone

demoulinv force-pushed the LCPManagement branch from c78ff6e to bb624e0 Compare

November 2, 2022 14:20

demoulinv marked this pull request as ready for review

November 3, 2022 08:58

fabiencastan mentioned this pull request

Add support for Lens Camera Profiles (LCP) alicevision/Meshroom#1771

Merged

2 tasks

demoulinv force-pushed the LCPManagement branch from ea3b073 to f015f6c Compare

December 14, 2022 17:49

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.cpp Show resolved Hide resolved

demoulinv force-pushed the LCPManagement branch 2 times, most recently from 34f7cdb to 6c0fc68 Compare

December 23, 2022 10:11

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Outdated Show resolved Hide resolved

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Outdated Show resolved Hide resolved

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Show resolved Hide resolved

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Outdated Show resolved Hide resolved

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Show resolved Hide resolved

mugulmd reviewed

View reviewed changes

src/aliceVision/lensCorrectionProfile/lcp.hpp Show resolved Hide resolved

demoulinv and others added 23 commits

March 10, 2023 07:55


          Update test about lcp raw origin.

18d19ba


          [lens] split make/model

17780fb


          [cmake] expat: use target


          [lens] reduceString: replace all non-alphanumeric characters

bb78736


          [lens] check Make in filepath

0cd16dc


          [lens] add multiple levels of caching

6afa7df


          [LCP] fix compil linux in LCPdatabase::findLCP

aaa29f7


          [Intrinsics & cameraInit]

ebd2e88

ADD LCP as initialization mode for intrinsics.
Remove enableAutomaticLCPSearch parameter and code cleaning
Set intrinsics using lcp info (distortion model)
Parse LCP database default value True + Add Fisheye model
Rename lensCorrectionProfileSearchByLensNameAndCameraMakerOnly in lensCorrectionProfileSearchIgnoreCameraModel


          [LCP]

f62381f

Sort profiles by name before parsing them.
Update doc, adding expat.
Add comments in search algorithm code.


          [LCP] Add comments and move some methods from hpp to cpp.

6387b4b


          [cameraInit]

595514d

Bug fix: do not search in the LCP database if camera maker or lens model is missing.


          [DCP database] Add omp pragma when adding a new item.

a62b280


          [LCP search]

b86b876

Add empty filepath in the database if a LCP is not found in order to speed up next searches with the same key.


          [cameraInit DCP warning]

4de5cc9

Avoid DCP warning when loading jpg images.


          [cameraInit]

c1c6c8b

Add log info on DCP number


          [LCP metadata]

46c6af3

Add lensType as possible name for lensID metadata.
Search "lensModel" inside "lensPrettyNameLCP" instead of checking equality. In some cases, lensPrettyNameLCP is the lensModel prefixed by the lens maker.


          [cameraInit] improve thread synchronization with named critical areas

29922d1


          [Intrinsic disto] Create an initDistoMode enum and manage it from cam…

1d3e90e

…eraInit.


          [software] cameraInit: update logs

1c1a783


          [camera] distortion initialization mode: rename disto to distortion

a60a435


          [camera] use single enum for init mode + rename it to EInitMode

91e716b


          [Alembic IO] Add distortionInitialisationMode

8dbcfd4


          [alembic exporter]

4bc04ca

generateSample: Do not write distortionInitMode.
Add distortionInitMode Enum in all pinhole models.

demoulinv force-pushed the LCPManagement branch from 5e9d65c to 4bc04ca Compare

March 10, 2023 06:57

fabiencastan reviewed

View reviewed changes

src/aliceVision/camera/IntrinsicsScaleOffsetDisto.hpp

+                }
+                /**
+                 * @brief Get the intrinsic disto initialization mode

Member

fabiencastan Mar 13, 2023

distortion (instead of disto)

fabiencastan approved these changes

View reviewed changes

fabiencastan merged commit 7ad51ed into develop

fabiencastan deleted the LCPManagement branch

March 13, 2023 13:03

fabiencastan changed the title ~~Lcp management~~ Add support for Lens Camera Profiles (LCP)

almarouk mentioned this pull request

[doc] INSTALL.md: remove geogram broken link #1451

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet