Skip to content
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

Ccm pr #28

Merged
merged 3 commits into from
Nov 20, 2020
Merged

Ccm pr #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
592fea1
remove duplicate enum values
Nov 20, 2020
4287d41
add prefixes for enum values
Nov 20, 2020
5542747
update codes using cv_Error
Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 84 additions & 103 deletions modules/mcc/include/opencv2/mcc/ccm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ of the equipment, it is nessary to calibrate the captured color and the actual c
*/
enum CCM_TYPE
{
CCM_3x3, ///<The CCM with the shape \f$3\times3\f$ performs linear transformation on color values.
CCM_4x3, ///<The CCM with the shape \f$4\times3\f$ performs affine transformation.
CCM_3x3, ///< The CCM with the shape \f$3\times3\f$ performs linear transformation on color values.
CCM_4x3, ///< The CCM with the shape \f$4\times3\f$ performs affine transformation.
};

/** @brief Enum of the possible types of initial method.
*/
enum INITIAL_METHOD_TYPE
{
WHITE_BALANCE, ///< The white balance method. The initial value is:\n
INITIAL_METHOD_WHITE_BALANCE, ///< The white balance method. The initial value is:\n
/// \f$
/// M_{CCM}=
/// \begin{bmatrix}
Expand All @@ -81,56 +81,56 @@ enum INITIAL_METHOD_TYPE
/// k_R=mean(G_{li}')/mean(G_{li})\\
/// k_R=mean(B_{li}')/mean(B_{li})
/// \f$
LEAST_SQUARE, ///<the least square method is an optimal solution under the linear RGB distance function
INITIAL_METHOD_LEAST_SQUARE, ///<the least square method is an optimal solution under the linear RGB distance function
};
/** @brief Macbeth and Vinyl ColorChecker with 2deg D50
*/
enum CONST_COLOR {
Macbeth,
Vinyl,
DigitalSG,
COLORCHECKER_Macbeth, ///< Macbeth ColorChecker
COLORCHECKER_Vinyl, ///< DKK ColorChecker
COLORCHECKER_DigitalSG, ///< DigitalSG ColorChecker with 140 squares
};
enum COLOR_SPACE {
sRGB, ///< https://en.wikipedia.org/wiki/SRGB , RGB color space
sRGBL, ///< https://en.wikipedia.org/wiki/SRGB , linear RGB color space
AdobeRGB, ///< https://en.wikipedia.org/wiki/Adobe_RGB_color_space , RGB color space
AdobeRGBL, ///< https://en.wikipedia.org/wiki/Adobe_RGB_color_space , linear RGB color space
WideGamutRGB, ///< https://en.wikipedia.org/wiki/Wide-gamut_RGB_color_space , RGB color space
WideGamutRGBL, ///< https://en.wikipedia.org/wiki/Wide-gamut_RGB_color_space , linear RGB color space
ProPhotoRGB, ///< https://en.wikipedia.org/wiki/ProPhoto_RGB_color_space , RGB color space
ProPhotoRGBL, ///< https://en.wikipedia.org/wiki/ProPhoto_RGB_color_space , linear RGB color space
DCI_P3_RGB, ///< https://en.wikipedia.org/wiki/DCI-P3 , RGB color space
DCI_P3_RGBL, ///< https://en.wikipedia.org/wiki/DCI-P3 , linear RGB color space
AppleRGB, ///< https://en.wikipedia.org/wiki/RGB_color_space , RGB color space
AppleRGBL, ///< https://en.wikipedia.org/wiki/RGB_color_space , linear RGB color space
REC_709_RGB, ///< https://en.wikipedia.org/wiki/Rec._709 , RGB color space
REC_709_RGBL, ///< https://en.wikipedia.org/wiki/Rec._709 , linear RGB color space
REC_2020_RGB, ///< https://en.wikipedia.org/wiki/Rec._2020 , RGB color space
REC_2020_RGBL, ///< https://en.wikipedia.org/wiki/Rec._2020 , linear RGB color space
XYZ_D65_2, ///< https://en.wikipedia.org/wiki/CIE_1931_color_space , non-RGB color space
XYZ_D65_10, ///< non-RGB color space
XYZ_D50_2, ///< non-RGB color space
XYZ_D50_10, ///< non-RGB color space
XYZ_A_2, ///< non-RGB color space
XYZ_A_10, ///< non-RGB color space
XYZ_D55_2, ///< non-RGB color space
XYZ_D55_10, ///< non-RGB color space
XYZ_D75_2, ///< non-RGB color space
XYZ_D75_10, ///< non-RGB color space
XYZ_E_2, ///< non-RGB color space
XYZ_E_10, ///< non-RGB color space
Lab_D65_2, ///< https://en.wikipedia.org/wiki/CIELAB_color_space , non-RGB color space
Lab_D65_10, ///< non-RGB color space
Lab_D50_2, ///< non-RGB color space
Lab_D50_10, ///< non-RGB color space
Lab_A_2, ///< non-RGB color space
Lab_A_10, ///< non-RGB color space
Lab_D55_2, ///< non-RGB color space
Lab_D55_10, ///< non-RGB color space
Lab_D75_2, ///< non-RGB color space
Lab_D75_10, ///< non-RGB color space
Lab_E_2, ///< non-RGB color space
Lab_E_10, ///< non-RGB color space
COLOR_SPACE_sRGB, ///< https://en.wikipedia.org/wiki/SRGB , RGB color space
COLOR_SPACE_sRGBL, ///< https://en.wikipedia.org/wiki/SRGB , linear RGB color space
COLOR_SPACE_AdobeRGB, ///< https://en.wikipedia.org/wiki/Adobe_RGB_color_space , RGB color space
COLOR_SPACE_AdobeRGBL, ///< https://en.wikipedia.org/wiki/Adobe_RGB_color_space , linear RGB color space
COLOR_SPACE_WideGamutRGB, ///< https://en.wikipedia.org/wiki/Wide-gamut_RGB_color_space , RGB color space
COLOR_SPACE_WideGamutRGBL, ///< https://en.wikipedia.org/wiki/Wide-gamut_RGB_color_space , linear RGB color space
COLOR_SPACE_ProPhotoRGB, ///< https://en.wikipedia.org/wiki/ProPhoto_RGB_color_space , RGB color space
COLOR_SPACE_ProPhotoRGBL, ///< https://en.wikipedia.org/wiki/ProPhoto_RGB_color_space , linear RGB color space
COLOR_SPACE_DCI_P3_RGB, ///< https://en.wikipedia.org/wiki/DCI-P3 , RGB color space
COLOR_SPACE_DCI_P3_RGBL, ///< https://en.wikipedia.org/wiki/DCI-P3 , linear RGB color space
COLOR_SPACE_AppleRGB, ///< https://en.wikipedia.org/wiki/RGB_color_space , RGB color space
COLOR_SPACE_AppleRGBL, ///< https://en.wikipedia.org/wiki/RGB_color_space , linear RGB color space
COLOR_SPACE_REC_709_RGB, ///< https://en.wikipedia.org/wiki/Rec._709 , RGB color space
COLOR_SPACE_REC_709_RGBL, ///< https://en.wikipedia.org/wiki/Rec._709 , linear RGB color space
COLOR_SPACE_REC_2020_RGB, ///< https://en.wikipedia.org/wiki/Rec._2020 , RGB color space
COLOR_SPACE_REC_2020_RGBL, ///< https://en.wikipedia.org/wiki/Rec._2020 , linear RGB color space
COLOR_SPACE_XYZ_D65_2, ///< https://en.wikipedia.org/wiki/CIE_1931_color_space , non-RGB color space
COLOR_SPACE_XYZ_D65_10, ///< non-RGB color space
COLOR_SPACE_XYZ_D50_2, ///< non-RGB color space
COLOR_SPACE_XYZ_D50_10, ///< non-RGB color space
COLOR_SPACE_XYZ_A_2, ///< non-RGB color space
COLOR_SPACE_XYZ_A_10, ///< non-RGB color space
COLOR_SPACE_XYZ_D55_2, ///< non-RGB color space
COLOR_SPACE_XYZ_D55_10, ///< non-RGB color space
COLOR_SPACE_XYZ_D75_2, ///< non-RGB color space
COLOR_SPACE_XYZ_D75_10, ///< non-RGB color space
COLOR_SPACE_XYZ_E_2, ///< non-RGB color space
COLOR_SPACE_XYZ_E_10, ///< non-RGB color space
COLOR_SPACE_Lab_D65_2, ///< https://en.wikipedia.org/wiki/CIELAB_color_space , non-RGB color space
COLOR_SPACE_Lab_D65_10, ///< non-RGB color space
COLOR_SPACE_Lab_D50_2, ///< non-RGB color space
COLOR_SPACE_Lab_D50_10, ///< non-RGB color space
COLOR_SPACE_Lab_A_2, ///< non-RGB color space
COLOR_SPACE_Lab_A_10, ///< non-RGB color space
COLOR_SPACE_Lab_D55_2, ///< non-RGB color space
COLOR_SPACE_Lab_D55_10, ///< non-RGB color space
COLOR_SPACE_Lab_D75_2, ///< non-RGB color space
COLOR_SPACE_Lab_D75_10, ///< non-RGB color space
COLOR_SPACE_Lab_E_2, ///< non-RGB color space
COLOR_SPACE_Lab_E_10, ///< non-RGB color space
};

