Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
活在明天
openpose
提交
49939503
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,体验更适合开发者的 AI 搜索 >>
提交
49939503
编写于
2月 27, 2018
作者:
G
gineshidalgo99
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed webcam resolution bug
上级
05a05730
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
16 deletion
+19
-16
doc/release_notes.md
doc/release_notes.md
+1
-0
examples/openpose/openpose.cpp
examples/openpose/openpose.cpp
+1
-1
examples/tutorial_add_module/1_custom_post_processing.cpp
examples/tutorial_add_module/1_custom_post_processing.cpp
+3
-3
examples/tutorial_wrapper/1_user_asynchronous_output.cpp
examples/tutorial_wrapper/1_user_asynchronous_output.cpp
+3
-3
examples/tutorial_wrapper/2_user_synchronous.cpp
examples/tutorial_wrapper/2_user_synchronous.cpp
+3
-3
examples/tutorial_wrapper/3_user_asynchronous.cpp
examples/tutorial_wrapper/3_user_asynchronous.cpp
+3
-3
src/openpose/utilities/flagsToOpenPose.cpp
src/openpose/utilities/flagsToOpenPose.cpp
+5
-3
未找到文件。
doc/release_notes.md
浏览文件 @
49939503
...
...
@@ -188,6 +188,7 @@ OpenPose Library - Release Notes
16.
3-D reconstruction module can be implemented with different camera brands or custom image sources.
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`
.
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.
...
...
examples/openpose/openpose.cpp
浏览文件 @
49939503
...
...
@@ -269,7 +269,7 @@ int openPoseDemo()
const
op
::
WrapperStructPose
wrapperStructPose
{
!
FLAGS_body_disable
,
netInputSize
,
outputSize
,
keypointScale
,
FLAGS_num_gpu
,
FLAGS_num_gpu_start
,
FLAGS_scale_number
,
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
),
poseModel
,
!
FLAGS_disable_blending
,
(
float
)
FLAGS_alpha_pose
,
(
float
)
FLAGS_alpha_heatmap
,
FLAGS_part_to_show
,
FLAGS_model_folder
,
heatMapTypes
,
heatMapScale
,
FLAGS_part_candidates
,
...
...
examples/tutorial_add_module/1_custom_post_processing.cpp
浏览文件 @
49939503
...
...
@@ -270,7 +270,7 @@ int openPoseTutorialWrapper4()
// Pose configuration (use WrapperStructPose{} for default and recommended configuration)
const
op
::
WrapperStructPose
wrapperStructPose
{
!
FLAGS_body_disable
,
netInputSize
,
outputSize
,
keypointScale
,
FLAGS_num_gpu
,
FLAGS_num_gpu_start
,
FLAGS_scale_number
,
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
),
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
),
poseModel
,
!
FLAGS_disable_blending
,
(
float
)
FLAGS_alpha_pose
,
(
float
)
FLAGS_alpha_heatmap
,
FLAGS_part_to_show
,
FLAGS_model_folder
,
heatMapTypes
,
heatMapScale
,
FLAGS_part_candidates
,
...
...
@@ -278,13 +278,13 @@ int openPoseTutorialWrapper4()
enableGoogleLogging
,
FLAGS_3d
};
// Face configuration (use op::WrapperStructFace{} to disable it)
const
op
::
WrapperStructFace
wrapperStructFace
{
FLAGS_face
,
faceNetInputSize
,
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_face_alpha_pose
,
(
float
)
FLAGS_face_alpha_heatmap
,
(
float
)
FLAGS_face_render_threshold
};
// Hand configuration (use op::WrapperStructHand{} to disable it)
const
op
::
WrapperStructHand
wrapperStructHand
{
FLAGS_hand
,
handNetInputSize
,
FLAGS_hand_scale_number
,
(
float
)
FLAGS_hand_scale_range
,
FLAGS_hand_tracking
,
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_hand_alpha_pose
,
(
float
)
FLAGS_hand_alpha_heatmap
,
(
float
)
FLAGS_hand_render_threshold
};
// Producer (use default to disable any input)
...
...
examples/tutorial_wrapper/1_user_asynchronous_output.cpp
浏览文件 @
49939503
...
...
@@ -345,7 +345,7 @@ int openPoseTutorialWrapper1()
// Pose configuration (use WrapperStructPose{} for default and recommended configuration)
const
op
::
WrapperStructPose
wrapperStructPose
{
!
FLAGS_body_disable
,
netInputSize
,
outputSize
,
keypointScale
,
FLAGS_num_gpu
,
FLAGS_num_gpu_start
,
FLAGS_scale_number
,
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
),
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
),
poseModel
,
!
FLAGS_disable_blending
,
(
float
)
FLAGS_alpha_pose
,
(
float
)
FLAGS_alpha_heatmap
,
FLAGS_part_to_show
,
FLAGS_model_folder
,
heatMapTypes
,
heatMapScale
,
FLAGS_part_candidates
,
...
...
@@ -353,13 +353,13 @@ int openPoseTutorialWrapper1()
enableGoogleLogging
,
FLAGS_3d
};
// Face configuration (use op::WrapperStructFace{} to disable it)
const
op
::
WrapperStructFace
wrapperStructFace
{
FLAGS_face
,
faceNetInputSize
,
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_face_alpha_pose
,
(
float
)
FLAGS_face_alpha_heatmap
,
(
float
)
FLAGS_face_render_threshold
};
// Hand configuration (use op::WrapperStructHand{} to disable it)
const
op
::
WrapperStructHand
wrapperStructHand
{
FLAGS_hand
,
handNetInputSize
,
FLAGS_hand_scale_number
,
(
float
)
FLAGS_hand_scale_range
,
FLAGS_hand_tracking
,
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_hand_alpha_pose
,
(
float
)
FLAGS_hand_alpha_heatmap
,
(
float
)
FLAGS_hand_render_threshold
};
// Producer (use default to disable any input)
...
...
examples/tutorial_wrapper/2_user_synchronous.cpp
浏览文件 @
49939503
...
...
@@ -431,7 +431,7 @@ int openPoseTutorialWrapper2()
op
::
log
(
"Configuring OpenPose wrapper."
,
op
::
Priority
::
Low
,
__LINE__
,
__FUNCTION__
,
__FILE__
);
const
op
::
WrapperStructPose
wrapperStructPose
{
!
FLAGS_body_disable
,
netInputSize
,
outputSize
,
keypointScale
,
FLAGS_num_gpu
,
FLAGS_num_gpu_start
,
FLAGS_scale_number
,
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
),
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
),
poseModel
,
!
FLAGS_disable_blending
,
(
float
)
FLAGS_alpha_pose
,
(
float
)
FLAGS_alpha_heatmap
,
FLAGS_part_to_show
,
FLAGS_model_folder
,
heatMapTypes
,
heatMapScale
,
FLAGS_part_candidates
,
...
...
@@ -439,13 +439,13 @@ int openPoseTutorialWrapper2()
enableGoogleLogging
,
FLAGS_3d
};
// Face configuration (use op::WrapperStructFace{} to disable it)
const
op
::
WrapperStructFace
wrapperStructFace
{
FLAGS_face
,
faceNetInputSize
,
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_face_alpha_pose
,
(
float
)
FLAGS_face_alpha_heatmap
,
(
float
)
FLAGS_face_render_threshold
};
// Hand configuration (use op::WrapperStructHand{} to disable it)
const
op
::
WrapperStructHand
wrapperStructHand
{
FLAGS_hand
,
handNetInputSize
,
FLAGS_hand_scale_number
,
(
float
)
FLAGS_hand_scale_range
,
FLAGS_hand_tracking
,
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_hand_alpha_pose
,
(
float
)
FLAGS_hand_alpha_heatmap
,
(
float
)
FLAGS_hand_render_threshold
};
// Consumer (comment or use default argument to disable any output)
...
...
examples/tutorial_wrapper/3_user_asynchronous.cpp
浏览文件 @
49939503
...
...
@@ -372,7 +372,7 @@ int openPoseTutorialWrapper3()
// Pose configuration (use WrapperStructPose{} for default and recommended configuration)
const
op
::
WrapperStructPose
wrapperStructPose
{
!
FLAGS_body_disable
,
netInputSize
,
outputSize
,
keypointScale
,
FLAGS_num_gpu
,
FLAGS_num_gpu_start
,
FLAGS_scale_number
,
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
),
(
float
)
FLAGS_scale_gap
,
op
::
flagsToRenderMode
(
FLAGS_render_pose
,
FLAGS_3d
),
poseModel
,
!
FLAGS_disable_blending
,
(
float
)
FLAGS_alpha_pose
,
(
float
)
FLAGS_alpha_heatmap
,
FLAGS_part_to_show
,
FLAGS_model_folder
,
heatMapTypes
,
heatMapScale
,
FLAGS_part_candidates
,
...
...
@@ -380,13 +380,13 @@ int openPoseTutorialWrapper3()
enableGoogleLogging
,
FLAGS_3d
};
// Face configuration (use op::WrapperStructFace{} to disable it)
const
op
::
WrapperStructFace
wrapperStructFace
{
FLAGS_face
,
faceNetInputSize
,
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_face_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_face_alpha_pose
,
(
float
)
FLAGS_face_alpha_heatmap
,
(
float
)
FLAGS_face_render_threshold
};
// Hand configuration (use op::WrapperStructHand{} to disable it)
const
op
::
WrapperStructHand
wrapperStructHand
{
FLAGS_hand
,
handNetInputSize
,
FLAGS_hand_scale_number
,
(
float
)
FLAGS_hand_scale_range
,
FLAGS_hand_tracking
,
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_render_pose
),
op
::
flagsToRenderMode
(
FLAGS_hand_render
,
FLAGS_
3d
,
FLAGS_
render_pose
),
(
float
)
FLAGS_hand_alpha_pose
,
(
float
)
FLAGS_hand_alpha_heatmap
,
(
float
)
FLAGS_hand_render_threshold
};
// Consumer (comment or use default argument to disable any output)
...
...
src/openpose/utilities/flagsToOpenPose.cpp
浏览文件 @
49939503
...
...
@@ -156,14 +156,16 @@ namespace op
if
(
type
==
ProducerType
::
FlirCamera
)
{
// cameraFrameSize
const
auto
cameraFrameSize
=
op
::
flagsToPoint
(
cameraResolution
,
"-1x-1"
);
const
auto
cameraFrameSize
=
flagsToPoint
(
cameraResolution
,
"-1x-1"
);
return
std
::
make_shared
<
FlirReader
>
(
cameraParameterPath
,
cameraFrameSize
);
}
// Webcam
if
(
type
==
ProducerType
::
Webcam
)
{
// cameraFrameSize
const
auto
cameraFrameSize
=
op
::
flagsToPoint
(
cameraResolution
,
"1280x720"
);
auto
cameraFrameSize
=
flagsToPoint
(
cameraResolution
,
"1280x720"
);
if
(
cameraFrameSize
.
x
<
0
||
cameraFrameSize
.
y
<
0
)
cameraFrameSize
=
Point
<
int
>
{
1280
,
720
};
if
(
webcamIndex
>=
0
)
{
const
auto
throwExceptionIfNoOpened
=
true
;
...
...
@@ -235,7 +237,7 @@ namespace op
}
// Face and hand: to pick same than body
else
if
(
renderFlag
==
-
1
&&
renderPoseFlag
!=
-
2
)
return
flagsToRenderMode
(
renderPoseFlag
,
-
2
);
return
flagsToRenderMode
(
renderPoseFlag
,
gpuBuggy
,
-
2
);
// No render
else
if
(
renderFlag
==
0
)
return
RenderMode
::
None
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录