Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
活在明天
openpose
提交
b2084505
O
openpose
项目概览
活在明天
/
openpose
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openpose
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b2084505
编写于
3月 01, 2018
作者:
G
gineshidalgo99
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed faked pause
上级
28f605c8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
14 deletion
+15
-14
doc/release_notes.md
doc/release_notes.md
+2
-0
include/openpose/producer/datumProducer.hpp
include/openpose/producer/datumProducer.hpp
+3
-4
src/openpose/gui/gui.cpp
src/openpose/gui/gui.cpp
+10
-10
未找到文件。
doc/release_notes.md
浏览文件 @
b2084505
...
...
@@ -189,6 +189,7 @@ OpenPose Library - Release Notes
17.
Flag
`--write_json`
includes 3-D keypoints.
18.
Flag
`--image_dir_stereo`
added to allow
`--image_dir`
to load stereo images.
19.
Flag
`--camera_resolution`
applicable to
`--flir_camera`
.
20.
Throw error message if requested GPU IDs does not exist (e.g. asking for 2 GPUs starting in ID 1 if there is only 2 GPUs in total).
2.
Functions or parameters renamed:
1.
Flag
`no_display`
renamed as
`display`
, able to select between
`NoDisplay`
,
`Display2D`
,
`Display3D`
, and
`DisplayAll`
.
2.
3-D reconstruction demo is now inside the OpenPose demo binary.
...
...
@@ -198,6 +199,7 @@ OpenPose Library - Release Notes
1.
Slight speed up (~1%) for performing the non-maximum suppression stage only in the body part heatmaps channels, and not also in the PAF channels.
2.
Fixed core-dumped in PoseRenderer with GUI when changed element to be rendered to something else than skeleton.
3.
3-D visualizer does not crash on exit anymore.
4.
Fake pause ('m' key pressed) works again.
...
...
include/openpose/producer/datumProducer.hpp
浏览文件 @
b2084505
...
...
@@ -89,13 +89,12 @@ namespace op
if
(
spVideoSeek
!=
nullptr
)
{
// Fake pause vs. normal mode
const
auto
increment
=
spVideoSeek
->
second
+
(
spVideoSeek
->
first
?
1
:
0
);
const
auto
increment
=
spVideoSeek
->
second
-
(
spVideoSeek
->
first
?
1
:
0
);
// Normal mode
if
(
increment
!=
0
)
{
spProducer
->
set
(
CV_CAP_PROP_POS_FRAMES
,
spProducer
->
get
(
CV_CAP_PROP_POS_FRAMES
)
+
increment
);
spVideoSeek
->
second
=
0
;
}
// It must be always reset or bug in fake pause
spVideoSeek
->
second
=
0
;
}
auto
nextFrameName
=
spProducer
->
getNextFrameName
();
auto
cvMats
=
spProducer
->
getFrames
();
...
...
src/openpose/gui/gui.cpp
浏览文件 @
b2084505
...
...
@@ -31,7 +31,7 @@ namespace op
std
::
vector
<
std
::
shared_ptr
<
PoseExtractor
>>&
poseExtractors
,
std
::
vector
<
std
::
shared_ptr
<
Renderer
>>&
renderers
,
std
::
shared_ptr
<
std
::
atomic
<
bool
>>&
isRunningSharedPtr
,
std
::
shared_ptr
<
std
::
pair
<
std
::
atomic
<
bool
>
,
std
::
atomic
<
int
>>>&
spVideoSeek
)
std
::
shared_ptr
<
std
::
pair
<
std
::
atomic
<
bool
>
,
std
::
atomic
<
int
>>>&
videoSeekSharedPtr
)
{
try
{
...
...
@@ -63,20 +63,20 @@ namespace op
// Fake pause
else
if
(
castedKey
==
'm'
)
{
if
(
spVideoSeek
!=
nullptr
)
spVideoSeek
->
first
=
!
spVideoSeek
->
first
;
if
(
videoSeekSharedPtr
!=
nullptr
)
videoSeekSharedPtr
->
first
=
!
videoSeekSharedPtr
->
first
;
}
// Seeking in video
else
if
(
castedKey
==
'l'
||
castedKey
==
'k'
)
{
if
(
spVideoSeek
!=
nullptr
)
if
(
videoSeekSharedPtr
!=
nullptr
)
{
// Normal case, +-30 frames
if
(
!
spVideoSeek
->
first
)
spVideoSeek
->
second
+=
30
*
(
castedKey
==
'l'
?
-
2
:
1
);
if
(
!
videoSeekSharedPtr
->
first
)
videoSeekSharedPtr
->
second
+=
30
*
(
castedKey
==
'l'
?
-
2
:
1
);
// Frame by frame (if forced paused)
else
spVideoSeek
->
second
+=
(
castedKey
==
'l'
?
-
1
:
1
);
videoSeekSharedPtr
->
second
+=
(
castedKey
==
'l'
?
-
1
:
1
);
}
}
// Enable/disable blending
...
...
@@ -136,17 +136,17 @@ namespace op
void
handleUserInput
(
FrameDisplayer
&
frameDisplayer
,
std
::
vector
<
std
::
shared_ptr
<
PoseExtractor
>>&
poseExtractors
,
std
::
vector
<
std
::
shared_ptr
<
Renderer
>>&
renderers
,
std
::
shared_ptr
<
std
::
atomic
<
bool
>>&
isRunningSharedPtr
,
std
::
shared_ptr
<
std
::
pair
<
std
::
atomic
<
bool
>
,
std
::
atomic
<
int
>>>&
spVideoSeek
)
std
::
shared_ptr
<
std
::
pair
<
std
::
atomic
<
bool
>
,
std
::
atomic
<
int
>>>&
videoSeekSharedPtr
)
{
try
{
// The handleUserInput must be always performed, even if no tDatum is detected
bool
guiPaused
=
false
;
handleWaitKey
(
guiPaused
,
frameDisplayer
,
poseExtractors
,
renderers
,
isRunningSharedPtr
,
spVideoSeek
);
handleWaitKey
(
guiPaused
,
frameDisplayer
,
poseExtractors
,
renderers
,
isRunningSharedPtr
,
videoSeekSharedPtr
);
while
(
guiPaused
)
{
std
::
this_thread
::
sleep_for
(
std
::
chrono
::
milliseconds
{
1
});
handleWaitKey
(
guiPaused
,
frameDisplayer
,
poseExtractors
,
renderers
,
isRunningSharedPtr
,
spVideoSeek
);
handleWaitKey
(
guiPaused
,
frameDisplayer
,
poseExtractors
,
renderers
,
isRunningSharedPtr
,
videoSeekSharedPtr
);
}
}
catch
(
const
std
::
exception
&
e
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录