/** @brief Linearization transformation type
Expand Down Expand Up @@ -294,7 +294,7 @@ ln(C_{sl})=f(ln(C_s)), \qquad C_s>0\\
C_{sl}=0, \qquad C_s=0
\f]

Because \f$exp(ln(0))\to\infin\f$, the channel whose component is 0 is directly mapped to 0 in the formula above.
Because \f$exp(ln(0))\to\infty \f$, the channel whose component is 0 is directly mapped to 0 in the formula above.

For fitting channels respectively, we have:
\f[
Expand Down Expand Up @@ -328,12 +328,13 @@ C_sl=0, \qquad C_s=0
*/
enum LINEAR_TYPE
{
IDENTITY_,
GAMMA,
COLORPOLYFIT,
COLORLOGPOLYFIT,
GRAYPOLYFIT,
GRAYLOGPOLYFIT

LINEARIZATION_IDENTITY, ///<no change is made
LINEARIZATION_GAMMA, ///<gamma correction; Need assign a value to gamma simultaneously
LINEARIZATION_COLORPOLYFIT, ///<polynomial fitting channels respectively; Need assign a value to deg simultaneously
LINEARIZATION_COLORLOGPOLYFIT, ///<logarithmic polynomial fitting channels respectively; Need assign a value to deg simultaneously
LINEARIZATION_GRAYPOLYFIT, ///<grayscale polynomial fitting; Need assign a value to deg and dst_whites simultaneously
LINEARIZATION_GRAYLOGPOLYFIT ///<grayscale Logarithmic polynomial fitting; Need assign a value to deg and dst_whites simultaneously
};

