mirror of
https://github.com/opencv/opencv.git
synced 2024-12-15 18:09:11 +08:00
934e6899f8
imgcodecs: Add rgb flag for imread and imdecode #25809 Try to `imread` images by RGB to save R-B swapping costs. ## How to use it? ``` img_rgb = cv2.imread("PATH", IMREAD_COLOR_RGB) # OpenCV decode the image by RGB format. ``` ## TODO - [x] Fix the broken code - [x] Add imread rgb test - [x] Speed test of rgb mode. ## Performance test | file name | IMREAD_COLOR | IMREAD_COLOR_RGB | | --------- | ------ | --------- | | jpg01 | 284 ms | 277 ms | | jpg02 | 376 ms | 366 ms | | png01 | 62 ms | 60 ms | | Png02 | 97 ms | 94 ms | Test with [image_test.zip](https://github.com/user-attachments/files/15982949/image_test.zip) ```.cpp string img_path = "/Users/mzh/work/data/image_test/png02.png"; int loop = 20; TickMeter t; double t0 = 10000; for (int i = 0; i < loop; i++) { t.reset(); t.start(); img_bgr = imread(img_path, IMREAD_COLOR); t.stop(); if (t.getTimeMilli() < t0) t0 = t.getTimeMilli(); } std::cout<<"bgr time = "<<t0<<std::endl; t0 = 10000; for (int i = 0; i < loop; i++) { t.reset(); t.start(); img_rgb = imread(img_path, IMREAD_COLOR_RGB); t.stop(); if (t.getTimeMilli() < t0) t0 = t.getTimeMilli(); } std::cout<<"rgb time = "<<t0<<std::endl; ``` ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
427 lines
11 KiB
C++
427 lines
11 KiB
C++
// This file is part of OpenCV project.
|
|
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
|
// of this distribution and at http://opencv.org/license.html
|
|
#include "test_precomp.hpp"
|
|
|
|
namespace opencv_test { namespace {
|
|
|
|
#if defined(HAVE_PNG) || defined(HAVE_SPNG)
|
|
|
|
TEST(Imgcodecs_Png, write_big)
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
const string filename = root + "readwrite/read.png";
|
|
const string dst_file = cv::tempfile(".png");
|
|
Mat img;
|
|
ASSERT_NO_THROW(img = imread(filename));
|
|
ASSERT_FALSE(img.empty());
|
|
EXPECT_EQ(13043, img.cols);
|
|
EXPECT_EQ(13917, img.rows);
|
|
ASSERT_NO_THROW(imwrite(dst_file, img));
|
|
EXPECT_EQ(0, remove(dst_file.c_str()));
|
|
}
|
|
|
|
TEST(Imgcodecs_Png, encode)
|
|
{
|
|
vector<uchar> buff;
|
|
Mat img_gt = Mat::zeros(1000, 1000, CV_8U);
|
|
vector<int> param;
|
|
param.push_back(IMWRITE_PNG_COMPRESSION);
|
|
param.push_back(3); //default(3) 0-9.
|
|
EXPECT_NO_THROW(imencode(".png", img_gt, buff, param));
|
|
Mat img;
|
|
EXPECT_NO_THROW(img = imdecode(buff, IMREAD_ANYDEPTH)); // hang
|
|
EXPECT_FALSE(img.empty());
|
|
EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), img, img_gt);
|
|
}
|
|
|
|
TEST(Imgcodecs_Png, regression_ImreadVSCvtColor)
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
const string imgName = root + "../cv/shared/lena.png";
|
|
Mat original_image = imread(imgName);
|
|
Mat gray_by_codec = imread(imgName, IMREAD_GRAYSCALE);
|
|
Mat gray_by_cvt;
|
|
cvtColor(original_image, gray_by_cvt, COLOR_BGR2GRAY);
|
|
|
|
Mat diff;
|
|
absdiff(gray_by_codec, gray_by_cvt, diff);
|
|
EXPECT_LT(cvtest::mean(diff)[0], 1.);
|
|
EXPECT_PRED_FORMAT2(cvtest::MatComparator(10, 0), gray_by_codec, gray_by_cvt);
|
|
}
|
|
|
|
// Test OpenCV issue 3075 is solved
|
|
TEST(Imgcodecs_Png, read_color_palette_with_alpha)
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
Mat img;
|
|
|
|
// First Test : Read PNG with alpha, imread flag -1
|
|
img = imread(root + "readwrite/color_palette_alpha.png", IMREAD_UNCHANGED);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 4);
|
|
|
|
// pixel is red in BGRA
|
|
EXPECT_EQ(img.at<Vec4b>(0, 0), Vec4b(0, 0, 255, 255));
|
|
EXPECT_EQ(img.at<Vec4b>(0, 1), Vec4b(0, 0, 255, 255));
|
|
|
|
// Second Test : Read PNG without alpha, imread flag -1
|
|
img = imread(root + "readwrite/color_palette_no_alpha.png", IMREAD_UNCHANGED);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 3);
|
|
|
|
// pixel is red in BGR
|
|
EXPECT_EQ(img.at<Vec3b>(0, 0), Vec3b(0, 0, 255));
|
|
EXPECT_EQ(img.at<Vec3b>(0, 1), Vec3b(0, 0, 255));
|
|
|
|
// Third Test : Read PNG with alpha, imread flag 1
|
|
img = imread(root + "readwrite/color_palette_alpha.png", IMREAD_COLOR);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 3);
|
|
|
|
// pixel is red in BGR
|
|
EXPECT_EQ(img.at<Vec3b>(0, 0), Vec3b(0, 0, 255));
|
|
EXPECT_EQ(img.at<Vec3b>(0, 1), Vec3b(0, 0, 255));
|
|
|
|
img = imread(root + "readwrite/color_palette_alpha.png", IMREAD_COLOR_RGB);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 3);
|
|
|
|
// pixel is red in RGB
|
|
EXPECT_EQ(img.at<Vec3b>(0, 0), Vec3b(255, 0, 0));
|
|
EXPECT_EQ(img.at<Vec3b>(0, 1), Vec3b(255, 0, 0));
|
|
|
|
// Fourth Test : Read PNG without alpha, imread flag 1
|
|
img = imread(root + "readwrite/color_palette_no_alpha.png", IMREAD_COLOR);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 3);
|
|
|
|
// pixel is red in BGR
|
|
EXPECT_EQ(img.at<Vec3b>(0, 0), Vec3b(0, 0, 255));
|
|
EXPECT_EQ(img.at<Vec3b>(0, 1), Vec3b(0, 0, 255));
|
|
|
|
img = imread(root + "readwrite/color_palette_no_alpha.png", IMREAD_COLOR_RGB);
|
|
ASSERT_FALSE(img.empty());
|
|
ASSERT_TRUE(img.channels() == 3);
|
|
|
|
// pixel is red in RGB
|
|
EXPECT_EQ(img.at<Vec3b>(0, 0), Vec3b(255, 0, 0));
|
|
EXPECT_EQ(img.at<Vec3b>(0, 1), Vec3b(255, 0, 0));
|
|
}
|
|
|
|
/**
|
|
* Test for check whether reading exif orientation tag was processed successfully or not
|
|
* The test info is the set of 8 images named testExifRotate_{1 to 8}.png
|
|
* The test image is the square 10x10 points divided by four sub-squares:
|
|
* (R corresponds to Red, G to Green, B to Blue, W to white)
|
|
* --------- ---------
|
|
* | R | G | | G | R |
|
|
* |-------| - (tag 1) |-------| - (tag 2)
|
|
* | B | W | | W | B |
|
|
* --------- ---------
|
|
*
|
|
* --------- ---------
|
|
* | W | B | | B | W |
|
|
* |-------| - (tag 3) |-------| - (tag 4)
|
|
* | G | R | | R | G |
|
|
* --------- ---------
|
|
*
|
|
* --------- ---------
|
|
* | R | B | | G | W |
|
|
* |-------| - (tag 5) |-------| - (tag 6)
|
|
* | G | W | | R | B |
|
|
* --------- ---------
|
|
*
|
|
* --------- ---------
|
|
* | W | G | | B | R |
|
|
* |-------| - (tag 7) |-------| - (tag 8)
|
|
* | B | R | | W | G |
|
|
* --------- ---------
|
|
*
|
|
*
|
|
* Every image contains exif field with orientation tag (0x112)
|
|
* After reading each image and applying the orientation tag,
|
|
* the resulting image should be:
|
|
* ---------
|
|
* | R | G |
|
|
* |-------|
|
|
* | B | W |
|
|
* ---------
|
|
*
|
|
*/
|
|
|
|
typedef testing::TestWithParam<string> Imgcodecs_PNG_Exif;
|
|
|
|
// Solution to issue 16579: PNG read doesn't support Exif orientation data
|
|
#ifdef OPENCV_IMGCODECS_PNG_WITH_EXIF
|
|
TEST_P(Imgcodecs_PNG_Exif, exif_orientation)
|
|
#else
|
|
TEST_P(Imgcodecs_PNG_Exif, DISABLED_exif_orientation)
|
|
#endif
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
const string filename = root + GetParam();
|
|
const int colorThresholdHigh = 250;
|
|
const int colorThresholdLow = 5;
|
|
|
|
Mat m_img = imread(filename);
|
|
ASSERT_FALSE(m_img.empty());
|
|
Vec3b vec;
|
|
|
|
//Checking the first quadrant (with supposed red)
|
|
vec = m_img.at<Vec3b>(2, 2); //some point inside the square
|
|
EXPECT_LE(vec.val[0], colorThresholdLow);
|
|
EXPECT_LE(vec.val[1], colorThresholdLow);
|
|
EXPECT_GE(vec.val[2], colorThresholdHigh);
|
|
|
|
//Checking the second quadrant (with supposed green)
|
|
vec = m_img.at<Vec3b>(2, 7); //some point inside the square
|
|
EXPECT_LE(vec.val[0], colorThresholdLow);
|
|
EXPECT_GE(vec.val[1], colorThresholdHigh);
|
|
EXPECT_LE(vec.val[2], colorThresholdLow);
|
|
|
|
//Checking the third quadrant (with supposed blue)
|
|
vec = m_img.at<Vec3b>(7, 2); //some point inside the square
|
|
EXPECT_GE(vec.val[0], colorThresholdHigh);
|
|
EXPECT_LE(vec.val[1], colorThresholdLow);
|
|
EXPECT_LE(vec.val[2], colorThresholdLow);
|
|
}
|
|
|
|
const string exif_files[] =
|
|
{
|
|
"readwrite/testExifOrientation_1.png",
|
|
"readwrite/testExifOrientation_2.png",
|
|
"readwrite/testExifOrientation_3.png",
|
|
"readwrite/testExifOrientation_4.png",
|
|
"readwrite/testExifOrientation_5.png",
|
|
"readwrite/testExifOrientation_6.png",
|
|
"readwrite/testExifOrientation_7.png",
|
|
"readwrite/testExifOrientation_8.png"
|
|
};
|
|
|
|
INSTANTIATE_TEST_CASE_P(ExifFiles, Imgcodecs_PNG_Exif,
|
|
testing::ValuesIn(exif_files));
|
|
|
|
|
|
typedef testing::TestWithParam<string> Imgcodecs_Png_PngSuite;
|
|
|
|
TEST_P(Imgcodecs_Png_PngSuite, decode)
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
const string filename = root + "pngsuite/" + GetParam() + ".png";
|
|
const string xml_filename = root + "pngsuite/" + GetParam() + ".xml";
|
|
FileStorage fs(xml_filename, FileStorage::READ);
|
|
EXPECT_TRUE(fs.isOpened());
|
|
|
|
Mat src = imread(filename, IMREAD_UNCHANGED);
|
|
Mat gt;
|
|
fs.getFirstTopLevelNode() >> gt;
|
|
|
|
EXPECT_PRED_FORMAT2(cvtest::MatComparator(0, 0), src, gt);
|
|
}
|
|
|
|
const string pngsuite_files[] =
|
|
{
|
|
"basi0g01",
|
|
"basi0g02",
|
|
"basi0g04",
|
|
"basi0g08",
|
|
"basi0g16",
|
|
"basi2c08",
|
|
"basi2c16",
|
|
"basi3p01",
|
|
"basi3p02",
|
|
"basi3p04",
|
|
"basi3p08",
|
|
"basi4a08",
|
|
"basi4a16",
|
|
"basi6a08",
|
|
"basi6a16",
|
|
"basn0g01",
|
|
"basn0g02",
|
|
"basn0g04",
|
|
"basn0g08",
|
|
"basn0g16",
|
|
"basn2c08",
|
|
"basn2c16",
|
|
"basn3p01",
|
|
"basn3p02",
|
|
"basn3p04",
|
|
"basn3p08",
|
|
"basn4a08",
|
|
"basn4a16",
|
|
"basn6a08",
|
|
"basn6a16",
|
|
"bgai4a08",
|
|
"bgai4a16",
|
|
"bgan6a08",
|
|
"bgan6a16",
|
|
"bgbn4a08",
|
|
"bggn4a16",
|
|
"bgwn6a08",
|
|
"bgyn6a16",
|
|
"ccwn2c08",
|
|
"ccwn3p08",
|
|
"cdfn2c08",
|
|
"cdhn2c08",
|
|
"cdsn2c08",
|
|
"cdun2c08",
|
|
"ch1n3p04",
|
|
"ch2n3p08",
|
|
"cm0n0g04",
|
|
"cm7n0g04",
|
|
"cm9n0g04",
|
|
"cs3n2c16",
|
|
"cs3n3p08",
|
|
"cs5n2c08",
|
|
"cs5n3p08",
|
|
"cs8n2c08",
|
|
"cs8n3p08",
|
|
"ct0n0g04",
|
|
"ct1n0g04",
|
|
"cten0g04",
|
|
"ctfn0g04",
|
|
"ctgn0g04",
|
|
"cthn0g04",
|
|
"ctjn0g04",
|
|
"ctzn0g04",
|
|
"exif2c08",
|
|
"f00n0g08",
|
|
"f00n2c08",
|
|
"f01n0g08",
|
|
"f01n2c08",
|
|
"f02n0g08",
|
|
"f02n2c08",
|
|
"f03n0g08",
|
|
"f03n2c08",
|
|
"f04n0g08",
|
|
"f04n2c08",
|
|
"f99n0g04",
|
|
"g03n0g16",
|
|
"g03n2c08",
|
|
"g03n3p04",
|
|
"g04n0g16",
|
|
"g04n2c08",
|
|
"g04n3p04",
|
|
"g05n0g16",
|
|
"g05n2c08",
|
|
"g05n3p04",
|
|
"g07n0g16",
|
|
"g07n2c08",
|
|
"g07n3p04",
|
|
"g10n0g16",
|
|
"g10n2c08",
|
|
"g10n3p04",
|
|
"g25n0g16",
|
|
"g25n2c08",
|
|
"g25n3p04",
|
|
"oi1n0g16",
|
|
"oi1n2c16",
|
|
"oi2n0g16",
|
|
"oi2n2c16",
|
|
"oi4n0g16",
|
|
"oi4n2c16",
|
|
"oi9n0g16",
|
|
"oi9n2c16",
|
|
"pp0n2c16",
|
|
"pp0n6a08",
|
|
"ps1n0g08",
|
|
"ps1n2c16",
|
|
"ps2n0g08",
|
|
"ps2n2c16",
|
|
"s01i3p01",
|
|
"s01n3p01",
|
|
"s02i3p01",
|
|
"s02n3p01",
|
|
"s03i3p01",
|
|
"s03n3p01",
|
|
"s04i3p01",
|
|
"s04n3p01",
|
|
"s05i3p02",
|
|
"s05n3p02",
|
|
"s06i3p02",
|
|
"s06n3p02",
|
|
"s07i3p02",
|
|
"s07n3p02",
|
|
"s08i3p02",
|
|
"s08n3p02",
|
|
"s09i3p02",
|
|
"s09n3p02",
|
|
"s32i3p04",
|
|
"s32n3p04",
|
|
"s33i3p04",
|
|
"s33n3p04",
|
|
"s34i3p04",
|
|
"s34n3p04",
|
|
"s35i3p04",
|
|
"s35n3p04",
|
|
"s36i3p04",
|
|
"s36n3p04",
|
|
"s37i3p04",
|
|
"s37n3p04",
|
|
"s38i3p04",
|
|
"s38n3p04",
|
|
"s39i3p04",
|
|
"s39n3p04",
|
|
"s40i3p04",
|
|
"s40n3p04",
|
|
"tbbn0g04",
|
|
"tbbn2c16",
|
|
"tbbn3p08",
|
|
"tbgn2c16",
|
|
"tbgn3p08",
|
|
"tbrn2c08",
|
|
"tbwn0g16",
|
|
"tbwn3p08",
|
|
"tbyn3p08",
|
|
"tm3n3p02",
|
|
"tp0n0g08",
|
|
"tp0n2c08",
|
|
"tp0n3p08",
|
|
"tp1n3p08",
|
|
"z00n2c08",
|
|
"z03n2c08",
|
|
"z06n2c08",
|
|
"z09n2c08",
|
|
};
|
|
|
|
INSTANTIATE_TEST_CASE_P(/*nothing*/, Imgcodecs_Png_PngSuite,
|
|
testing::ValuesIn(pngsuite_files));
|
|
|
|
typedef testing::TestWithParam<string> Imgcodecs_Png_PngSuite_Corrupted;
|
|
|
|
TEST_P(Imgcodecs_Png_PngSuite_Corrupted, decode)
|
|
{
|
|
const string root = cvtest::TS::ptr()->get_data_path();
|
|
const string filename = root + "pngsuite/" + GetParam() + ".png";
|
|
|
|
Mat src = imread(filename, IMREAD_UNCHANGED);
|
|
|
|
// Corrupted files should not be read
|
|
EXPECT_TRUE(src.empty());
|
|
}
|
|
|
|
const string pngsuite_files_corrupted[] = {
|
|
"xc1n0g08",
|
|
"xc9n2c08",
|
|
"xcrn0g04",
|
|
"xcsn0g01",
|
|
"xd0n2c08",
|
|
"xd3n2c08",
|
|
"xd9n2c08",
|
|
"xdtn0g01",
|
|
"xhdn0g08",
|
|
"xlfn0g04",
|
|
"xs1n0g01",
|
|
"xs2n0g01",
|
|
"xs4n0g01",
|
|
"xs7n0g01",
|
|
};
|
|
|
|
INSTANTIATE_TEST_CASE_P(/*nothing*/, Imgcodecs_Png_PngSuite_Corrupted,
|
|
testing::ValuesIn(pngsuite_files_corrupted));
|
|
|
|
#endif // HAVE_PNG
|
|
|
|
}} // namespace
|