mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 02:53:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: change OpenJPEG encoder to lossy with default parameters

Browse Source
This commit is contained in:
Vadim Levin 2020-08-27 15:11:45 +03:00
parent ba147d2be2
commit bce5d364df
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp
View File

@ -327,12 +327,14 @@ opj_cparameters setupEncoderParameters(const std::vector<int>& params)
{ {
opj_cparameters parameters; opj_cparameters parameters;
opj_set_default_encoder_parameters(&parameters); opj_set_default_encoder_parameters(&parameters);
bool rate_is_specified = false;
for (size_t i = 0; i < params.size(); i += 2) for (size_t i = 0; i < params.size(); i += 2)
{ {
switch (params[i]) switch (params[i])
{ {
case cv::IMWRITE_JPEG2000_COMPRESSION_X1000: case cv::IMWRITE_JPEG2000_COMPRESSION_X1000:
parameters.tcp_rates[0] = 1000.f / std::min(std::max(params[i + 1], 1), 1000); parameters.tcp_rates[0] = 1000.f / std::min(std::max(params[i + 1], 1), 1000);
rate_is_specified = true;
break; break;
default: default:
CV_LOG_WARNING(NULL, "OpenJPEG2000(encoder): skip unsupported parameter: " << params[i]); CV_LOG_WARNING(NULL, "OpenJPEG2000(encoder): skip unsupported parameter: " << params[i]);
@ -341,6 +343,10 @@ opj_cparameters setupEncoderParameters(const std::vector<int>& params)
} }
parameters.tcp_numlayers = 1; parameters.tcp_numlayers = 1;
parameters.cp_disto_alloc = 1; parameters.cp_disto_alloc = 1;
if (!rate_is_specified)
{
parameters.tcp_rates[0] = 4;
}
return parameters; return parameters;
} }

10
modules/imgcodecs/test/test_read_write.cpp
View File

@ -228,9 +228,12 @@ TEST_P(Imgcodecs_Image, read_write_BGR)
double psnrThreshold = 100; double psnrThreshold = 100;
if (ext == "jpg") if (ext == "jpg")
psnrThreshold = 32; psnrThreshold = 32;
#ifdef HAVE_JASPER #if defined(HAVE_JASPER)
if (ext == "jp2") if (ext == "jp2")
psnrThreshold = 95; psnrThreshold = 95;
#elif defined(HAVE_OPENJPEG)
if (ext == "jp2")
psnrThreshold = 35;
#endif #endif
Mat image = generateTestImageBGR(); Mat image = generateTestImageBGR();
@ -254,9 +257,12 @@ TEST_P(Imgcodecs_Image, read_write_GRAYSCALE)
double psnrThreshold = 100; double psnrThreshold = 100;
if (ext == "jpg") if (ext == "jpg")
psnrThreshold = 40; psnrThreshold = 40;
#ifdef HAVE_JASPER #if defined(HAVE_JASPER)
if (ext == "jp2") if (ext == "jp2")
psnrThreshold = 70; psnrThreshold = 70;
#elif defined(HAVE_OPENJPEG)
if (ext == "jp2")
psnrThreshold = 35;
#endif #endif
Mat image = generateTestImageGrayscale(); Mat image = generateTestImageGrayscale();