/** @brief Enum of possible functions to calculate the distance between colors.
Expand All @@ -342,14 +343,14 @@ See https://en.wikipedia.org/wiki/Color_difference for details
*/
enum DISTANCE_TYPE
{
CIE76, ///< The 1976 formula is the first formula that related a measured color difference to a known set of CIELAB coordinates.
CIE94_GRAPHIC_ARTS, ///< The 1976 definition was extended to address perceptual non-uniformities.
CIE94_TEXTILES,
CIE2000,
CMC_1TO1, ///< In 1984, the Colour Measurement Committee of the Society of Dyers and Colourists defined a difference measure, also based on the L*C*h color model.
CMC_2TO1,
RGB,
RGBL
DISTANCE_CIE76, ///<The 1976 formula is the first formula that related a measured color difference to a known set of CIELAB coordinates.
DISTANCE_CIE94_GRAPHIC_ARTS, ///<The 1976 definition was extended to address perceptual non-uniformities.
DISTANCE_CIE94_TEXTILES,
DISTANCE_CIE2000,
DISTANCE_CMC_1TO1, ///<In 1984, the Colour Measurement Committee of the Society of Dyers and Colourists defined a difference measure, also based on the L*C*h color model.
DISTANCE_CMC_2TO1,
DISTANCE_RGB, ///<Euclidean distance of rgb color space
DISTANCE_RGBL ///<Euclidean distance of rgbl color space
};

