Merge pull request #18400 from mshabunin:videoio-mfx-test-name

pull/18408/head
Alexander Alekhin 4 years ago
commit 7c22cd49a7
  1. 12
      modules/videoio/test/test_mfx.cpp
  2. 2
      modules/videoio/test/test_precomp.hpp

@ -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<videoio_mfx::ParamType>& 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

@ -4,6 +4,8 @@
#ifndef __OPENCV_TEST_PRECOMP_HPP__
#define __OPENCV_TEST_PRECOMP_HPP__
#include <sstream>
#include "opencv2/ts.hpp"
#include "opencv2/videoio.hpp"
#include "opencv2/videoio/registry.hpp"

Loading…
Cancel
Save