Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: image transport decompressor/autoware prefix #8197

Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ planning/sampling_based_planner/autoware_path_sampler/** maxime.clement@tier4.jp
planning/sampling_based_planner/autoware_sampler_common/** maxime.clement@tier4.jp
sensing/gnss_poser/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
sensing/autoware_image_diagnostics/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp
sensing/image_transport_decompressor/** kenzo.lobos@tier4.jp yukihiro.saito@tier4.jp
sensing/autoware_image_transport_decompressor/** kenzo.lobos@tier4.jp yukihiro.saito@tier4.jp
sensing/imu_corrector/** taiki.yamada@tier4.jp yamato.ando@tier4.jp
sensing/livox/autoware_livox_tag_filter/** kenzo.lobos@tier4.jp ryohsuke.mitsudome@tier4.jp
sensing/autoware_pointcloud_preprocessor/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp david.wong@tier4.jp kenzo.lobos@tier4.jp kyoichi.sugahara@tier4.jp melike@leodrive.ai shunsuke.miura@tier4.jp yihsiang.fang@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ def create_parameter_dict(*args):
decompressor_loader = LoadComposableNodes(
composable_node_descriptions=[
ComposableNode(
package="image_transport_decompressor",
plugin="image_preprocessor::ImageTransportDecompressor",
package="autoware_image_transport_decompressor",
plugin="autoware::image_preprocessor::ImageTransportDecompressor",
name="traffic_light_image_decompressor",
parameters=[{"encoding": "rgb8"}],
remappings=[
Expand Down
8 changes: 7 additions & 1 deletion launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<exec_depend>autoware_euclidean_cluster</exec_depend>
<exec_depend>autoware_ground_segmentation</exec_depend>
<exec_depend>autoware_image_projection_based_fusion</exec_depend>
<exec_depend>autoware_image_transport_decompressor</exec_depend>
<exec_depend>autoware_lidar_apollo_instance_segmentation</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
<exec_depend>autoware_multi_object_tracker</exec_depend>
Expand All @@ -37,7 +38,12 @@
<exec_depend>autoware_raindrop_cluster_filter</exec_depend>
<exec_depend>autoware_shape_estimation</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>image_transport_decompressor</exec_depend>
<exec_depend>autoware_traffic_light_classifier</exec_depend>
<exec_depend>autoware_traffic_light_fine_detector</exec_depend>
<exec_depend>autoware_traffic_light_map_based_detector</exec_depend>
<exec_depend>autoware_traffic_light_multi_camera_fusion</exec_depend>
<exec_depend>autoware_traffic_light_occlusion_predictor</exec_depend>
<exec_depend>autoware_traffic_light_visualization</exec_depend>
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
<exec_depend>pointcloud_to_laserscan</exec_depend>
<exec_depend>probabilistic_occupancy_grid_map</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<arg name="use_decompress" default="true" description="use image decompress"/>
<arg name="build_only" default="false" description="exit after trt engine is built"/>

<arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
<node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
<arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
<node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
<remap from="~/input/compressed_image" to="$(var input/image)/compressed"/>
<remap from="~/output/raw_image" to="$(var input/image)"/>
<param from="$(var param_file)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<arg name="use_decompress" default="true" description="use image decompress"/>
<arg name="build_only" default="false" description="exit after trt engine is built"/>

<arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
<node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
<arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
<node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="image_transport_decompressor_node" if="$(var use_decompress)">
<remap from="~/input/compressed_image" to="$(var input/image)/compressed"/>
<remap from="~/output/raw_image" to="$(var input/image)"/>
<param from="$(var param_file)"/>
Expand Down
2 changes: 1 addition & 1 deletion perception/autoware_tensorrt_yolox/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<depend>tensorrt_common</depend>
<depend>tier4_perception_msgs</depend>

<exec_depend>image_transport_decompressor</exec_depend>
<exec_depend>autoware_image_transport_decompressor</exec_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(image_transport_decompressor)
project(autoware_image_transport_decompressor)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand All @@ -9,16 +9,16 @@ include_directories(
${OpenCV_INCLUDE_DIRS}
)

ament_auto_add_library(image_transport_decompressor SHARED
ament_auto_add_library(${PROJECT_NAME} SHARED
src/image_transport_decompressor.cpp
)

target_link_libraries(image_transport_decompressor
target_link_libraries(${PROJECT_NAME}
${OpenCV_LIBRARIES}
)

rclcpp_components_register_node(image_transport_decompressor
PLUGIN "image_preprocessor::ImageTransportDecompressor"
rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::image_preprocessor::ImageTransportDecompressor"
EXECUTABLE image_transport_decompressor_node
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The `image_transport_decompressor` is a node that decompresses images.

## Parameters

{{ json_to_markdown("sensing/image_transport_decompressor/schema/image_transport_decompressor.schema.json") }}
{{ json_to_markdown("sensing/autoware_image_transport_decompressor/schema/image_transport_decompressor.schema.json") }}

## Assumptions / Known limits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
#define IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
#ifndef AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
#define AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_

#include <rclcpp/rclcpp.hpp>

Expand All @@ -24,7 +24,7 @@
#include <string>
#include <utility>

namespace image_preprocessor
namespace autoware::image_preprocessor
{
class ImageTransportDecompressor : public rclcpp::Node
{
Expand All @@ -40,6 +40,6 @@ class ImageTransportDecompressor : public rclcpp::Node
std::string encoding_;
};

} // namespace image_preprocessor
} // namespace autoware::image_preprocessor

#endif // IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
#endif // AUTOWARE__IMAGE_TRANSPORT_DECOMPRESSOR__IMAGE_TRANSPORT_DECOMPRESSOR_HPP_
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<launch>
<arg name="input_topic_name" default="/input/compressed_image"/>
<arg name="output_topic_name" default="/output/raw_image"/>
<arg name="param_file" default="$(find-pkg-share image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>
<arg name="param_file" default="$(find-pkg-share autoware_image_transport_decompressor)/config/image_transport_decompressor.param.yaml"/>

<node pkg="image_transport_decompressor" exec="image_transport_decompressor_node" name="$(anon image_transport_decompressor_node)">
<node pkg="autoware_image_transport_decompressor" exec="image_transport_decompressor_node" name="$(anon image_transport_decompressor_node)">
<remap from="~/input/compressed_image" to="$(var input_topic_name)"/>
<remap from="~/output/raw_image" to="$(var output_topic_name)"/>
<param from="$(var param_file)" allow_substs="true"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>image_transport_decompressor</name>
<name>autoware_image_transport_decompressor</name>
<version>0.0.0</version>
<description>The image_transport_decompressor package</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Parameters for Image Transport Decompressor",
"type": "object",
"definitions": {
"image_transport_decompressor": {
"autoware_image_transport_decompressor": {
"type": "object",
"properties": {
"encoding": {
Expand All @@ -20,7 +20,7 @@
"type": "object",
"properties": {
"ros__parameters": {
"$ref": "#/definitions/image_transport_decompressor"
"$ref": "#/definitions/autoware_image_transport_decompressor"
}
},
"required": ["ros__parameters"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/

#include "image_transport_decompressor/image_transport_decompressor.hpp"
#include "autoware/image_transport_decompressor/image_transport_decompressor.hpp"

#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
Expand All @@ -65,7 +65,7 @@
#include <utility>
#include <vector>

namespace image_preprocessor
namespace autoware::image_preprocessor
{
ImageTransportDecompressor::ImageTransportDecompressor(const rclcpp::NodeOptions & node_options)
: rclcpp::Node("image_transport_decompressor", node_options),
Expand Down Expand Up @@ -179,7 +179,7 @@ void ImageTransportDecompressor::onCompressedImage(
raw_image_pub_->publish(std::move(image_ptr));
}
}
} // namespace image_preprocessor
} // namespace autoware::image_preprocessor

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(image_preprocessor::ImageTransportDecompressor)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::image_preprocessor::ImageTransportDecompressor)
Loading