/** @brief Core class of ccm model
Expand All @@ -362,9 +363,9 @@ class CV_EXPORTS_W ColorCorrectionModel
/** @brief Color Correction Model

Supported list of color cards:
- @ref Macbeth (Macbeth ColorChecker)
- @ref Vinyl (DKK ColorChecker)
- @ref DigitalSG (DigitalSG ColorChecker with 140 squares)
- @ref COLORCHECKER_Macbeth (Macbeth ColorChecker)
- @ref COLORCHECKER_Vinyl (DKK ColorChecker)
- @ref COLORCHECKER_DigitalSG (DigitalSG ColorChecker with 140 squares)

@param src detected colors of ColorChecker patches;\n
the color type is RGB not BGR, and the color values are in [0, 1];
Expand Down Expand Up @@ -396,10 +397,17 @@ class CV_EXPORTS_W ColorCorrectionModel
/** @brief set ColorSpace

@note It should be some RGB color space;
For the list of RGB color spaces supported, see the notes above

@param cs the absolute color space that detected colors convert to;\n
default: sRGB
Supported list of color cards:
- @ref COLOR_SPACE_sRGB,
- @ref COLOR_SPACE_AdobeRGB,
- @ref COLOR_SPACE_WideGamutRGB,
- @ref COLOR_SPACE_ProPhotoRGB,
- @ref COLOR_SPACE_DCI_P3_RGB,
- @ref COLOR_SPACE_AppleRGB,
- @ref COLOR_SPACE_REC_709_RGB,
- @ref COLOR_SPACE_REC_2020_RGB,
- @param cs the absolute color space that detected colors convert to;\n
default: @ref COLOR_SPACE_sRGB
*/
CV_WRAP void setColorSpace(COLOR_SPACE cs);

Expand All @@ -410,41 +418,16 @@ class CV_EXPORTS_W ColorCorrectionModel
CV_WRAP void setCCM_TYPE(CCM_TYPE ccm_type);

/** @brief set Distance

Supported list:
- @ref CIE2000
- @ref CIE94_GRAPHIC_ARTS
- @ref CIE94_TEXTILES
- @ref CIE76
- @ref CMC_1TO1
- @ref CMC_2TO1
- @ref RGB (Euclidean distance of rgb color space)
- @ref RGBL (Euclidean distance of rgbl color space)

@param distance the type of color distance;\n
default: @ref CIE2000
default: @ref DISTANCE_CIE2000
*/
CV_WRAP void setDistance(DISTANCE_TYPE distance);

/** @brief set Linear

@note see Linearization.pdf for details

Supported list:
- "IDENTITY_" (no change is made)
- "GAMMA" (gamma correction;
Need assign a value to gamma simultaneously)
- "COLORPOLYFIT" (polynomial fitting channels respectively;
Need assign a value to deg simultaneously)
- "GRAYPOLYFIT" (grayscale polynomial fitting;
Need assign a value to deg and dst_whites simultaneously)
- "COLORLOGPOLYFIT"(logarithmic polynomial fitting channels respectively;
Need assign a value to deg simultaneously)
- "GRAYLOGPOLYFIT" (grayscale Logarithmic polynomial fitting;
Need assign a value to deg and dst_whites simultaneously)

@param linear_type the method of linearization;\n
default: @ref GAMMA
default: @ref LINEARIZATION_GAMMA
*/
CV_WRAP void setLinear(LINEAR_TYPE linear_type);

Expand All @@ -459,8 +442,11 @@ class CV_EXPORTS_W ColorCorrectionModel

/** @brief set degree
@param deg the degree of linearization polynomial;\n
NOTICE: only valid when linear is set to "COLORPOLYFIT", "GRAYPOLYFIT",
"COLORLOGPOLYFIT" and "GRAYLOGPOLYFIT";\n
NOTICE: only valid when linear is set to
@ref LINEARIZATION_COLORPOLYFIT
@ref LINEARIZATION_GRAYPOLYFIT
@ref LINEARIZATION_COLORLOGPOLYFIT
@ref LINEARIZATION_GRAYLOGPOLYFIT
default: 3
*/
CV_WRAP void setLinearDegree(int deg);
Expand Down Expand Up @@ -489,11 +475,6 @@ class CV_EXPORTS_W ColorCorrectionModel
CV_WRAP void setWeightCoeff(double weights_coeff);

