Skip to content
This repository was archived by the owner on Aug 7, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ Currently, the inference feature list is supported:
- Face Detection:
```/ros_openvino_toolkit/face_detection```([object_msgs::ObjectsInBoxes](https://github.com/intel/object_msgs/blob/master/msg/ObjectsInBoxes.msg))
- Emotion Recognition:
```/ros_openvino_toolkit/emotions_recognition```([people_msgs::EmotionsStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/EmotionsStamped.msg))
```/ros_openvino_toolkit/emotions_recognition```([vino_people_msgs::EmotionsStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/EmotionsStamped.msg))
- Age and Gender Recognition:
```/ros_openvino_toolkit/age_genders_Recognition```([people_msgs::AgeGenderStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/AgeGenderStamped.msg))
```/ros_openvino_toolkit/age_genders_Recognition```([vino_people_msgs::AgeGenderStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/AgeGenderStamped.msg))
- Head Pose Estimation:
```/ros_openvino_toolkit/headposes_estimation```([people_msgs::HeadPoseStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/msg/HeadPoseStamped.msg))
```/ros_openvino_toolkit/headposes_estimation```([vino_people_msgs::HeadPoseStamped](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/msg/HeadPoseStamped.msg))
- Object Detection:
```/ros_openvino_toolkit/detected_objects```([object_msgs::ObjectsInBoxes](https://github.com/intel/object_msgs/blob/master/msg/ObjectsInBoxes.msg))
- Object Segmentation:
```/ros_openvino_toolkit/segmented_obejcts```([people_msgs::ObjectsInMasks](https://github.com/intel/ros_openvino_toolkit/blob/devel/people_msgs/msg/ObjectsInMasks.msg))
```/ros_openvino_toolkit/segmented_obejcts```([vino_people_msgs::ObjectsInMasks](https://github.com/intel/ros_openvino_toolkit/blob/devel/vino_people_msgs/msg/ObjectsInMasks.msg))
- Person Reidentification:
```/ros_openvino_toolkit/reidentified_persons```([people_msgs::ReidentificationStamped](https://github.com/intel/ros_openvino_toolkit/blob/devel/people_msgs/msg/ReidentificationStamped.msg))
```/ros_openvino_toolkit/reidentified_persons```([vino_people_msgs::ReidentificationStamped](https://github.com/intel/ros_openvino_toolkit/blob/devel/vino_people_msgs/msg/ReidentificationStamped.msg))
- Rviz Output:
```/ros_openvino_toolkit/image_rviz```([sensor_msgs::Image](http://docs.ros.org/melodic/api/sensor_msgs/html/msg/Image.html))

Expand All @@ -88,11 +88,11 @@ Currently, the inference feature list is supported:
- Face Detection Service:
```/detect_face``` ([object_msgs::DetectObject](https://github.com/intel/object_msgs/blob/master/srv/DetectObject.srv))
- Age & Gender Detection Service:
```/detect_age_gender``` ([people_msgs::AgeGender](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/AgeGenderSrv.srv))
```/detect_age_gender``` ([vino_people_msgs::AgeGender](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/AgeGenderSrv.srv))
- Headpose Detection Service:
```/detect_head_pose``` ([people_msgs::HeadPose](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/HeadPoseSrv.srv))
```/detect_head_pose``` ([vino_people_msgs::HeadPose](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/HeadPoseSrv.srv))
- Emotion Detection Service:
```/detect_emotion``` ([people_msgs::Emotion](https://github.com/intel/ros_openvino_toolkit/blob/master/people_msgs/srv/EmotionSrv.srv))
```/detect_emotion``` ([vino_people_msgs::Emotion](https://github.com/intel/ros_openvino_toolkit/blob/master/vino_people_msgs/srv/EmotionSrv.srv))


### RViz
Expand Down
2 changes: 1 addition & 1 deletion dynamic_vino_lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ find_package(
std_msgs
sensor_msgs
object_msgs
people_msgs
vino_people_msgs
image_transport
cv_bridge
InferenceEngine
Expand Down
12 changes: 6 additions & 6 deletions dynamic_vino_lib/include/dynamic_vino_lib/outputs/base_output.h
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,17 @@ class BaseOutput
virtual void setServiceResponseForFace(
boost::shared_ptr<object_msgs::DetectObjectResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::AgeGenderSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::AgeGenderSrvResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::EmotionSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::EmotionSrvResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::HeadPoseSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::HeadPoseSrvResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::PeopleSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::PeopleSrvResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::ReidentificationSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::ReidentificationSrvResponse> response) {}
virtual void setServiceResponse(
boost::shared_ptr<people_msgs::ObjectsInMasksSrvResponse> response) {}
boost::shared_ptr<vino_people_msgs::ObjectsInMasksSrvResponse> response) {}
Pipeline* getPipeline() const;
cv::Mat getFrame() const;
virtual void clearData() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
#include <object_msgs/Object.h>
#include <object_msgs/ObjectInBox.h>
#include <object_msgs/ObjectsInBoxes.h>
#include <people_msgs/Emotion.h>
#include <people_msgs/EmotionsStamped.h>
#include <people_msgs/AgeGender.h>
#include <people_msgs/AgeGenderStamped.h>
#include <people_msgs/HeadPose.h>
#include <people_msgs/HeadPoseStamped.h>
#include <people_msgs/ObjectInMask.h>
#include <people_msgs/ObjectsInMasks.h>
#include <people_msgs/Reidentification.h>
#include <people_msgs/ReidentificationStamped.h>
#include <vino_people_msgs/Emotion.h>
#include <vino_people_msgs/EmotionsStamped.h>
#include <vino_people_msgs/AgeGender.h>
#include <vino_people_msgs/AgeGenderStamped.h>
#include <vino_people_msgs/HeadPose.h>
#include <vino_people_msgs/HeadPoseStamped.h>
#include <vino_people_msgs/ObjectInMask.h>
#include <vino_people_msgs/ObjectsInMasks.h>
#include <vino_people_msgs/Reidentification.h>
#include <vino_people_msgs/ReidentificationStamped.h>

#include <people_msgs/AgeGenderSrv.h>
#include <people_msgs/EmotionSrv.h>
#include <people_msgs/HeadPoseSrv.h>
#include <people_msgs/PeopleSrv.h>
#include <vino_people_msgs/AgeGenderSrv.h>
#include <vino_people_msgs/EmotionSrv.h>
#include <vino_people_msgs/HeadPoseSrv.h>
#include <vino_people_msgs/PeopleSrv.h>
#include <object_msgs/DetectObject.h>
#include <people_msgs/ObjectsInMasksSrv.h>
#include <people_msgs/ReidentificationSrv.h>
#include <vino_people_msgs/ObjectsInMasksSrv.h>
#include <vino_people_msgs/ReidentificationSrv.h>


#include <std_msgs/Header.h>
Expand Down Expand Up @@ -72,12 +72,12 @@ class RosServiceOutput : public RosTopicOutput

void setServiceResponse(boost::shared_ptr<object_msgs::DetectObject::Response> response);
void setResponseForFace(boost::shared_ptr<object_msgs::DetectObject::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::AgeGenderSrv::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::EmotionSrv::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::HeadPoseSrv::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::PeopleSrv::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::ObjectsInMasksSrv::Response> response);
void setServiceResponse(boost::shared_ptr<people_msgs::ReidentificationSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::AgeGenderSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::EmotionSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::HeadPoseSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::PeopleSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::ObjectsInMasksSrv::Response> response);
void setServiceResponse(boost::shared_ptr<vino_people_msgs::ReidentificationSrv::Response> response);

private:
const std::string service_name_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
#include <object_msgs/Object.h>
#include <object_msgs/ObjectInBox.h>
#include <object_msgs/ObjectsInBoxes.h>
#include <people_msgs/AgeGender.h>
#include <people_msgs/AgeGenderStamped.h>
#include <people_msgs/Emotion.h>
#include <people_msgs/EmotionsStamped.h>
#include <people_msgs/HeadPose.h>
#include <people_msgs/HeadPoseStamped.h>
#include <people_msgs/ObjectInMask.h>
#include <people_msgs/ObjectsInMasks.h>
#include <people_msgs/Reidentification.h>
#include <people_msgs/ReidentificationStamped.h>
#include <vino_people_msgs/AgeGender.h>
#include <vino_people_msgs/AgeGenderStamped.h>
#include <vino_people_msgs/Emotion.h>
#include <vino_people_msgs/EmotionsStamped.h>
#include <vino_people_msgs/HeadPose.h>
#include <vino_people_msgs/HeadPoseStamped.h>
#include <vino_people_msgs/ObjectInMask.h>
#include <vino_people_msgs/ObjectsInMasks.h>
#include <vino_people_msgs/Reidentification.h>
#include <vino_people_msgs/ReidentificationStamped.h>
#include <ros/ros.h>

#include <memory>
Expand Down Expand Up @@ -119,17 +119,17 @@ class RosTopicOutput : public BaseOutput
ros::Publisher pub_face_;
std::shared_ptr<object_msgs::ObjectsInBoxes> faces_msg_ptr_;
ros::Publisher pub_emotion_;
std::shared_ptr<people_msgs::EmotionsStamped> emotions_msg_ptr_;
std::shared_ptr<vino_people_msgs::EmotionsStamped> emotions_msg_ptr_;
ros::Publisher pub_age_gender_;
std::shared_ptr<people_msgs::AgeGenderStamped> age_gender_msg_ptr_;
std::shared_ptr<vino_people_msgs::AgeGenderStamped> age_gender_msg_ptr_;
ros::Publisher pub_headpose_;
std::shared_ptr<people_msgs::HeadPoseStamped> headpose_msg_ptr_;
std::shared_ptr<vino_people_msgs::HeadPoseStamped> headpose_msg_ptr_;
ros::Publisher pub_object_;
std::shared_ptr<object_msgs::ObjectsInBoxes> object_msg_ptr_;
ros::Publisher pub_person_reid_;
std::shared_ptr<people_msgs::ReidentificationStamped> person_reid_msg_ptr_;
std::shared_ptr<vino_people_msgs::ReidentificationStamped> person_reid_msg_ptr_;
ros::Publisher pub_segmented_object_;
std::shared_ptr<people_msgs::ObjectsInMasks> segmented_object_msg_ptr_;
std::shared_ptr<vino_people_msgs::ObjectsInMasks> segmented_object_msg_ptr_;

};
} // namespace Outputs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
#include <object_msgs/Object.h>
#include <object_msgs/ObjectInBox.h>
#include <object_msgs/ObjectsInBoxes.h>
#include <people_msgs/Emotion.h>
#include <people_msgs/EmotionsStamped.h>
#include <people_msgs/AgeGender.h>
#include <people_msgs/AgeGenderStamped.h>
#include <people_msgs/HeadPose.h>
#include <people_msgs/HeadPoseStamped.h>
#include <vino_people_msgs/Emotion.h>
#include <vino_people_msgs/EmotionsStamped.h>
#include <vino_people_msgs/AgeGender.h>
#include <vino_people_msgs/AgeGenderStamped.h>
#include <vino_people_msgs/HeadPose.h>
#include <vino_people_msgs/HeadPoseStamped.h>

#include <people_msgs/AgeGenderSrv.h>
#include <people_msgs/EmotionSrv.h>
#include <people_msgs/HeadPoseSrv.h>
#include <people_msgs/PeopleSrv.h>
#include <vino_people_msgs/AgeGenderSrv.h>
#include <vino_people_msgs/EmotionSrv.h>
#include <vino_people_msgs/HeadPoseSrv.h>
#include <vino_people_msgs/PeopleSrv.h>
#include <object_msgs/DetectObject.h>
#include <people_msgs/ObjectsInMasksSrv.h>
#include <people_msgs/ReidentificationSrv.h>
#include <vino_people_msgs/ObjectsInMasksSrv.h>
#include <vino_people_msgs/ReidentificationSrv.h>

#include <ros/ros.h>
#include <memory>
Expand Down Expand Up @@ -67,4 +67,4 @@ class FrameProcessingServer //: public ros::NodeHandle
bool add3(ros::ServiceEvent<typename T::Request, typename T::Response> &);
};
} // namespace vino_service
#endif // DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_
#endif // DYNAMIC_VINO_LIB__SERVICES__FRAME_PROCESSING_SERVER_HPP_
4 changes: 2 additions & 2 deletions dynamic_vino_lib/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ limitations under the License.
<build_depend>image_transport</build_depend>
<build_depend>cv_bridge</build_depend>
<build_depend>object_msgs</build_depend>
<build_depend>people_msgs</build_depend>
<build_depend>vino_people_msgs</build_depend>
<build_depend>vino_param_lib</build_depend>

<run_depend>roscpp</run_depend>
Expand All @@ -42,6 +42,6 @@ limitations under the License.
<run_depend>image_transport</run_depend>
<run_depend>cv_bridge</run_depend>
<run_depend>object_msgs</run_depend>
<run_depend>people_msgs</run_depend>
<run_depend>vino_people_msgs</run_depend>
<run_depend>vino_param_lib</run_depend>
</package>
12 changes: 6 additions & 6 deletions dynamic_vino_lib/src/outputs/ros_service_output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,39 +51,39 @@ void Outputs::RosServiceOutput::setResponseForFace(
}

void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::AgeGenderSrv::Response> response)
boost::shared_ptr<vino_people_msgs::AgeGenderSrv::Response> response)
{
if (age_gender_msg_ptr_ != nullptr) {
response->age_gender.objects = age_gender_msg_ptr_->objects;
}
}

void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::EmotionSrv::Response> response)
boost::shared_ptr<vino_people_msgs::EmotionSrv::Response> response)
{
if (emotions_msg_ptr_ != nullptr) {
response->emotion.emotions = emotions_msg_ptr_->emotions;
}
}

void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::HeadPoseSrv::Response> response)
boost::shared_ptr<vino_people_msgs::HeadPoseSrv::Response> response)
{
if (headpose_msg_ptr_ != nullptr) {
response->headpose.headposes = headpose_msg_ptr_->headposes;
}
}

void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::ObjectsInMasksSrv::Response> response)
boost::shared_ptr<vino_people_msgs::ObjectsInMasksSrv::Response> response)
{
slog::info << "in ObjectsInMasks service::Response ...";
if (segmented_object_msg_ptr_ != nullptr) {
response->segmentation.objects_vector = segmented_object_msg_ptr_->objects_vector;
}
}
void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::ReidentificationSrv::Response> response)
boost::shared_ptr<vino_people_msgs::ReidentificationSrv::Response> response)
{
slog::info << "in Reidentification service::Response ...";
if (person_reid_msg_ptr_ != nullptr) {
Expand All @@ -92,7 +92,7 @@ void Outputs::RosServiceOutput::setServiceResponse(
}

void Outputs::RosServiceOutput::setServiceResponse(
boost::shared_ptr<people_msgs::PeopleSrv::Response> response)
boost::shared_ptr<vino_people_msgs::PeopleSrv::Response> response)
{
slog::info << "in People::Response ...";
if (faces_msg_ptr_ != nullptr) {
Expand Down
Loading