add support for ffmpeg_image_transport and point_cloud_transport (#1568)

Co-authored-by: Emre Karincali <[email protected]>
(cherry picked from commit a33b5e9)

Author: 2 people

rviz_default_plugins/src/rviz_default_plugins/displays/camera/camera_display.cpp

@@ -67,6 +67,7 @@
 #include "rviz_common/display_context.hpp"
 #include "rviz_common/load_resource.hpp"
 
+#include "rviz_default_plugins/displays/image/get_transport_from_topic.hpp"
 #include "rviz_default_plugins/displays/image/ros_image_texture.hpp"
 
 namespace rviz_default_plugins
@@ -185,7 +186,6 @@ void CameraDisplay::onInitialize()
   this->addChild(visibility_property_, 0);
 }
 
-
 void CameraDisplay::setupSceneNodes()
 {
   background_scene_node_ = scene_node_->createChildSceneNode();
@@ -346,7 +346,7 @@ void CameraDisplay::createCameraInfoSubscription()
     // TODO(anyone) Store this in a member variable
 
     std::string camera_info_topic = image_transport::getCameraInfoTopic(
-      topic_property_->getTopicStd());
+      getBaseTopicFromTopic(topic_property_->getTopicStd()));
 
     rclcpp::SubscriptionOptions sub_opts;
     sub_opts.event_callbacks.message_lost_callback =
@@ -409,7 +409,7 @@ void CameraDisplay::clear()
   current_caminfo_.reset();
 
   std::string camera_info_topic =
-    image_transport::getCameraInfoTopic(topic_property_->getTopicStd());
+    image_transport::getCameraInfoTopic(getBaseTopicFromTopic(topic_property_->getTopicStd()));
 
   setStatus(
     StatusLevel::Warn, CAM_INFO_STATUS,
@@ -456,7 +456,7 @@ bool CameraDisplay::updateCamera()
 
   if (!info) {
     std::string camera_info_topic = image_transport::getCameraInfoTopic(
-      topic_property_->getTopicStd());
+      getBaseTopicFromTopic(topic_property_->getTopicStd()));
 
     setStatus(
       StatusLevel::Warn, CAM_INFO_STATUS,

rviz_default_plugins/src/rviz_default_plugins/displays/image/get_transport_from_topic.cpp

@@ -39,8 +39,10 @@ namespace displays
 bool isRawTransport(const std::string & topic)
 {
   std::string last_subtopic = topic.substr(topic.find_last_of('/') + 1);
-  return last_subtopic != "compressed" && last_subtopic != "compressedDepth" &&
-         last_subtopic != "theora";
+  return last_subtopic != "compressed" &&
+         last_subtopic != "compressedDepth" &&
+         last_subtopic != "theora" &&
+         last_subtopic != "ffmpeg";
 }
 
 std::string getTransportFromTopic(const std::string & topic)

rviz_default_plugins/src/rviz_default_plugins/displays/pointcloud/get_transport_from_topic.cpp

@@ -40,7 +40,8 @@ bool isPointCloud2RawTransport(const std::string & topic)
 {
   std::string last_subtopic = topic.substr(topic.find_last_of('/') + 1);
   return last_subtopic != "draco" && last_subtopic != "zlib" &&
-         last_subtopic != "pcl" && last_subtopic != "zstd";
+         last_subtopic != "pcl" && last_subtopic != "zstd" &&
+         last_subtopic != "cloudini";
 }
 
 std::string getPointCloud2TransportFromTopic(const std::string & topic)