Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b98dd728
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b98dd728
编写于
12月 03, 2020
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18966 from Staticity:add_live_timestamps_to_msmf
上级
e309ad84
2fa624ae
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
5 deletion
+36
-5
modules/videoio/src/cap_msmf.cpp
modules/videoio/src/cap_msmf.cpp
+3
-2
modules/videoio/test/test_camera.cpp
modules/videoio/test/test_camera.cpp
+32
-2
modules/videoio/test/test_video_io.cpp
modules/videoio/test/test_video_io.cpp
+1
-1
未找到文件。
modules/videoio/src/cap_msmf.cpp
浏览文件 @
b98dd728
...
...
@@ -346,8 +346,6 @@ public:
STDMETHODIMP
OnReadSample
(
HRESULT
hrStatus
,
DWORD
dwStreamIndex
,
DWORD
dwStreamFlags
,
LONGLONG
llTimestamp
,
IMFSample
*
pSample
)
CV_OVERRIDE
{
CV_UNUSED
(
llTimestamp
);
HRESULT
hr
=
0
;
cv
::
AutoLock
lock
(
m_mutex
);
...
...
@@ -360,6 +358,7 @@ public:
{
CV_LOG_DEBUG
(
NULL
,
"videoio(MSMF): drop frame (not processed)"
);
}
m_lastSampleTimestamp
=
llTimestamp
;
m_lastSample
=
pSample
;
}
}
...
...
@@ -439,6 +438,7 @@ public:
IMFSourceReader
*
m_reader
;
DWORD
m_dwStreamIndex
;
LONGLONG
m_lastSampleTimestamp
;
_ComPtr
<
IMFSample
>
m_lastSample
;
};
...
...
@@ -912,6 +912,7 @@ bool CvCapture_MSMF::grabFrame()
CV_LOG_WARNING
(
NULL
,
"videoio(MSMF): EOS signal. Capture stream is lost"
);
return
false
;
}
sampleTime
=
reader
->
m_lastSampleTimestamp
;
return
true
;
}
else
if
(
isOpen
)
...
...
modules/videoio/test/test_camera.cpp
浏览文件 @
b98dd728
...
...
@@ -11,21 +11,51 @@
namespace
opencv_test
{
namespace
{
static
void
test_readFrames
(
/*const*/
VideoCapture
&
capture
,
const
int
N
=
100
,
Mat
*
lastFrame
=
NULL
)
static
void
test_readFrames
(
/*const*/
VideoCapture
&
capture
,
const
int
N
=
100
,
Mat
*
lastFrame
=
NULL
,
bool
testTimestamps
=
true
)
{
Mat
frame
;
int64
time0
=
cv
::
getTickCount
();
int64
sysTimePrev
=
time0
;
const
double
cvTickFreq
=
cv
::
getTickFrequency
();
double
camTimePrev
=
0.0
;
const
double
fps
=
capture
.
get
(
cv
::
CAP_PROP_FPS
);
const
double
framePeriod
=
fps
==
0.0
?
1.
:
1.0
/
fps
;
const
bool
validTickAndFps
=
cvTickFreq
!=
0
&&
fps
!=
0.
;
testTimestamps
&=
validTickAndFps
;
for
(
int
i
=
0
;
i
<
N
;
i
++
)
{
SCOPED_TRACE
(
cv
::
format
(
"frame=%d"
,
i
));
capture
>>
frame
;
const
int64
sysTimeCurr
=
cv
::
getTickCount
();
const
double
camTimeCurr
=
capture
.
get
(
cv
::
CAP_PROP_POS_MSEC
);
ASSERT_FALSE
(
frame
.
empty
());
// Do we have a previous frame?
if
(
i
>
0
&&
testTimestamps
)
{
const
double
sysTimeElapsedSecs
=
(
sysTimeCurr
-
sysTimePrev
)
/
cvTickFreq
;
const
double
camTimeElapsedSecs
=
(
camTimeCurr
-
camTimePrev
)
/
1000.
;
// Check that the time between two camera frames and two system time calls
// are within 1.5 frame periods of one another.
//
// 1.5x is chosen to accomodate for a dropped frame, and an additional 50%
// to account for drift in the scale of the camera and system time domains.
EXPECT_NEAR
(
sysTimeElapsedSecs
,
camTimeElapsedSecs
,
framePeriod
*
1.5
);
}
EXPECT_GT
(
cvtest
::
norm
(
frame
,
NORM_INF
),
0
)
<<
"Complete black image has been received"
;
sysTimePrev
=
sysTimeCurr
;
camTimePrev
=
camTimeCurr
;
}
int64
time1
=
cv
::
getTickCount
();
printf
(
"Processed %d frames on %.2f FPS
\n
"
,
N
,
(
N
*
cv
::
getTickFrequency
()
)
/
(
time1
-
time0
+
1
));
printf
(
"Processed %d frames on %.2f FPS
\n
"
,
N
,
(
N
*
cv
TickFreq
)
/
(
time1
-
time0
+
1
));
if
(
lastFrame
)
*
lastFrame
=
frame
.
clone
();
}
...
...
modules/videoio/test/test_video_io.cpp
浏览文件 @
b98dd728
...
...
@@ -237,7 +237,7 @@ public:
if
(
!
isBackendAvailable
(
apiPref
,
cv
::
videoio_registry
::
getStreamBackends
()))
throw
SkipTestException
(
cv
::
String
(
"Backend is not available/disabled: "
)
+
cv
::
videoio_registry
::
getBackendName
(
apiPref
));
if
((
apiPref
==
CAP_MSMF
)
||
(
(
apiPref
==
CAP_FFMPEG
)
&&
((
ext
==
"h264"
)
||
(
ext
==
"h265"
))))
if
(((
apiPref
==
CAP_FFMPEG
)
&&
((
ext
==
"h264"
)
||
(
ext
==
"h265"
))))
throw
SkipTestException
(
cv
::
String
(
"Backend "
)
+
cv
::
videoio_registry
::
getBackendName
(
apiPref
)
+
cv
::
String
(
" does not support CAP_PROP_POS_MSEC option"
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录