Skip to content

Commit 235b00b

Browse files
mshabuninmshabunin
committed
Fixed MediaSDK tests and build warnings
1 parent 05b99a4 commit 235b00b

File tree

3 files changed

+17
-20
lines changed

3 files changed

+17
-20
lines changed

‎modules/videoio/src/cap_mfx_common.hpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,6 @@ inline std::ostream & operator<<(std::ostream &out, const mfxFrameData &data) {
156156

157157
//==================================================================================================
158158

159-
static const int CC_MPG2 = FourCC('M', 'P', 'G', '2').vali32;
160-
static const int CC_H264 = FourCC('H', '2', '6', '4').vali32;
161-
static const int CC_X264 = FourCC('X', '2', '6', '4').vali32;
162-
static const int CC_AVC = FourCC('A', 'V', 'C', ' ').vali32;
163-
static const int CC_H265 = FourCC('H', '2', '6', '5').vali32;
164-
static const int CC_HEVC = FourCC('H', 'E', 'V', 'C').vali32;
165-
static const int CC_VC1 = FourCC('V', 'C', '1', ' ').vali32;
166-
167-
//==================================================================================================
168-
169159
template <typename T>
170160
inline void cleanup(T * &ptr)
171161
{

‎modules/videoio/src/cap_mfx_writer.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ using namespace cv;
1111

1212
inline mfxU32 codecIdByFourCC(int fourcc)
1313
{
14+
const int CC_MPG2 = FourCC('M', 'P', 'G', '2').vali32;
15+
const int CC_H264 = FourCC('H', '2', '6', '4').vali32;
16+
const int CC_X264 = FourCC('X', '2', '6', '4').vali32;
17+
const int CC_AVC = FourCC('A', 'V', 'C', ' ').vali32;
18+
const int CC_H265 = FourCC('H', '2', '6', '5').vali32;
19+
const int CC_HEVC = FourCC('H', 'E', 'V', 'C').vali32;
20+
1421
if (fourcc == CC_X264 || fourcc == CC_H264 || fourcc == CC_AVC)
1522
return MFX_CODEC_AVC;
1623
else if (fourcc == CC_H265 || fourcc == CC_HEVC)

‎modules/videoio/test/test_mfx.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@ TEST(Videoio_MFX, write_invalid)
3030
{
3131
const string filename = cv::tempfile(".264");
3232
VideoWriter writer;
33-
bool res;
34-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX, filename, VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(641, 480), true));
33+
bool res = true;
34+
ASSERT_NO_THROW(res = writer.open(filename, CAP_INTEL_MFX, VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(641, 480), true));
3535
EXPECT_FALSE(res);
3636
EXPECT_FALSE(writer.isOpened());
37-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX,filename, VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(640, 481), true));
37+
ASSERT_NO_THROW(res = writer.open(filename, CAP_INTEL_MFX, VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(640, 481), true));
3838
EXPECT_FALSE(res);
3939
EXPECT_FALSE(writer.isOpened());
40-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX,filename, VideoWriter::fourcc('A', 'B', 'C', 'D'), 1, Size(640, 480), true));
40+
ASSERT_NO_THROW(res = writer.open(filename, CAP_INTEL_MFX, VideoWriter::fourcc('A', 'B', 'C', 'D'), 1, Size(640, 480), true));
4141
EXPECT_FALSE(res);
4242
EXPECT_FALSE(writer.isOpened());
43-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX,String(), VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(640, 480), true));
43+
ASSERT_NO_THROW(res = writer.open(String(), CAP_INTEL_MFX, VideoWriter::fourcc('H', '2', '6', '4'), 1, Size(640, 480), true));
4444
EXPECT_FALSE(res);
4545
EXPECT_FALSE(writer.isOpened());
46-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX,filename, VideoWriter::fourcc('H', '2', '6', '4'), 0, Size(640, 480), true));
46+
ASSERT_ANY_THROW(res = writer.open(filename, CAP_INTEL_MFX, VideoWriter::fourcc('H', '2', '6', '4'), 0, Size(640, 480), true));
4747
EXPECT_FALSE(res);
4848
EXPECT_FALSE(writer.isOpened());
4949

50-
ASSERT_NO_THROW(res = writer.open(CAP_INTEL_MFX,filename, VideoWriter::fourcc('H', '2', '6', '4'), 30, Size(640, 480), true));
50+
ASSERT_NO_THROW(res = writer.open(filename, CAP_INTEL_MFX, VideoWriter::fourcc('H', '2', '6', '4'), 30, Size(640, 480), true));
5151
ASSERT_TRUE(res);
5252
ASSERT_TRUE(writer.isOpened());
5353
Mat t;
@@ -103,7 +103,7 @@ TEST_P(Videoio_MFX, read_write_raw)
103103

104104
// Write video
105105
VideoWriter writer;
106-
writer.open(CAP_INTEL_MFX, filename, fourcc, FPS, FRAME_SIZE, isColor);
106+
writer.open(filename, CAP_INTEL_MFX, fourcc, FPS, FRAME_SIZE, isColor);
107107
ASSERT_TRUE(writer.isOpened());
108108
Mat frame(FRAME_SIZE, CV_8UC3);
109109
for (int i = 0; i < FRAME_COUNT; ++i)
@@ -133,9 +133,9 @@ TEST_P(Videoio_MFX, read_write_raw)
133133
EXPECT_EQ(goodFrame.type(), frame.type());
134134
double psnr = cvtest::PSNR(goodFrame, frame);
135135
if (fourcc == VideoWriter::fourcc('M', 'P', 'G', '2'))
136-
EXPECT_GT(psnr, 37); // experimentally chosen value
136+
EXPECT_GT(psnr, 31); // experimentally chosen value
137137
else
138-
EXPECT_GT(psnr, 43); // experimentally chosen value
138+
EXPECT_GT(psnr, 33); // experimentally chosen value
139139
goodFrames.pop();
140140
}
141141
EXPECT_FALSE(cap.read(frame));

0 commit comments

Comments
 (0)