/** @brief set InitialMethod

Supported list:
'LEAST_SQUARE' (least-squre method);
'WHITE_BALANCE' (white balance method);\n

@param initial_method_type the method of calculating CCM initial value;\n
*/
CV_WRAP void setInitialMethod(INITIAL_METHOD_TYPE initial_method_type);
Expand Down
6 changes: 3 additions & 3 deletions modules/mcc/samples/color_correction_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ int main(int argc, char *argv[])
*/
// model1.setColorSpace(sRGB);
// model1.setCCM_TYPE(CCM_3x3);
// model1.setDistance(CIE2000);
// model1.setLinear(GAMMA);
// model1.setDistance(DISTANCE_CIE2000);
// model1.setLinear(LINEARIZATION_GAMMA);
// model1.setLinearGamma(2.2);
// model1.setLinearDegree(3);
// model1.setSaturatedThreshold(0, 0.98);
Expand Down Expand Up @@ -117,7 +117,7 @@ int main(int argc, char *argv[])
// Vec3d(68.70700069999999, 12.2959995, 16.2129993),
// Vec3d(63.6839981, 10.2930002, 16.7639999));

// ColorCorrectionModel model8(src,ref,Lab_D50_2);
// ColorCorrectionModel model8(src,ref,COLOR_SPACE_Lab_D50_2);
// model8.run();
//! [reference_color_values]

Expand Down
24 changes: 11 additions & 13 deletions modules/mcc/src/ccm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,11 @@ class ColorCorrectionModel::Impl
void calWeightsMasks(Mat weights_list, double weights_coeff, Mat saturate_mask);

/** @brief Fitting nonlinear - optimization initial value by white balance.
see CCM.pdf for details.
@return the output array, type of Mat
*/
void initialWhiteBalance(void);

/** @brief Fitting nonlinear-optimization initial value by least square.
see CCM.pdf for details
@param fit if fit is True, return optimalization for rgbl distance function.
*/
void initialLeastSquare(bool fit = false);
Expand Down Expand Up @@ -138,15 +136,15 @@ class ColorCorrectionModel::Impl
};

ColorCorrectionModel::Impl::Impl()
: cs(*GetCS::get_rgb(sRGB))
: cs(*GetCS::get_rgb(COLOR_SPACE_sRGB))
, ccm_type(CCM_3x3)
, distance(CIE2000)
, linear_type(GAMMA)
, distance(DISTANCE_CIE2000)
, linear_type(LINEARIZATION_GAMMA)
, weights(Mat())
, gamma(2.2)
, deg(3)
, saturated_threshold({ 0, 0.98 })
, initial_method_type(LEAST_SQUARE)
, initial_method_type(INITIAL_METHOD_LEAST_SQUARE)
, weights_coeff(0)
, max_count(5000)
, epsilon(1.e-4)
Expand All @@ -170,7 +168,7 @@ Mat ColorCorrectionModel::Impl::prepare(const Mat& inp)
return arr_out;
}
default:
throw std::invalid_argument { "Wrong ccm_type!" };
CV_Error(Error::StsBadArg, "Wrong ccm_type!");
break;
}
}
Expand Down Expand Up @@ -250,7 +248,7 @@ void ColorCorrectionModel::Impl::initialLeastSquare(bool fit)
double ColorCorrectionModel::Impl::calc_loss_(Color color)
{
Mat distlist = color.diff(*dst, distance);
Color lab = color.to(Lab_D50_2);
Color lab = color.to(COLOR_SPACE_Lab_D50_2);
Mat dist_;
pow(distlist, 2, dist_);
if (!weights.empty())
Expand Down Expand Up @@ -287,7 +285,7 @@ Mat ColorCorrectionModel::infer(const Mat& img, bool islinear)
{
if (!p->ccm.data)
{
throw "No CCM values!";
CV_Error(Error::StsBadArg, "No CCM values!" );
}
Mat img_lin = (p->linear)->linearize(img);
Mat img_ccm(img_lin.size(), img_lin.type());
Expand Down Expand Up @@ -395,20 +393,20 @@ void ColorCorrectionModel::run()
// distance function may affect the loss function and the fitting function
switch (p->distance)
{
case cv::ccm::RGBL:
case cv::ccm::DISTANCE_RGBL:
p->initialLeastSquare(true);
break;
default:
switch (p->initial_method_type)
{
case cv::ccm::WHITE_BALANCE:
case cv::ccm::INITIAL_METHOD_WHITE_BALANCE:
p->initialWhiteBalance();
break;
case cv::ccm::LEAST_SQUARE:
case cv::ccm::INITIAL_METHOD_LEAST_SQUARE:
p->initialLeastSquare();
break;
default:
throw std::invalid_argument { "Wrong initial_methoddistance_type!" };
CV_Error(Error::StsBadArg, "Wrong initial_methoddistance_type!" );
break;
}
break;
Expand Down
Loading