fix: rle compress

Signed-off-by: badai-nguyen <dai.nguyen@tier4.jp>
autowarefoundation · Jul 9, 2024 · 3d42d8b · 3d42d8b
1 parent 357ceec
commit 3d42d8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/perception/tensorrt_yolox/include/tensorrt_yolox/tensorrt_yolox_node.hpp b/perception/tensorrt_yolox/include/tensorrt_yolox/tensorrt_yolox_node.hpp
@@ -34,13 +34,13 @@
 #else
 #include <cv_bridge/cv_bridge.h>
 #endif
-#include <std_msgs/msg/string.hpp>
 
 #include <chrono>
 #include <fstream>
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace tensorrt_yolox
@@ -83,8 +83,6 @@ class TrtYoloXNode : public rclcpp::Node
   int mapRoiLabel2SegLabel(const int32_t roi_label_index);
   image_transport::Publisher image_pub_;
   image_transport::Publisher mask_pub_;
-  // rclcpp::Publisher<sensor_msgs::msg::Image>::SharedPtr mask_pub_;
-  rclcpp::Publisher<std_msgs::msg::String>::SharedPtr str_pub_;
 
   image_transport::Publisher color_mask_pub_;
 

diff --git a/perception/tensorrt_yolox/src/tensorrt_yolox_node.cpp b/perception/tensorrt_yolox/src/tensorrt_yolox_node.cpp
@@ -142,7 +142,6 @@ TrtYoloXNode::TrtYoloXNode(const rclcpp::NodeOptions & node_options)
   mask_pub_ = image_transport::create_publisher(this, "~/out/mask");
   color_mask_pub_ = image_transport::create_publisher(this, "~/out/color_mask");
   image_pub_ = image_transport::create_publisher(this, "~/out/image");
-  str_pub_ = this->create_publisher<std_msgs::msg::String>("~/out/mask_string", 10);
 
   if (declare_parameter("build_only", false)) {
     RCLCPP_INFO(this->get_logger(), "TensorRT engine file is built and exit.");
@@ -236,7 +235,7 @@ void TrtYoloXNode::onImage(const sensor_msgs::msg::Image::ConstSharedPtr msg)
       overlapSegmentByRoi(yolox_object, mask, width, height);
     }
   }
-  // TODO(badai-nguyen): consider to change to 4bits data transfer
+  // Compress mask to RLE format
   if (trt_yolox_->getMultitaskNum() > 0) {
     sensor_msgs::msg::Image::SharedPtr out_mask_msg =
       cv_bridge::CvImage(std_msgs::msg::Header(), sensor_msgs::image_encodings::MONO8, mask)
@@ -247,12 +246,11 @@ void TrtYoloXNode::onImage(const sensor_msgs::msg::Image::ConstSharedPtr msg)
     int step = sizeof(uint8_t) + sizeof(int);
     out_mask_msg->data.resize(static_cast<int>(compressed_data.size()) * step);
     for (size_t i = 0; i < compressed_data.size(); ++i) {
-      std::memcpy(&compressed_data.at(i).first, &out_mask_msg->data[i * step], sizeof(uint8_t));
+      std::memcpy(&out_mask_msg->data[i * step], &compressed_data.at(i).first, sizeof(uint8_t));
       std::memcpy(
-        &compressed_data.at(i).second, &out_mask_msg->data[i * step + sizeof(uint8_t)],
+        &out_mask_msg->data[i * step + sizeof(uint8_t)], &compressed_data.at(i).second,
         sizeof(int));
     }
-    out_mask_msg->step = step;
     mask_pub_.publish(out_mask_msg);
   }
   image_pub_.publish(in_image_ptr->toImageMsg());