From c24cfc016cd23f4839340062343bf6a93e09362c Mon Sep 17 00:00:00 2001 From: mth_sousa Date: Fri, 20 Dec 2024 10:29:31 -0300 Subject: [PATCH 1/6] [CHG] Enabling compile warnings Warnings enabled as errors --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccf5a9b..b0218fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.5) project(web_video_server) +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-Wall -Wextra -Wpedantic -Werror) +endif() + find_package(ament_cmake_ros REQUIRED) find_package(async_web_server_cpp REQUIRED) From 8a6459656f72e229a281c1f10c9b3371d8263edd Mon Sep 17 00:00:00 2001 From: mth_sousa Date: Fri, 20 Dec 2024 10:29:53 -0300 Subject: [PATCH 2/6] [CHG] Removing unused variables in functions --- src/libav_streamer.cpp | 2 +- src/web_video_server.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libav_streamer.cpp b/src/libav_streamer.cpp index 4814c4e..7b4c4b6 100644 --- a/src/libav_streamer.cpp +++ b/src/libav_streamer.cpp @@ -87,7 +87,7 @@ static int dispatch_output_packet(void * opaque, uint8_t * buffer, int buffer_si return 0; } -void LibavStreamer::initialize(const cv::Mat & img) +void LibavStreamer::initialize(const cv::Mat & /* img */) { // Load format format_context_ = avformat_alloc_context(); diff --git a/src/web_video_server.cpp b/src/web_video_server.cpp index 5f548c3..24db2fb 100644 --- a/src/web_video_server.cpp +++ b/src/web_video_server.cpp @@ -212,8 +212,8 @@ bool WebVideoServer::handle_stream( bool WebVideoServer::handle_snapshot( const async_web_server_cpp::HttpRequest & request, - async_web_server_cpp::HttpConnectionPtr connection, const char * begin, - const char * end) + async_web_server_cpp::HttpConnectionPtr connection, const char * /* begin */, + const char * /* end */) { std::shared_ptr streamer = std::make_shared( request, connection, shared_from_this()); @@ -278,9 +278,9 @@ bool WebVideoServer::handle_stream_viewer( } bool WebVideoServer::handle_list_streams( - const async_web_server_cpp::HttpRequest & request, - async_web_server_cpp::HttpConnectionPtr connection, const char * begin, - const char * end) + const async_web_server_cpp::HttpRequest & /* request */, + async_web_server_cpp::HttpConnectionPtr connection, const char * /* begin */, + const char * /* end */) { std::vector image_topics; std::vector camera_info_topics; From 22ee0809ef1ba19d6ada8b650a991302a7660b10 Mon Sep 17 00:00:00 2001 From: mth_sousa Date: Fri, 20 Dec 2024 10:30:08 -0300 Subject: [PATCH 3/6] [CHG] Correcting initialization order --- src/image_streamer.cpp | 2 +- src/libav_streamer.cpp | 4 ++-- src/multipart_stream.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/image_streamer.cpp b/src/image_streamer.cpp index 8a83958..564e1dc 100644 --- a/src/image_streamer.cpp +++ b/src/image_streamer.cpp @@ -44,7 +44,7 @@ namespace web_video_server ImageStreamer::ImageStreamer( const async_web_server_cpp::HttpRequest & request, async_web_server_cpp::HttpConnectionPtr connection, rclcpp::Node::SharedPtr node) -: request_(request), connection_(connection), node_(node), inactive_(false) +: connection_(connection), request_(request), node_(node), inactive_(false) { topic_ = request.get_query_param_value_or_default("topic", ""); } diff --git a/src/libav_streamer.cpp b/src/libav_streamer.cpp index 7b4c4b6..448133c 100644 --- a/src/libav_streamer.cpp +++ b/src/libav_streamer.cpp @@ -44,9 +44,9 @@ LibavStreamer::LibavStreamer( const std::string & format_name, const std::string & codec_name, const std::string & content_type) : ImageTransportImageStreamer(request, connection, node), format_context_(0), codec_(0), - codec_context_(0), video_stream_(0), frame_(0), sws_context_(0), + codec_context_(0), video_stream_(0), opt_(0), frame_(0), sws_context_(0), first_image_received_(false), first_image_time_(), format_name_(format_name), - codec_name_(codec_name), content_type_(content_type), opt_(0), io_buffer_(0) + codec_name_(codec_name), content_type_(content_type), io_buffer_(0) { bitrate_ = request.get_query_param_value_or_default("bitrate", 100000); qmin_ = request.get_query_param_value_or_default("qmin", 10); diff --git a/src/multipart_stream.cpp b/src/multipart_stream.cpp index b26d229..0429272 100644 --- a/src/multipart_stream.cpp +++ b/src/multipart_stream.cpp @@ -38,7 +38,7 @@ MultipartStream::MultipartStream( async_web_server_cpp::HttpConnectionPtr & connection, const std::string & boundry, std::size_t max_queue_size) -: connection_(connection), boundry_(boundry), max_queue_size_(max_queue_size) +: max_queue_size_(max_queue_size), connection_(connection), boundry_(boundry) {} void MultipartStream::sendInitialHeader() From 0f335299b5f3d95af0a22d213d4a0140b5154be6 Mon Sep 17 00:00:00 2001 From: mth_sousa Date: Fri, 20 Dec 2024 10:30:23 -0300 Subject: [PATCH 4/6] [CHG] Removing unused variables --- src/libav_streamer.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libav_streamer.cpp b/src/libav_streamer.cpp index 448133c..4d64cfc 100644 --- a/src/libav_streamer.cpp +++ b/src/libav_streamer.cpp @@ -274,8 +274,6 @@ void LibavStreamer::sendImage( } if (got_packet) { - std::size_t size; - uint8_t * output_buf; double seconds = std::chrono::duration_cast>( time - first_image_time_).count(); From 3721d413f37d0356c197fb8525a8824cd189d313 Mon Sep 17 00:00:00 2001 From: mth_sousa Date: Thu, 26 Dec 2024 16:12:46 -0300 Subject: [PATCH 5/6] [CHG] Removing -Werror flag --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0218fa..cd0aceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) project(web_video_server) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wextra -Wpedantic -Werror) + add_compile_options(-Wall -Wextra -Wpedantic) endif() find_package(ament_cmake_ros REQUIRED) From 4ac4b7d029f26e707d1df9c5986dc9671d505dc7 Mon Sep 17 00:00:00 2001 From: Mat198 <44040676+Mat198@users.noreply.github.com> Date: Thu, 26 Dec 2024 16:13:32 -0300 Subject: [PATCH 6/6] Update src/libav_streamer.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Błażej Sowa --- src/libav_streamer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libav_streamer.cpp b/src/libav_streamer.cpp index 4d64cfc..62f293f 100644 --- a/src/libav_streamer.cpp +++ b/src/libav_streamer.cpp @@ -274,7 +274,6 @@ void LibavStreamer::sendImage( } if (got_packet) { - double seconds = std::chrono::duration_cast>( time - first_image_time_).count(); // Encode video at 1/0.95 to minimize delay