diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2f13be1601681..2c1698dc81bce 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 diff --git a/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py b/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py index ab8a0718488ed..79c99398966da 100644 --- a/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py +++ b/launch/tier4_perception_launch/launch/traffic_light_recognition/traffic_light_node_container.launch.py @@ -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=[ diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml index 3e633a3856c82..40071c39f1e75 100644 --- a/launch/tier4_perception_launch/package.xml +++ b/launch/tier4_perception_launch/package.xml @@ -23,6 +23,7 @@ autoware_euclidean_cluster autoware_ground_segmentation autoware_image_projection_based_fusion + autoware_image_transport_decompressor autoware_lidar_apollo_instance_segmentation autoware_map_based_prediction autoware_multi_object_tracker @@ -46,7 +47,6 @@ autoware_traffic_light_multi_camera_fusion autoware_traffic_light_occlusion_predictor autoware_traffic_light_visualization - image_transport_decompressor pointcloud_to_laserscan topic_tools diff --git a/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml b/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml index de52107447c72..0096a219c8573 100644 --- a/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml +++ b/perception/autoware_tensorrt_yolox/launch/yolox_s_plus_opt.launch.xml @@ -14,8 +14,8 @@ - - + + diff --git a/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml b/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml index dc6ebc2edeebb..a3708d14b5392 100644 --- a/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml +++ b/perception/autoware_tensorrt_yolox/launch/yolox_tiny.launch.xml @@ -8,8 +8,8 @@ - - + + diff --git a/perception/autoware_tensorrt_yolox/package.xml b/perception/autoware_tensorrt_yolox/package.xml index a7921eb55df52..9205b0c83cbea 100644 --- a/perception/autoware_tensorrt_yolox/package.xml +++ b/perception/autoware_tensorrt_yolox/package.xml @@ -30,7 +30,7 @@ tensorrt_common tier4_perception_msgs - image_transport_decompressor + autoware_image_transport_decompressor ament_lint_auto autoware_lint_common diff --git a/sensing/image_transport_decompressor/CMakeLists.txt b/sensing/autoware_image_transport_decompressor/CMakeLists.txt similarity index 56% rename from sensing/image_transport_decompressor/CMakeLists.txt rename to sensing/autoware_image_transport_decompressor/CMakeLists.txt index 2ecd3446290df..d658d28fbf68f 100644 --- a/sensing/image_transport_decompressor/CMakeLists.txt +++ b/sensing/autoware_image_transport_decompressor/CMakeLists.txt @@ -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() @@ -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 ) diff --git a/sensing/image_transport_decompressor/README.md b/sensing/autoware_image_transport_decompressor/README.md similarity index 88% rename from sensing/image_transport_decompressor/README.md rename to sensing/autoware_image_transport_decompressor/README.md index 97e0178eb00d6..acad3739d8fa2 100644 --- a/sensing/image_transport_decompressor/README.md +++ b/sensing/autoware_image_transport_decompressor/README.md @@ -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 diff --git a/sensing/image_transport_decompressor/config/image_transport_decompressor.param.yaml b/sensing/autoware_image_transport_decompressor/config/image_transport_decompressor.param.yaml similarity index 100% rename from sensing/image_transport_decompressor/config/image_transport_decompressor.param.yaml rename to sensing/autoware_image_transport_decompressor/config/image_transport_decompressor.param.yaml diff --git a/sensing/image_transport_decompressor/include/image_transport_decompressor/image_transport_decompressor.hpp b/sensing/autoware_image_transport_decompressor/include/autoware/image_transport_decompressor/image_transport_decompressor.hpp similarity index 78% rename from sensing/image_transport_decompressor/include/image_transport_decompressor/image_transport_decompressor.hpp rename to sensing/autoware_image_transport_decompressor/include/autoware/image_transport_decompressor/image_transport_decompressor.hpp index d192429dd150e..b3d343882a880 100644 --- a/sensing/image_transport_decompressor/include/image_transport_decompressor/image_transport_decompressor.hpp +++ b/sensing/autoware_image_transport_decompressor/include/autoware/image_transport_decompressor/image_transport_decompressor.hpp @@ -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 @@ -24,7 +24,7 @@ #include #include -namespace image_preprocessor +namespace autoware::image_preprocessor { class ImageTransportDecompressor : public rclcpp::Node { @@ -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_ diff --git a/sensing/image_transport_decompressor/launch/image_transport_decompressor.launch.xml b/sensing/autoware_image_transport_decompressor/launch/image_transport_decompressor.launch.xml similarity index 55% rename from sensing/image_transport_decompressor/launch/image_transport_decompressor.launch.xml rename to sensing/autoware_image_transport_decompressor/launch/image_transport_decompressor.launch.xml index 61296531f17f2..e427e0c8b1121 100644 --- a/sensing/image_transport_decompressor/launch/image_transport_decompressor.launch.xml +++ b/sensing/autoware_image_transport_decompressor/launch/image_transport_decompressor.launch.xml @@ -1,9 +1,9 @@ - + - + diff --git a/sensing/image_transport_decompressor/package.xml b/sensing/autoware_image_transport_decompressor/package.xml similarity index 95% rename from sensing/image_transport_decompressor/package.xml rename to sensing/autoware_image_transport_decompressor/package.xml index ed7ae7ae060b5..e4e8d69acb4d0 100644 --- a/sensing/image_transport_decompressor/package.xml +++ b/sensing/autoware_image_transport_decompressor/package.xml @@ -1,7 +1,7 @@ - image_transport_decompressor + autoware_image_transport_decompressor 0.0.0 The image_transport_decompressor package Yukihiro Saito diff --git a/sensing/image_transport_decompressor/schema/image_transport_decompressor.schema.json b/sensing/autoware_image_transport_decompressor/schema/image_transport_decompressor.schema.json similarity index 83% rename from sensing/image_transport_decompressor/schema/image_transport_decompressor.schema.json rename to sensing/autoware_image_transport_decompressor/schema/image_transport_decompressor.schema.json index fdbe1bcd721dd..508517dd7bac2 100644 --- a/sensing/image_transport_decompressor/schema/image_transport_decompressor.schema.json +++ b/sensing/autoware_image_transport_decompressor/schema/image_transport_decompressor.schema.json @@ -3,7 +3,7 @@ "title": "Parameters for Image Transport Decompressor", "type": "object", "definitions": { - "image_transport_decompressor": { + "autoware_image_transport_decompressor": { "type": "object", "properties": { "encoding": { @@ -20,7 +20,7 @@ "type": "object", "properties": { "ros__parameters": { - "$ref": "#/definitions/image_transport_decompressor" + "$ref": "#/definitions/autoware_image_transport_decompressor" } }, "required": ["ros__parameters"] diff --git a/sensing/image_transport_decompressor/src/image_transport_decompressor.cpp b/sensing/autoware_image_transport_decompressor/src/image_transport_decompressor.cpp similarity index 96% rename from sensing/image_transport_decompressor/src/image_transport_decompressor.cpp rename to sensing/autoware_image_transport_decompressor/src/image_transport_decompressor.cpp index ffc1e5865c856..b1971f892a352 100644 --- a/sensing/image_transport_decompressor/src/image_transport_decompressor.cpp +++ b/sensing/autoware_image_transport_decompressor/src/image_transport_decompressor.cpp @@ -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 #include @@ -65,7 +65,7 @@ #include #include -namespace image_preprocessor +namespace autoware::image_preprocessor { ImageTransportDecompressor::ImageTransportDecompressor(const rclcpp::NodeOptions & node_options) : rclcpp::Node("image_transport_decompressor", node_options), @@ -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(image_preprocessor::ImageTransportDecompressor) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::image_preprocessor::ImageTransportDecompressor)