Move base streamer classes to streamers namespace

Author: bjsowa

CMakeLists.txt

@@ -68,8 +68,8 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 add_library(${PROJECT_NAME}_streamers SHARED
-  src/image_transport_streamer.cpp
-  src/libav_streamer.cpp
+  src/streamers/image_transport_streamer.cpp
+  src/streamers/libav_streamer.cpp
   src/streamers/h264_streamer.cpp
   src/streamers/jpeg_streamers.cpp
   src/streamers/png_streamers.cpp

include/web_video_server/streamers/h264_streamer.hpp

@@ -36,8 +36,8 @@
 #include "async_web_server_cpp/http_connection.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/libav_streamer.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/libav_streamer.hpp"
 
 namespace web_video_server
 {

include/web_video_server/image_transport_streamer.hpp renamed to include/web_video_server/streamers/image_transport_streamer.hpp

@@ -47,6 +47,8 @@
 
 namespace web_video_server
 {
+namespace streamers
+{
 
 /**
  * @brief A common base class for all streaming plugins using image_transport to subscribe to image
@@ -99,4 +101,5 @@ class ImageTransportSnapshotStreamerFactoryBase : public SnapshotStreamerFactory
   virtual std::vector<std::string> get_available_topics(rclcpp::Node::SharedPtr node);
 };
 
+}  // namespace streamers
 }  // namespace web_video_server

include/web_video_server/streamers/jpeg_streamers.hpp

@@ -40,9 +40,9 @@
 #include "async_web_server_cpp/http_connection.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/image_transport_streamer.hpp"
 #include "web_video_server/multipart_stream.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/image_transport_streamer.hpp"
 
 namespace web_video_server
 {

include/web_video_server/libav_streamer.hpp renamed to include/web_video_server/streamers/libav_streamer.hpp

@@ -52,11 +52,13 @@ extern "C"
 #include "async_web_server_cpp/http_request.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/image_transport_streamer.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/image_transport_streamer.hpp"
 
 namespace web_video_server
 {
+namespace streamers
+{
 
 /**
  * @brief A common base class for all streaming plugins using image_transport to subscribe to image
@@ -108,4 +110,5 @@ class LibavStreamerFactoryBase : public ImageTransportStreamerFactoryBase
   virtual std::string create_viewer(const async_web_server_cpp::HttpRequest & request);
 };
 
+}  // namespace streamers
 }  // namespace web_video_server

include/web_video_server/streamers/png_streamers.hpp

@@ -40,9 +40,9 @@
 #include "rclcpp/node.hpp"
 #include "sensor_msgs/msg/image.hpp"
 
-#include "web_video_server/image_transport_streamer.hpp"
 #include "web_video_server/multipart_stream.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/image_transport_streamer.hpp"
 
 namespace web_video_server
 {

include/web_video_server/streamers/vp8_streamer.hpp

@@ -37,8 +37,8 @@
 #include "async_web_server_cpp/http_request.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/libav_streamer.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/libav_streamer.hpp"
 
 namespace web_video_server
 {

include/web_video_server/streamers/vp9_streamer.hpp

@@ -36,8 +36,8 @@
 #include "async_web_server_cpp/http_request.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/libav_streamer.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/libav_streamer.hpp"
 
 namespace web_video_server
 {

src/streamers/h264_streamer.cpp

@@ -44,8 +44,8 @@ extern "C"
 #include "async_web_server_cpp/http_request.hpp"
 #include "rclcpp/node.hpp"
 
-#include "web_video_server/libav_streamer.hpp"
 #include "web_video_server/streamer.hpp"
+#include "web_video_server/streamers/libav_streamer.hpp"
 
 namespace web_video_server
 {

src/image_transport_streamer.cpp renamed to src/streamers/image_transport_streamer.cpp

@@ -28,7 +28,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-#include "web_video_server/image_transport_streamer.hpp"
+#include "web_video_server/streamers/image_transport_streamer.hpp"
 
 #include <chrono>
 #include <exception>
@@ -61,6 +61,8 @@
 
 namespace web_video_server
 {
+namespace streamers
+{
 
 ImageTransportStreamerBase::ImageTransportStreamerBase(
   const async_web_server_cpp::HttpRequest & request,
@@ -270,4 +272,5 @@ std::vector<std::string> ImageTransportSnapshotStreamerFactoryBase::get_availabl
   return result;
 }
 
+}  // namespace streamers
 }  // namespace web_video_server