[software] New ColorChecker Detection and Correction

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: alicevision/alicevision-deps:ci-2020.09.09-centos7-cuda10.2
+      image: alicevision/alicevision-deps:ci-2021-04-22-centos7-cuda10.2
     env:
       DEPS_INSTALL_DIR: /opt/AliceVision_install
       BUILD_TYPE: Release

CMakeLists.txt

@@ -627,8 +627,8 @@ set(ALEMBIC_CMAKE_FLAGS -DAlembic_DIR:PATH=${CMAKE_INSTALL_PREFIX}/lib/cmake/Ale
 if(AV_BUILD_OPENCV)
 set(OPENCV_TARGET opencv)
 ExternalProject_Add(opencv_contrib
-  URL https://github.com/opencv/opencv_contrib/archive/4.5.1.zip
-  URL_MD5 ddb4f64d6cf31d589a8104655d39c99b
+  URL https://github.com/opencv/opencv_contrib/archive/4.5.2.zip
+  URL_MD5 1f5218d9c47994cb38bc018596534e4d
   DOWNLOAD_DIR ${BUILD_DIR}/download/opencv_contrib
   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/opencv_contrib
   BUILD_ALWAYS 0
@@ -639,8 +639,8 @@ ExternalProject_Add(opencv_contrib
 )
 ExternalProject_Add(${OPENCV_TARGET}
   DEPENDS opencv_contrib ${TBB_TARGET} ${ZLIB_TARGET} ${OPENEXR_TARGET} ${TIFF_TARGET} ${PNG_TARGET} ${JPEG_TARGET} ${LIBRAW_TARGET} ${FFMPEG_TARGET}
-  URL https://github.com/opencv/opencv/archive/4.5.1.zip
-  URL_MD5 cc13d83c3bf989b0487bb3798375ee08
+  URL https://github.com/opencv/opencv/archive/4.5.2.zip
+  URL_MD5 f100177ab3e7b884f490cba4cff8e074
   DOWNLOAD_DIR ${BUILD_DIR}/download/opencv
   UPDATE_COMMAND ""
   BUILD_IN_SOURCE 0
@@ -670,7 +670,7 @@ ExternalProject_Add(${OPENCV_TARGET}
     -DWITH_CUDA=OFF
     -DWITH_OPENCL=OFF
     -DBUILD_TESTS=OFF
-    -DBUILD_LIST=core,improc,photo,objdetect,video,imgcodecs,videoio,features2d,xfeatures2d,version
+    -DBUILD_LIST=core,improc,photo,objdetect,video,imgcodecs,videoio,features2d,xfeatures2d,version,mcc
     <SOURCE_DIR>
   BUILD_COMMAND $(MAKE)
 )

docker/fetch.sh

@@ -39,7 +39,7 @@ cmake -P "opencv_contrib-prefix/src/opencv_contrib-stamp/download-opencv_contrib
 
 cmake -P "external/src/alembic-stamp/download-alembic.cmake"
 cmake -P "external/src/boost-stamp/download-boost.cmake"
-cmake -P "external/src/ceres-stamp/download-ceres.cmake"
+# cmake -P "external/src/ceres-stamp/download-ceres.cmake"
 cmake -P "external/src/eigen-stamp/download-eigen.cmake"
 cmake -P "external/src/ffmpeg-stamp/download-ffmpeg.cmake"
 cmake -P "external/src/geogram-stamp/download-geogram.cmake"

src/aliceVision/image/all.hpp

@@ -24,5 +24,6 @@
 #include "aliceVision/image/convolutionBase.hpp"
 #include "aliceVision/image/convolution.hpp"
 #include "aliceVision/image/Sampler.hpp"
+#include "aliceVision/image/convertionOpenCV.hpp"
 
 

src/aliceVision/image/convertionOpenCV.hpp

@@ -0,0 +1,98 @@
+// This file is part of the AliceVision project.
+// Copyright (c) 2021 AliceVision contributors.
+// This Source Code Form is subject to the terms of the Mozilla Public License,
+// v. 2.0. If a copy of the MPL was not distributed with this file,
+// You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#if ALICEVISION_IS_DEFINED(ALICEVISION_HAVE_OPENCV)
+
+#include "aliceVision/image/Image.hpp"
+#include <aliceVision/numeric/numeric.hpp>
+
+#include <opencv2/core.hpp>
+
+namespace aliceVision{
+namespace image
+{
+
+
+/**
+ * @brief Sets the value at the specified pixel of a OpenCV BGR image matrix
+ * Ignores the alpha channel of the source image
+ * @tparam VecType - OpenCV vector type to interpret the mat values with
+ * @tparam ValueType - numeric type to cast the color values
+ * @param[inout] mat - OpenCV mat to set
+ * @param[in] i - row index to set
+ * @param[in] j - column index to set
+ * @param[in] color - value to set
+ * @param[in] factor - optional scale factor
+ * @param[in] delta - optional delta added to the scaled values
+ * @return the resulting openCV image
+ */
+template <typename VecType, typename ValueType>
+inline void setValueCvMatBGR(cv::Mat& mat, int i, int j, const image::RGBAfColor& color, float factor = 1.f,
+                             float delta = 0.f)
+{
+    mat.at<VecType>(i, j)[0] = (ValueType) clamp(color.b() * factor + delta, 0.f, 255.f);
+    mat.at<VecType>(i, j)[1] = (ValueType) clamp(color.g() * factor + delta, 0.f, 255.f);
+    mat.at<VecType>(i, j)[2] = (ValueType) clamp(color.r() * factor + delta, 0.f, 255.f);
+}
+
+
+/**
+ * @brief Converts an aliceVision image to an openCv image (cv::Mat) in BGR
+ * Ignores the alpha channel of the source image
+ * @param[in] img - Input RGBA aliceVision image
+ * @param[in] cvtype - OpenCV mat type (supported values: CV_32FC3, CV_8UC3)
+ * @return the resulting openCV image
+ */
+inline cv::Mat imageRGBAToCvMatBGR(const image::Image<image::RGBAfColor>& img, int cvtype = CV_32FC3)
+{
+    cv::Mat mat(img.Height(), img.Width(), cvtype);
+    for(int i = 0; i < img.Height(); i++)
+    {
+        for(int j = 0; j < img.Width(); j++)
+        {
+            switch(cvtype)
+            {
+                case CV_32FC3:
+                    setValueCvMatBGR<cv::Vec3f, float>(mat, i, j, img(i, j));
+                    break;
+                case CV_8UC3:
+                    setValueCvMatBGR<cv::Vec3b, uint8_t>(mat, i, j, img(i, j), 255.f);
+                    break;
+                default:
+                    std::runtime_error("Cannot handle OpenCV matrix type '" + std::to_string(cvtype) + "'.");
+            }
+        }
+    }
+    return mat;
+}
+
+
+/**
+ * @brief Converts an openCv image (cv::Mat) in BGR to an aliceVision image
+ * Keeps the alpha channel of the output image unchanged
+ * @param[in] img - Input openCV image (cv::Mat)
+ * @param[out] img - output RGBA aliceVision image
+ * @return the resulting regex
+ */
+inline void cvMatBGRToImageRGBA(const cv::Mat& img, image::Image<image::RGBAfColor>& imageOut)
+{
+    for(int row = 0; row < imageOut.Height(); row++)
+    {
+        const cv::Vec3f* rowPtr = img.ptr<cv::Vec3f>(row);
+        for(int col = 0; col < imageOut.Width(); col++)
+        {
+            const cv::Vec3f& matPixel = rowPtr[col];
+            imageOut(row, col) = image::RGBAfColor(matPixel[2], matPixel[1], matPixel[0], imageOut(row, col).a());
+        }
+    }
+}
+
+} // namespace image
+} // namespace aliceVision
+
+#endif // ALICEVISION_HAVE_OPENCV

src/software/utils/CMakeLists.txt

@@ -251,6 +251,38 @@ alicevision_add_software(aliceVision_utils_lightingEstimation
         ${Boost_LIBRARIES}
 )
 
+
+# Perform color chart detection
+if(ALICEVISION_HAVE_OPENCV)
+  alicevision_add_software(aliceVision_utils_colorCheckerDetection
+    SOURCE main_colorCheckerDetection.cpp
+    FOLDER ${FOLDER_SOFTWARE_UTILS}
+    LINKS aliceVision_system
+          aliceVision_sfmData
+          aliceVision_sfmDataIO
+          Boost::program_options
+          Boost::filesystem
+          ${OpenCV_LIBS} # opencv_core  opencv_imgproc  opencv_video  opencv_imgcodecs  opencv_videoio  opencv_features2d  opencv_xfeatures2d
+          opencv_mcc
+)
+endif()
+
+
+# Perform color correction
+if(ALICEVISION_HAVE_OPENCV)
+  alicevision_add_software(aliceVision_utils_colorCheckerCorrection
+    SOURCE main_colorCheckerCorrection.cpp
+    FOLDER ${FOLDER_SOFTWARE_UTILS}
+    LINKS aliceVision_system
+          aliceVision_sfmData
+          aliceVision_sfmDataIO
+          Boost::program_options
+          Boost::filesystem
+          ${OpenCV_LIBS} # opencv_core  opencv_imgproc  opencv_video  opencv_imgcodecs  opencv_videoio  opencv_features2d  opencv_xfeatures2d
+          opencv_mcc
+)
+endif()
+
 endif() # ALICEVISION_BUILD_SFM
 
 if(ALICEVISION_BUILD_MVS)