提交 8e4cd805 编写于 作者: G gineshidalgo99

Removed compiler warning

上级 7aaea878
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
## Latest Features ## Latest Features
- Dec 2018: [**Foot dataset and new paper released**](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset/)! - Dec 2018: [**Foot dataset and new paper released**](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset)!
- Sep 2018: [**Experimental single-person tracker**](doc/quick_start.md#tracking) for further speed up or visual smoothing! - Sep 2018: [**Experimental single-person tracker**](doc/quick_start.md#tracking) for further speed up or visual smoothing!
- Jun 2018: [**Combined body-foot model released! 40% faster and 5% more accurate**](doc/installation.md)! - Jun 2018: [**Combined body-foot model released! 40% faster and 5% more accurate**](doc/installation.md)!
- Jun 2018: [**Python API**](doc/modules/python_module.md) released! - Jun 2018: [**Python API**](doc/modules/python_module.md) released!
...@@ -145,7 +145,7 @@ Check the OpenPose Benchmark as well as some hints to speed up and/or reduce the ...@@ -145,7 +145,7 @@ Check the OpenPose Benchmark as well as some hints to speed up and/or reduce the
## Foot Dataset ## Foot Dataset
Check the [foot dataset website](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset/) and new OpenPose paper for more information. Check the [foot dataset website](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset/) and new [OpenPose paper](https://arxiv.org/abs/1812.08008) for more information.
...@@ -177,7 +177,7 @@ Please cite these papers in your publications if it helps your research (the fac ...@@ -177,7 +177,7 @@ Please cite these papers in your publications if it helps your research (the fac
@inproceedings{cao2018openpose, @inproceedings{cao2018openpose,
author = {Zhe Cao and Gines Hidalgo and Tomas Simon and Shih-En Wei and Yaser Sheikh}, author = {Zhe Cao and Gines Hidalgo and Tomas Simon and Shih-En Wei and Yaser Sheikh},
booktitle = {Arxiv}, booktitle = {arXiv preprint arXiv:1812.08008},
title = {Open{P}ose: realtime multi-person 2{D} pose estimation using {P}art {A}ffinity {F}ields}, title = {Open{P}ose: realtime multi-person 2{D} pose estimation using {P}art {A}ffinity {F}ields},
year = {2018} year = {2018}
} }
...@@ -205,6 +205,7 @@ Please cite these papers in your publications if it helps your research (the fac ...@@ -205,6 +205,7 @@ Please cite these papers in your publications if it helps your research (the fac
Links to the papers: Links to the papers:
- [OpenPose: Realtime Multi-Person 2D Pose Estimation using Part Affinity Fields](https://arxiv.org/abs/1812.08008)
- [Realtime Multi-Person 2D Pose Estimation using Part Affinity Fields](https://arxiv.org/abs/1611.08050) - [Realtime Multi-Person 2D Pose Estimation using Part Affinity Fields](https://arxiv.org/abs/1611.08050)
- [Hand Keypoint Detection in Single Images using Multiview Bootstrapping](https://arxiv.org/abs/1704.07809) - [Hand Keypoint Detection in Single Images using Multiview Bootstrapping](https://arxiv.org/abs/1704.07809)
- [Convolutional Pose Machines](https://arxiv.org/abs/1602.00134) - [Convolutional Pose Machines](https://arxiv.org/abs/1602.00134)
......
...@@ -168,7 +168,7 @@ Each flag is divided into flag name, default value, and description. ...@@ -168,7 +168,7 @@ Each flag is divided into flag name, default value, and description.
- DEFINE_string(model_pose, "BODY_25", "Model to be used. E.g., `COCO` (18 keypoints), `MPI` (15 keypoints, ~10% faster), `MPI_4_layers` (15 keypoints, even faster but less accurate)."); - DEFINE_string(model_pose, "BODY_25", "Model to be used. E.g., `COCO` (18 keypoints), `MPI` (15 keypoints, ~10% faster), `MPI_4_layers` (15 keypoints, even faster but less accurate).");
- DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it is increased, the accuracy potentially increases. If it is decreased, the speed increases. For maximum speed-accuracy balance, it should keep the closest aspect ratio possible to the images or videos to be processed. Using `-1` in any of the dimensions, OP will choose the optimal aspect ratio depending on the user's input value. E.g., the default `-1x368` is equivalent to `656x368` in 16:9 resolutions, e.g., full HD (1980x1080) and HD (1280x720) resolutions."); - DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it is increased, the accuracy potentially increases. If it is decreased, the speed increases. For maximum speed-accuracy balance, it should keep the closest aspect ratio possible to the images or videos to be processed. Using `-1` in any of the dimensions, OP will choose the optimal aspect ratio depending on the user's input value. E.g., the default `-1x368` is equivalent to `656x368` in 16:9 resolutions, e.g., full HD (1980x1080) and HD (1280x720) resolutions.");
- DEFINE_int32(scale_number, 1, "Number of scales to average."); - DEFINE_int32(scale_number, 1, "Number of scales to average.");
- DEFINE_double(scale_gap, 0.3, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1. If you want to change the initial scale, you actually want to multiply the `net_resolution` by your desired initial scale."); - DEFINE_double(scale_gap, 0.25, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1. If you want to change the initial scale, you actually want to multiply the `net_resolution` by your desired initial scale.");
5. OpenPose Body Pose Heatmaps and Part Candidates 5. OpenPose Body Pose Heatmaps and Part Candidates
- DEFINE_bool(heatmaps_add_parts, false, "If true, it will fill op::Datum::poseHeatMaps array with the body part heatmaps, and analogously face & hand heatmaps to op::Datum::faceHeatMaps & op::Datum::handHeatMaps. If more than one `add_heatmaps_X` flag is enabled, it will place then in sequential memory order: body parts + bkg + PAFs. It will follow the order on POSE_BODY_PART_MAPPING in `src/openpose/pose/poseParameters.cpp`. Program speed will considerably decrease. Not required for OpenPose, enable it only if you intend to explicitly use this information later."); - DEFINE_bool(heatmaps_add_parts, false, "If true, it will fill op::Datum::poseHeatMaps array with the body part heatmaps, and analogously face & hand heatmaps to op::Datum::faceHeatMaps & op::Datum::handHeatMaps. If more than one `add_heatmaps_X` flag is enabled, it will place then in sequential memory order: body parts + bkg + PAFs. It will follow the order on POSE_BODY_PART_MAPPING in `src/openpose/pose/poseParameters.cpp`. Program speed will considerably decrease. Not required for OpenPose, enable it only if you intend to explicitly use this information later.");
......
...@@ -16,8 +16,9 @@ OpenPose - Frequently Asked Question (FAQ) ...@@ -16,8 +16,9 @@ OpenPose - Frequently Asked Question (FAQ)
11. [Difference between BODY_25 vs. COCO vs. MPI](#difference-between-body_25-vs.-coco-vs.-mpi) 11. [Difference between BODY_25 vs. COCO vs. MPI](#difference-between-body_25-vs.-coco-vs.-mpi)
12. [How to Measure the Latency Time?](#how-to-measure-the-latency-time) 12. [How to Measure the Latency Time?](#how-to-measure-the-latency-time)
13. [Zero People Detected](#zero-people-detected) 13. [Zero People Detected](#zero-people-detected)
14. [3D OpenPose Returning Wrong Results: 0, NaN, Infinity, etc.](#3d-openpose-returning-wrong-results-0-nan-infinity-etc) 14. [Check Failed for ReadProtoFromBinaryFile (Failed to Parse NetParameter File)](#check-failed-for-readprotofrombinaryfile-failed-to-parse-netparameter-file)
15. [Protobuf Clip Param Caffe Error](#protobuf-clip-param-caffe-error) 15. [3D OpenPose Returning Wrong Results: 0, NaN, Infinity, etc.](#3d-openpose-returning-wrong-results-0-nan-infinity-etc)
16. [Protobuf Clip Param Caffe Error](#protobuf-clip-param-caffe-error)
...@@ -113,7 +114,18 @@ COCO model will eventually be removed. BODY_25 model is faster, more accurate, a ...@@ -113,7 +114,18 @@ COCO model will eventually be removed. BODY_25 model is faster, more accurate, a
### Zero People Detected ### Zero People Detected
**Q: 0 people detected and displayed in default video and images.** **Q: 0 people detected and displayed in default video and images.**
**A**: This problem occurs when the caffemodel has not been properly downloaded. E.g., if the connection drops when downloading the models. Please, remove the current models in the model folder, and download them manually from the links in [doc/installation.md](./installation.md). Alternatively, remove them and re-run Cmake again. **A**: This problem usually occurs when the caffemodel has not been properly downloaded. E.g., if the connection drops when downloading the models. Try the following solutions (in this order):
1. Assuming that default OpenPose (i.e., BODY_25 model) failed, try with `--model_pose COCO` and `--model_pose MPII` models. If any of them work, the `caffemodel` files of the other models were corrupted while being downloaded. Otherwise, it will most probably be a Caffe/protobuf issue.
2. Assuming that the model is corrupted, remove the current models in the model folder, and download them manually from the links in [doc/installation.md](./installation.md). Alternatively, remove them and re-run Cmake again. If this does not work, try downloading the COCO_25 model from the browser following the download link on this [Dropbox link](https://www.dropbox.com/s/03r8pa8sikrqv62/pose_iter_584000.caffemodel).
3. If none of the OpenPose models are working, make sure Caffe is working properly and that you can run the Caffe examples with other caffemodel / prototxt files.
### Check Failed for ReadProtoFromBinaryFile (Failed to Parse NetParameter File)
**Q: I am facing an error similar to:** `Check failed: ReadProtoFromBinaryFile(param_file, param) Failed to parse NetParameter file: models/pose/body_25/pose_iter_584000.caffemodel`
**A**: Same answer than for [Zero People Detected](#zero-people-detected).
......
...@@ -296,7 +296,7 @@ OpenPose Library - Release Notes ...@@ -296,7 +296,7 @@ OpenPose Library - Release Notes
26. Calibration improvements: 26. Calibration improvements:
1. Improved chessboard orientation detection, more robust and less errors. 1. Improved chessboard orientation detection, more robust and less errors.
2. Triangulation functions (triangulate and triangulateWithOptimization) public, so calibration can use them for bundle adjustment. 2. Triangulation functions (triangulate and triangulateWithOptimization) public, so calibration can use them for bundle adjustment.
3. Bundle adjustment refinement added for camera calibration. 3. Added bundle adjustment refinement for camera extrinsic calibration.
4. Added `CameraMatrixInitial` field into the XML calibration files to keep the information of the original camera extrinsic parameters when bundle adjustment is run. 4. Added `CameraMatrixInitial` field into the XML calibration files to keep the information of the original camera extrinsic parameters when bundle adjustment is run.
27. Video with the 3D output can be saved with the new `--write_video_3d` flag. 27. Video with the 3D output can be saved with the new `--write_video_3d` flag.
2. Functions or parameters renamed: 2. Functions or parameters renamed:
...@@ -310,6 +310,7 @@ OpenPose Library - Release Notes ...@@ -310,6 +310,7 @@ OpenPose Library - Release Notes
8. Replaced `--camera_fps` flag by `--write_video_fps`, given that it was a confusing name: It did not affect the webcam FPS, but only the FPS of the output video. In addition, default value changed from 30 to -1. 8. Replaced `--camera_fps` flag by `--write_video_fps`, given that it was a confusing name: It did not affect the webcam FPS, but only the FPS of the output video. In addition, default value changed from 30 to -1.
9. Renamed `--frame_keep_distortion` as `--frame_undistort`, which performs the opposite operation (the default value has been also changed to the opposite). 9. Renamed `--frame_keep_distortion` as `--frame_undistort`, which performs the opposite operation (the default value has been also changed to the opposite).
10. Renamed `--camera_parameter_folder` as `--camera_parameter_path` because it could also take a whole XML file path rather than its parent folder. 10. Renamed `--camera_parameter_folder` as `--camera_parameter_path` because it could also take a whole XML file path rather than its parent folder.
11. Default value of flag `--scale_gap` changed from 0.3 to 0.25.
3. Main bugs fixed: 3. Main bugs fixed:
1. CMake-GUI was forcing to Release mode, allowed Debug modes too. 1. CMake-GUI was forcing to Release mode, allowed Debug modes too.
2. NMS returns in index 0 the number of found peaks. However, while the number of peaks was truncated to a maximum of 127, this index 0 was saving the real number instead of the truncated one. 2. NMS returns in index 0 the number of found peaks. However, while the number of peaks was truncated to a maximum of 127, this index 0 was saving the real number instead of the truncated one.
......
OpenPose Library - All Released Features OpenPose Library - All Released Features
==================================== ====================================
- Dec 2018: [**Foot dataset and new paper released**](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset/)! - Dec 2018: [**Foot dataset and new paper released**](https://cmu-perceptual-computing-lab.github.io/foot_keypoint_dataset)!
- Sep 2018: [**Experimental tracker**](./quick_start.md#tracking)! - Sep 2018: [**Experimental tracker**](./quick_start.md#tracking)!
- Jun 2018: [**Combined body-foot model released! 40% faster and 5% more accurate**](./installation.md)! - Jun 2018: [**Combined body-foot model released! 40% faster and 5% more accurate**](./installation.md)!
- Jun 2018: [**Python API**](./modules/python_module.md) released! - Jun 2018: [**Python API**](./modules/python_module.md) released!
......
...@@ -25,7 +25,7 @@ params["output_resolution"] = "-1x-1" ...@@ -25,7 +25,7 @@ params["output_resolution"] = "-1x-1"
params["net_resolution"] = "-1x368" params["net_resolution"] = "-1x368"
params["model_pose"] = "BODY_25" params["model_pose"] = "BODY_25"
params["alpha_pose"] = 0.6 params["alpha_pose"] = 0.6
params["scale_gap"] = 0.3 params["scale_gap"] = 0.25
params["scale_number"] = 1 params["scale_number"] = 1
params["render_threshold"] = 0.05 params["render_threshold"] = 0.05
# If GPU version is built, and multiple GPUs are available, set the ID here # If GPU version is built, and multiple GPUs are available, set the ID here
......
...@@ -44,7 +44,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it ...@@ -44,7 +44,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it
DEFINE_string(output_resolution, "-1x-1", "The image resolution (display and output). Use \"-1x-1\" to force the program to use the" DEFINE_string(output_resolution, "-1x-1", "The image resolution (display and output). Use \"-1x-1\" to force the program to use the"
" input image resolution."); " input image resolution.");
DEFINE_int32(num_gpu_start, 0, "GPU device start number."); DEFINE_int32(num_gpu_start, 0, "GPU device start number.");
DEFINE_double(scale_gap, 0.3, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1." DEFINE_double(scale_gap, 0.25, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1."
" If you want to change the initial scale, you actually want to multiply the" " If you want to change the initial scale, you actually want to multiply the"
" `net_resolution` by your desired initial scale."); " `net_resolution` by your desired initial scale.");
DEFINE_int32(scale_number, 1, "Number of scales to average."); DEFINE_int32(scale_number, 1, "Number of scales to average.");
......
...@@ -44,7 +44,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it ...@@ -44,7 +44,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it
DEFINE_string(output_resolution, "-1x-1", "The image resolution (display and output). Use \"-1x-1\" to force the program to use the" DEFINE_string(output_resolution, "-1x-1", "The image resolution (display and output). Use \"-1x-1\" to force the program to use the"
" input image resolution."); " input image resolution.");
DEFINE_int32(num_gpu_start, 0, "GPU device start number."); DEFINE_int32(num_gpu_start, 0, "GPU device start number.");
DEFINE_double(scale_gap, 0.3, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1." DEFINE_double(scale_gap, 0.25, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1."
" If you want to change the initial scale, you actually want to multiply the" " If you want to change the initial scale, you actually want to multiply the"
" `net_resolution` by your desired initial scale."); " `net_resolution` by your desired initial scale.");
DEFINE_int32(scale_number, 1, "Number of scales to average."); DEFINE_int32(scale_number, 1, "Number of scales to average.");
......
...@@ -96,7 +96,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it ...@@ -96,7 +96,7 @@ DEFINE_string(net_resolution, "-1x368", "Multiples of 16. If it
" input value. E.g., the default `-1x368` is equivalent to `656x368` in 16:9 resolutions," " input value. E.g., the default `-1x368` is equivalent to `656x368` in 16:9 resolutions,"
" e.g., full HD (1980x1080) and HD (1280x720) resolutions."); " e.g., full HD (1980x1080) and HD (1280x720) resolutions.");
DEFINE_int32(scale_number, 1, "Number of scales to average."); DEFINE_int32(scale_number, 1, "Number of scales to average.");
DEFINE_double(scale_gap, 0.3, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1." DEFINE_double(scale_gap, 0.25, "Scale gap between scales. No effect unless scale_number > 1. Initial scale is always 1."
" If you want to change the initial scale, you actually want to multiply the" " If you want to change the initial scale, you actually want to multiply the"
" `net_resolution` by your desired initial scale."); " `net_resolution` by your desired initial scale.");
// OpenPose Body Pose Heatmaps and Part Candidates // OpenPose Body Pose Heatmaps and Part Candidates
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#define default_net_resolution "-1x368" #define default_net_resolution "-1x368"
#define default_model_pose "COCO" #define default_model_pose "COCO"
#define default_alpha_pose 0.6 #define default_alpha_pose 0.6
#define default_scale_gap 0.3 #define default_scale_gap 0.25
#define default_scale_number 1 #define default_scale_number 1
#define default_render_threshold 0.05 #define default_render_threshold 0.05
#define default_num_gpu_start 0 #define default_num_gpu_start 0
......
...@@ -225,7 +225,7 @@ if __name__ == "__main__": ...@@ -225,7 +225,7 @@ if __name__ == "__main__":
params["net_resolution"] = "-1x368" params["net_resolution"] = "-1x368"
params["model_pose"] = "BODY_25" params["model_pose"] = "BODY_25"
params["alpha_pose"] = 0.6 params["alpha_pose"] = 0.6
params["scale_gap"] = 0.3 params["scale_gap"] = 0.25
params["scale_number"] = 1 params["scale_number"] = 1
params["render_threshold"] = 0.05 params["render_threshold"] = 0.05
params["num_gpu_start"] = 0 params["num_gpu_start"] = 0
......
...@@ -561,8 +561,8 @@ namespace op ...@@ -561,8 +561,8 @@ namespace op
try try
{ {
// 3-D rendering // 3-D rendering
cv::Mat image;
#ifdef USE_3D_RENDERER #ifdef USE_3D_RENDERER
cv::Mat image;
if (mDisplayMode == DisplayMode::DisplayAll || mDisplayMode == DisplayMode::Display3D) if (mDisplayMode == DisplayMode::DisplayAll || mDisplayMode == DisplayMode::Display3D)
{ {
// Save/display 3D display in OpenCV window // Save/display 3D display in OpenCV window
...@@ -573,8 +573,8 @@ namespace op ...@@ -573,8 +573,8 @@ namespace op
cv::flip(image, image, 0); cv::flip(image, image, 0);
} }
} }
return image;
#endif #endif
return image;
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册