diff --git a/modules/videoio/test/test_mfx.cpp b/modules/videoio/test/test_mfx.cpp index 3729a17cdc..363345635d 100644 --- a/modules/videoio/test/test_mfx.cpp +++ b/modules/videoio/test/test_mfx.cpp @@ -144,10 +144,20 @@ TEST_P(videoio_mfx, read_write_raw) remove(filename.c_str()); } +inline static std::string videoio_mfx_name_printer(const testing::TestParamInfo& info) +{ + std::ostringstream out; + const Size sz = get<0>(info.param); + const std::string ext = get<2>(info.param); + out << sz.width << "x" << sz.height << "x" << get<1>(info.param) << "x" << ext.substr(1, ext.size() - 1); + return out.str(); +} + INSTANTIATE_TEST_CASE_P(videoio, videoio_mfx, testing::Combine( testing::Values(Size(640, 480), Size(638, 478), Size(636, 476), Size(1920, 1080)), testing::Values(1, 30, 100), - testing::Values(".mpeg2", ".264", ".265"))); + testing::Values(".mpeg2", ".264", ".265")), + videoio_mfx_name_printer); }} // namespace diff --git a/modules/videoio/test/test_precomp.hpp b/modules/videoio/test/test_precomp.hpp index e3612adc1e..0b43cd0e4f 100644 --- a/modules/videoio/test/test_precomp.hpp +++ b/modules/videoio/test/test_precomp.hpp @@ -4,6 +4,8 @@ #ifndef __OPENCV_TEST_PRECOMP_HPP__ #define __OPENCV_TEST_PRECOMP_HPP__ +#include + #include "opencv2/ts.hpp" #include "opencv2/videoio.hpp" #include "opencv2/videoio/registry.hpp"