From 5d172f344f570e46e8efb9f16d160b352d60e0ba Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 9 Nov 2022 13:39:50 -0800 Subject: [PATCH 1/3] updated url for rtsp with mp4 instead of mov --- launch/rtsp_stream.launch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/launch/rtsp_stream.launch b/launch/rtsp_stream.launch index db370f2..842a938 100644 --- a/launch/rtsp_stream.launch +++ b/launch/rtsp_stream.launch @@ -1,11 +1,13 @@ + + - + From ad94ce771c66cebcc285f5c6af1406e70d82bbe7 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 9 Nov 2022 13:40:12 -0800 Subject: [PATCH 2/3] build with default C++ and usel boost::placeholders --- CMakeLists.txt | 1 - src/video_stream.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7260b4c..dbec271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) project(video_stream_opencv) -add_definitions(-std=c++11) find_package(catkin REQUIRED COMPONENTS roscpp diff --git a/src/video_stream.cpp b/src/video_stream.cpp index 88ff61e..1970f9b 100644 --- a/src/video_stream.cpp +++ b/src/video_stream.cpp @@ -441,18 +441,18 @@ virtual void onInit() { // set parameters from dynamic reconfigure server dyn_srv = boost::make_shared >(*pnh); - auto f = boost::bind(&VideoStreamNodelet::configCallback, this, _1, _2); + auto f = boost::bind(&VideoStreamNodelet::configCallback, this, boost::placeholders::_1, boost::placeholders::_2); dyn_srv->setCallback(f); subscriber_num = 0; image_transport::SubscriberStatusCallback connect_cb = - boost::bind(&VideoStreamNodelet::connectionCallback, this, _1); + boost::bind(&VideoStreamNodelet::connectionCallback, this, boost::placeholders::_1); ros::SubscriberStatusCallback info_connect_cb = - boost::bind(&VideoStreamNodelet::infoConnectionCallback, this, _1); + boost::bind(&VideoStreamNodelet::infoConnectionCallback, this, boost::placeholders::_1); image_transport::SubscriberStatusCallback disconnect_cb = - boost::bind(&VideoStreamNodelet::disconnectionCallback, this, _1); + boost::bind(&VideoStreamNodelet::disconnectionCallback, this, boost::placeholders::_1); ros::SubscriberStatusCallback info_disconnect_cb = - boost::bind(&VideoStreamNodelet::infoDisconnectionCallback, this, _1); + boost::bind(&VideoStreamNodelet::infoDisconnectionCallback, this, boost::placeholders::_1); pub = image_transport::ImageTransport(*nh).advertiseCamera( "image_raw", 1, connect_cb, disconnect_cb, From c27678d8f68ad63fd6a7f946dcfc776aa4821217 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sun, 25 Dec 2022 11:16:37 -0800 Subject: [PATCH 3/3] use pluginlib hpp header instead of deprecated .h --- src/video_stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_stream.cpp b/src/video_stream.cpp index 1970f9b..62ce7d3 100644 --- a/src/video_stream.cpp +++ b/src/video_stream.cpp @@ -468,5 +468,5 @@ virtual ~VideoStreamNodelet() { }; } // namespace -#include +#include PLUGINLIB_EXPORT_CLASS(video_stream_opencv::VideoStreamNodelet, nodelet::Nodelet)