generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GStreamer 1.0 backport from master branch.

Browse Source
This commit is contained in:
Alexander Smorkalov
2014-09-23 19:02:37 +04:00
parent 45a1063c4a
commit 1f4fe3bb27
5 changed files with 1490 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/test/test_video_io.cpp
View File

@@ -92,7 +92,9 @@ const VideoFormat g_specific_fmt_list[] =
VideoFormat("mkv", CV_FOURCC('X', 'V', 'I', 'D')),
VideoFormat("mkv", CV_FOURCC('M', 'P', 'E', 'G')),
VideoFormat("mkv", CV_FOURCC('M', 'J', 'P', 'G')),
#ifndef HAVE_GSTREAMER
VideoFormat("mov", CV_FOURCC('m', 'p', '4', 'v')),
#endif
VideoFormat()
};
#endif
@@ -490,7 +492,13 @@ void CV_HighGuiTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
if (fourcc == CV_FOURCC('M', 'P', 'E', 'G') && ext == "mkv")
allowed_extra_frames = 1;
if (FRAME_COUNT < IMAGE_COUNT || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames)
// Hack! Some GStreamer encoding pipelines drop last frame in the video
int allowed_frame_frop = 0;
#ifdef HAVE_GSTREAMER
allowed_frame_frop = 1;
#endif
if (FRAME_COUNT < IMAGE_COUNT - allowed_frame_frop || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames)
{
ts->printf(ts->LOG, "\nFrame count checking for video_%s.%s...\n", fourcc_str.c_str(), ext.c_str());
ts->printf(ts->LOG, "Video codec: %s\n", fourcc_str.c_str());
@@ -505,7 +513,7 @@ void CV_HighGuiTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
return;
}
for (int i = 0; (size_t)i < IMAGE_COUNT; i++)
for (int i = 0; (size_t)i < IMAGE_COUNT-allowed_frame_frop; i++)
{
Mat frame; cap >> frame;
if (frame.empty())