diff --git a/CMakeLists.txt b/CMakeLists.txt index 6381818..2445b6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,28 +84,28 @@ install(TARGETS rk_shared_state LIBRARY DESTINATION bin ) -add_executable(safesight-media ${SRC_FILES}) -set_target_properties(safesight-media PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -target_include_directories(safesight-media +add_executable(safesight-edge-server ${SRC_FILES}) +set_target_properties(safesight-edge-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +target_include_directories(safesight-edge-server PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/third_party ) -target_link_libraries(safesight-media PRIVATE project_options Threads::Threads) +target_link_libraries(safesight-edge-server PRIVATE project_options Threads::Threads) if(RK3588_ENABLE_FFMPEG) - target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_FFMPEG) - target_include_directories(safesight-media PRIVATE ${FFMPEG_INCLUDE_DIRS}) - target_link_libraries(safesight-media PRIVATE PkgConfig::FFMPEG PkgConfig::SWSCALE) + target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_FFMPEG) + target_include_directories(safesight-edge-server PRIVATE ${FFMPEG_INCLUDE_DIRS}) + target_link_libraries(safesight-edge-server PRIVATE PkgConfig::FFMPEG PkgConfig::SWSCALE) endif() if(RK3588_ENABLE_MPP) - target_include_directories(safesight-media SYSTEM PRIVATE + target_include_directories(safesight-edge-server SYSTEM PRIVATE ${RK_MPP_ROOT}/inc ${RK_RKNN_ROOT}/examples/3rdparty/mpp/include ) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(safesight-media PRIVATE -Wno-pedantic) + target_compile_options(safesight-edge-server PRIVATE -Wno-pedantic) endif() endif() @@ -120,11 +120,11 @@ if(RK3588_ENABLE_RGA) message(WARNING "RGA enabled but librga not found; disable RK3588_ENABLE_RGA or install librga-dev") else() message(STATUS "Found librga: ${RK_RGA_LIB}") - target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_RGA) - target_include_directories(safesight-media SYSTEM PRIVATE ${RK_RGA_INCLUDE_DIR}) - target_link_libraries(safesight-media PRIVATE ${RK_RGA_LIB}) + target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_RGA) + target_include_directories(safesight-edge-server SYSTEM PRIVATE ${RK_RGA_INCLUDE_DIR}) + target_link_libraries(safesight-edge-server PRIVATE ${RK_RGA_LIB}) if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(safesight-media PRIVATE -Wno-pedantic) + target_compile_options(safesight-edge-server PRIVATE -Wno-pedantic) endif() endif() endif() @@ -142,21 +142,21 @@ if(RK3588_ENABLE_RKNN) if(NOT RK_RKNN_LIB) message(WARNING "RKNN enabled but librknnrt not found; disable RK3588_ENABLE_RKNN or set RKNN_RUNTIME_LIB_DIR") else() - target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_RKNN) - target_include_directories(safesight-media PRIVATE ${RKNN_RUNTIME_INCLUDE_DIR}) - target_link_libraries(safesight-media PRIVATE ${RK_RKNN_LIB}) + target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_RKNN) + target_include_directories(safesight-edge-server PRIVATE ${RKNN_RUNTIME_INCLUDE_DIR}) + target_link_libraries(safesight-edge-server PRIVATE ${RK_RKNN_LIB}) endif() endif() if(WIN32) - target_link_libraries(safesight-media PRIVATE ws2_32) + target_link_libraries(safesight-edge-server PRIVATE ws2_32) endif() -target_compile_definitions(safesight-media PRIVATE +target_compile_definitions(safesight-edge-server PRIVATE RK_PROJECT_VERSION="${PROJECT_VERSION}" RK_GIT_SHA="${RK_GIT_SHA}" ) -install(TARGETS safesight-media RUNTIME DESTINATION bin) +install(TARGETS safesight-edge-server RUNTIME DESTINATION bin) if(BUILD_SAMPLES) add_subdirectory(samples) @@ -170,4 +170,4 @@ endif() add_subdirectory(plugins) include(GNUInstallDirs) -install(FILES configs/sample_cam1.json DESTINATION ${CMAKE_INSTALL_DATADIR}/safesight-media) +install(FILES configs/sample_cam1.json DESTINATION ${CMAKE_INSTALL_DATADIR}/safesight-edge-server) diff --git a/scripts/build.sh b/scripts/build.sh index 99b7f5f..a762b1b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -165,8 +165,8 @@ if [ $BUILD_MEDIA -eq 1 ]; then cmake --build "$BUILD_DIR" -j"$JOBS" echo -e "${GREEN}✓${NC} Media Server 编译完成" - echo " 输出: $BUILD_DIR/media-server" - ls -lh "$BUILD_DIR/media-server" + echo " 输出: $BUILD_DIR/safesight-edge-server" + ls -lh "$BUILD_DIR/safesight-edge-server" echo "" fi diff --git a/scripts/deploy/media-server.service b/scripts/deploy/media-server.service index bf8b569..9721fd8 100644 --- a/scripts/deploy/media-server.service +++ b/scripts/deploy/media-server.service @@ -7,11 +7,11 @@ Wants=network.target Type=simple User=root Group=root -WorkingDirectory=/opt/rk3588-media-server -Environment="LD_LIBRARY_PATH=/opt/rk3588-media-server/lib:/opt/rk3588-media-server/bin/plugins:/usr/local/lib" +WorkingDirectory=/opt/safesight-edge-server +Environment="LD_LIBRARY_PATH=/opt/safesight-edge-server/lib:/opt/safesight-edge-server/bin/plugins:/usr/local/lib" Environment="RKNPU_LOG_LEVEL=2" -ExecStartPre=/bin/bash -c 'mkdir -p /var/lib/rk3588-media-server/hls /var/lib/rk3588-media-server/logs /var/lib/rk3588-media-server/alarms /var/lib/rk3588-media-server/clips && chown orangepi:orangepi /var/lib/rk3588-media-server/logs /var/lib/rk3588-media-server/alarms /var/lib/rk3588-media-server/clips && chmod 755 /var/lib/rk3588-media-server/logs /var/lib/rk3588-media-server/alarms /var/lib/rk3588-media-server/clips' -ExecStart=/opt/rk3588-media-server/bin/media-server --config /opt/rk3588-media-server/etc/media-server.json +ExecStartPre=/bin/bash -c 'mkdir -p /var/lib/safesight-edge-server/hls /var/lib/safesight-edge-server/logs /var/lib/safesight-edge-server/alarms /var/lib/safesight-edge-server/clips && chown orangepi:orangepi /var/lib/safesight-edge-server/logs /var/lib/safesight-edge-server/alarms /var/lib/safesight-edge-server/clips && chmod 755 /var/lib/safesight-edge-server/logs /var/lib/safesight-edge-server/alarms /var/lib/safesight-edge-server/clips' +ExecStart=/opt/safesight-edge-server/bin/safesight-edge-server --config /opt/safesight-edge-server/etc/media-server.json Restart=always RestartSec=5 StartLimitInterval=60s