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

Merge pull request #26894 from Kumataro:fix26893

Browse Source 
imgcodecs: tiff: refactor Imgcodecs_Tiff_decode_Huge test
This commit is contained in:
Alexander Smorkalov 2025-02-10 10:46:31 +03:00 committed by GitHub
commit ce51023ad4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/imgcodecs/include/opencv2/imgcodecs.hpp
View File

@ -65,6 +65,7 @@ namespace cv
//! @{ //! @{
//! Imread flags //! Imread flags
//! @note IMREAD_COLOR_BGR (IMREAD_COLOR) and IMREAD_COLOR_RGB can not be set at the same time.
enum ImreadModes { enum ImreadModes {
IMREAD_UNCHANGED = -1, //!< If set, return the loaded image as is (with alpha channel, otherwise it gets cropped). Ignore EXIF orientation. IMREAD_UNCHANGED = -1, //!< If set, return the loaded image as is (with alpha channel, otherwise it gets cropped). Ignore EXIF orientation.
IMREAD_GRAYSCALE = 0, //!< If set, always convert image to the single channel grayscale image (codec internal conversion). IMREAD_GRAYSCALE = 0, //!< If set, always convert image to the single channel grayscale image (codec internal conversion).

7
modules/imgcodecs/src/loadsave.cpp
View File

@ -83,6 +83,13 @@ static Size validateInputImageSize(const Size& size)
static inline int calcType(int type, int flags) static inline int calcType(int type, int flags)
{ {
if(flags != IMREAD_UNCHANGED)
{
CV_CheckNE(flags & (IMREAD_COLOR_BGR | IMREAD_COLOR_RGB),
IMREAD_COLOR_BGR | IMREAD_COLOR_RGB,
"IMREAD_COLOR_BGR (IMREAD_COLOR) and IMREAD_COLOR_RGB can not be set at the same time.");
}
if ( (flags & (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH)) == (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH)) if ( (flags & (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH)) == (IMREAD_COLOR | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH))
return type; return type;

80
modules/imgcodecs/test/test_tiff.cpp
View File

@ -46,41 +46,18 @@ TEST(Imgcodecs_Tiff, decode_tile16384x16384)
//================================================================================================== //==================================================================================================
// See https://github.com/opencv/opencv/issues/22388 // See https://github.com/opencv/opencv/issues/22388
/** typedef tuple< uint64_t, perf::MatType, ImreadModes > Bufsize_and_Type;
* Dummy enum to show combination of IMREAD_*.
*/
enum ImreadMixModes
{
IMREAD_MIX_UNCHANGED = IMREAD_UNCHANGED ,
IMREAD_MIX_GRAYSCALE = IMREAD_GRAYSCALE ,
IMREAD_MIX_COLOR = IMREAD_COLOR | IMREAD_COLOR_RGB ,
IMREAD_MIX_GRAYSCALE_ANYDEPTH = IMREAD_GRAYSCALE | IMREAD_ANYDEPTH ,
IMREAD_MIX_GRAYSCALE_ANYCOLOR = IMREAD_GRAYSCALE | IMREAD_ANYCOLOR,
IMREAD_MIX_GRAYSCALE_ANYDEPTH_ANYCOLOR = IMREAD_GRAYSCALE | IMREAD_ANYDEPTH | IMREAD_ANYCOLOR,
IMREAD_MIX_COLOR_ANYDEPTH = IMREAD_COLOR | IMREAD_ANYDEPTH ,
IMREAD_MIX_COLOR_ANYCOLOR = IMREAD_COLOR | IMREAD_ANYCOLOR,
IMREAD_MIX_COLOR_ANYDEPTH_ANYCOLOR = IMREAD_COLOR | IMREAD_ANYDEPTH | IMREAD_ANYCOLOR
};
typedef tuple< uint64_t, tuple<string, int>, ImreadMixModes > Bufsize_and_Type;
typedef testing::TestWithParam<Bufsize_and_Type> Imgcodecs_Tiff_decode_Huge; typedef testing::TestWithParam<Bufsize_and_Type> Imgcodecs_Tiff_decode_Huge;
static inline
void PrintTo(const ImreadMixModes& val, std::ostream* os)
{
PrintTo( static_cast<ImreadModes>(val), os );
}
TEST_P(Imgcodecs_Tiff_decode_Huge, regression) TEST_P(Imgcodecs_Tiff_decode_Huge, regression)
{ {
// Get test parameters // Get test parameters
const uint64_t buffer_size = get<0>(GetParam()); const uint64_t buffer_size = get<0>(GetParam());
const string mat_type_string = get<0>(get<1>(GetParam())); const perf::MatType mat_type = get<1>(GetParam());
const int mat_type = get<1>(get<1>(GetParam()));
const int imread_mode = get<2>(GetParam()); const int imread_mode = get<2>(GetParam());
// Detect data file // Detect data file
const string req_filename = cv::format("readwrite/huge-tiff/%s_%zu.tif", mat_type_string.c_str(), (size_t)buffer_size); const string req_filename = cv::format("readwrite/huge-tiff/%s_%zu.tif", typeToString(mat_type).c_str(), (size_t)buffer_size);
const string filename = findDataFile( req_filename ); const string filename = findDataFile( req_filename );
// Preparation process for test // Preparation process for test
@ -125,7 +102,7 @@ TEST_P(Imgcodecs_Tiff_decode_Huge, regression)
case IMREAD_GRAYSCALE | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH: case IMREAD_GRAYSCALE | IMREAD_ANYCOLOR | IMREAD_ANYDEPTH:
ncn = (ncn == 1)?1:3; ncn = (ncn == 1)?1:3;
break; break;
case IMREAD_COLOR | IMREAD_COLOR_RGB: case IMREAD_COLOR:
ncn = 3; ncn = 3;
depth = 1; depth = 1;
break; break;
@ -402,9 +379,9 @@ TEST_P(Imgcodecs_Tiff_decode_Huge, regression)
case MAKE_FLAG(CV_16UC1, CV_16UC4): case MAKE_FLAG(CV_16UC1, CV_16UC4):
case MAKE_FLAG(CV_16UC3, CV_16UC4): case MAKE_FLAG(CV_16UC3, CV_16UC4):
default: default:
FAIL() << cv::format("Unknown test pattern: from = %d ( %d, %d) to = %d ( %d, %d )", FAIL() << cv::format("Unknown test pattern: from = ( %d, %d) to = ( %d, %d )",
mat_type, (int)CV_MAT_CN(mat_type ), ( CV_MAT_DEPTH(mat_type )==CV_16U)?16:8, (int)CV_MAT_CN(mat_type ), ( CV_MAT_DEPTH(mat_type )==CV_16U)?16:8,
img.type(), (int)CV_MAT_CN(img.type() ), ( CV_MAT_DEPTH(img.type() )==CV_16U)?16:8); (int)CV_MAT_CN(img.type() ), ( CV_MAT_DEPTH(img.type() )==CV_16U)?16:8);
break; break;
} }
@ -414,8 +391,8 @@ TEST_P(Imgcodecs_Tiff_decode_Huge, regression)
// Basic Test // Basic Test
const Bufsize_and_Type Imgcodecs_Tiff_decode_Huge_list_basic[] = const Bufsize_and_Type Imgcodecs_Tiff_decode_Huge_list_basic[] =
{ {
make_tuple<uint64_t, tuple<string,int>,ImreadMixModes>( 1073479680ull, make_tuple<string,int>("CV_8UC1", CV_8UC1), IMREAD_MIX_COLOR ), make_tuple<uint64_t, perf::MatType, ImreadModes>( 1073479680ull, CV_8UC1, IMREAD_COLOR ),
make_tuple<uint64_t, tuple<string,int>,ImreadMixModes>( 2147483648ull, make_tuple<string,int>("CV_16UC4", CV_16UC4), IMREAD_MIX_COLOR ), make_tuple<uint64_t, perf::MatType, ImreadModes>( 2147483648ull, CV_16UC4, IMREAD_COLOR ),
}; };
INSTANTIATE_TEST_CASE_P(Imgcodecs_Tiff, Imgcodecs_Tiff_decode_Huge, INSTANTIATE_TEST_CASE_P(Imgcodecs_Tiff, Imgcodecs_Tiff_decode_Huge,
@ -423,21 +400,25 @@ INSTANTIATE_TEST_CASE_P(Imgcodecs_Tiff, Imgcodecs_Tiff_decode_Huge,
); );
// Full Test // Full Test
// This full test is disabled in default, following steps are required to run.
// (1) replace "DISABLED_Imgcodecs_Tiff_Full" to "Imgcodecs_Tiff_Full" and rebuild opencv_test_imgcodecs.
// (2) set "OPENCV_IO_MAX_IMAGE_PIXELS=2147483648" in environment variable.
// (3) run "./bin/opencv_test_imgcodecs --test_tag_enable=mem_6gb,verylong,debug_verylong" .
/** /**
* Test lists for combination of IMREAD_*. * Test lists for combination of IMREAD_*.
*/ */
const ImreadMixModes all_modes_Huge_Full[] = const ImreadModes all_modes_Huge_Full[] =
{ {
IMREAD_MIX_UNCHANGED, static_cast<ImreadModes>(IMREAD_UNCHANGED ) ,
IMREAD_MIX_GRAYSCALE, static_cast<ImreadModes>(IMREAD_GRAYSCALE ) ,
IMREAD_MIX_GRAYSCALE_ANYDEPTH, static_cast<ImreadModes>(IMREAD_COLOR ) ,
IMREAD_MIX_GRAYSCALE_ANYCOLOR, static_cast<ImreadModes>(IMREAD_GRAYSCALE | IMREAD_ANYDEPTH ) ,
IMREAD_MIX_GRAYSCALE_ANYDEPTH_ANYCOLOR, static_cast<ImreadModes>(IMREAD_GRAYSCALE | IMREAD_ANYCOLOR) ,
IMREAD_MIX_COLOR, static_cast<ImreadModes>(IMREAD_GRAYSCALE | IMREAD_ANYDEPTH | IMREAD_ANYCOLOR) ,
IMREAD_MIX_COLOR_ANYDEPTH, static_cast<ImreadModes>(IMREAD_COLOR | IMREAD_ANYDEPTH ) ,
IMREAD_MIX_COLOR_ANYCOLOR, static_cast<ImreadModes>(IMREAD_COLOR | IMREAD_ANYCOLOR) ,
IMREAD_MIX_COLOR_ANYDEPTH_ANYCOLOR, static_cast<ImreadModes>(IMREAD_COLOR | IMREAD_ANYDEPTH | IMREAD_ANYCOLOR)
}; };
const uint64_t huge_buffer_sizes_decode_Full[] = const uint64_t huge_buffer_sizes_decode_Full[] =
@ -448,16 +429,17 @@ const uint64_t huge_buffer_sizes_decode_Full[] =
2147483648ull, // 2048 * 1024 * 1024 2147483648ull, // 2048 * 1024 * 1024
}; };
const tuple<string, int> mat_types_Full[] = const perf::MatType mat_types_Full[] =
{ {
make_tuple<string, int>("CV_8UC1", CV_8UC1), // 8bit GRAY CV_8UC1, // 8bit GRAY
make_tuple<string, int>("CV_8UC3", CV_8UC3), // 24bit RGB CV_8UC3, // 24bit RGB
make_tuple<string, int>("CV_8UC4", CV_8UC4), // 32bit RGBA CV_8UC4, // 32bit RGBA
make_tuple<string, int>("CV_16UC1", CV_16UC1), // 16bit GRAY CV_16UC1, // 16bit GRAY
make_tuple<string, int>("CV_16UC3", CV_16UC3), // 48bit RGB CV_16UC3, // 48bit RGB
make_tuple<string, int>("CV_16UC4", CV_16UC4), // 64bit RGBA CV_16UC4, // 64bit RGBA
}; };
// INSTANTIATE_TEST_CASE_P(Imgcodecs_Tiff_Full, Imgcodecs_Tiff_decode_Huge,
INSTANTIATE_TEST_CASE_P(DISABLED_Imgcodecs_Tiff_Full, Imgcodecs_Tiff_decode_Huge, INSTANTIATE_TEST_CASE_P(DISABLED_Imgcodecs_Tiff_Full, Imgcodecs_Tiff_decode_Huge,
testing::Combine( testing::Combine(
testing::ValuesIn(huge_buffer_sizes_decode_Full), testing::ValuesIn(huge_buffer_sizes_decode_Full),