Skip to content

Commit 47aa44e

Browse files
committed
feat!: drop the libav-backed h264, vp8 and vp9 streamers
MoveIt Pro serves camera panes as MJPEG and never requests these types. Keeping them forced a dependency on FFmpeg's development packages, which on Ubuntu are built with --enable-gpl and pull libx264 and libx265 into the product image. The remaining streamers (mjpeg, png, ros_compressed) and all three snapshot endpoints encode through cv::imencode, so nothing else changes. A request for a removed type now misses the factory map and gets the existing HTTP 404 fallback in WebVideoServer::handle_stream. BREAKING CHANGE: /stream?type=h264, ?type=vp8 and ?type=vp9 return 404.
1 parent 5e4b1b4 commit 47aa44e

11 files changed

Lines changed: 0 additions & 1014 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ find_package(sensor_msgs REQUIRED)
1919
find_package(OpenCV REQUIRED)
2020
find_package(Boost REQUIRED COMPONENTS system)
2121

22-
find_package(PkgConfig REQUIRED)
23-
pkg_check_modules(avcodec libavcodec REQUIRED)
24-
pkg_check_modules(avformat libavformat REQUIRED)
25-
pkg_check_modules(avutil libavutil REQUIRED)
26-
pkg_check_modules(swscale libswscale REQUIRED)
27-
2822
if(NOT CMAKE_CXX_STANDARD)
2923
set(CMAKE_CXX_STANDARD 14)
3024
endif()
@@ -69,23 +63,15 @@ target_link_libraries(${PROJECT_NAME}
6963

7064
add_library(${PROJECT_NAME}_streamers SHARED
7165
src/streamers/image_transport_streamer.cpp
72-
src/streamers/libav_streamer.cpp
73-
src/streamers/h264_streamer.cpp
7466
src/streamers/jpeg_streamers.cpp
7567
src/streamers/png_streamers.cpp
7668
src/streamers/ros_compressed_streamer.cpp
77-
src/streamers/vp8_streamer.cpp
78-
src/streamers/vp9_streamer.cpp
7969
)
8070

8171
target_include_directories(${PROJECT_NAME}_streamers
8272
PUBLIC
8373
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
8474
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
85-
${avcodec_INCLUDE_DIRS}
86-
${avformat_INCLUDE_DIRS}
87-
${avutil_INCLUDE_DIRS}
88-
${swscale_INCLUDE_DIRS}
8975
)
9076

9177
target_link_libraries(${PROJECT_NAME}_streamers
@@ -99,10 +85,6 @@ target_link_libraries(${PROJECT_NAME}_streamers
9985
Boost::boost
10086
Boost::system
10187
${OpenCV_LIBS}
102-
${avcodec_LIBRARIES}
103-
${avformat_LIBRARIES}
104-
${avutil_LIBRARIES}
105-
${swscale_LIBRARIES}
10688
)
10789

10890
## Declare a cpp executable

include/web_video_server/streamers/h264_streamer.hpp

Lines changed: 0 additions & 72 deletions
This file was deleted.

include/web_video_server/streamers/libav_streamer.hpp

Lines changed: 0 additions & 115 deletions
This file was deleted.

include/web_video_server/streamers/vp8_streamer.hpp

Lines changed: 0 additions & 75 deletions
This file was deleted.

include/web_video_server/streamers/vp9_streamer.hpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<depend>async_web_server_cpp</depend>
2323
<depend>boost</depend>
2424
<depend>cv_bridge</depend>
25-
<depend>ffmpeg</depend>
2625
<depend>image_transport</depend>
2726
<depend>libopencv-dev</depend>
2827
<depend>rclcpp</depend>

0 commit comments

Comments
 (0)