Doni/safesight
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename: safesight-media -> safesight-edge-server, paths updated

Browse Source
This commit is contained in:
haotian 2026-07-20 18:00:06 +08:00
parent d2093d4462
commit eda635c0ac
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -84,28 +84,28 @@ install(TARGETS rk_shared_state
LIBRARY DESTINATION bin LIBRARY DESTINATION bin
) )
add_executable(safesight-media ${SRC_FILES}) add_executable(safesight-edge-server ${SRC_FILES})
set_target_properties(safesight-media PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set_target_properties(safesight-edge-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
target_include_directories(safesight-media target_include_directories(safesight-edge-server
PRIVATE PRIVATE
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/third_party ${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) if(RK3588_ENABLE_FFMPEG)
target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_FFMPEG) target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_FFMPEG)
target_include_directories(safesight-media PRIVATE ${FFMPEG_INCLUDE_DIRS}) target_include_directories(safesight-edge-server PRIVATE ${FFMPEG_INCLUDE_DIRS})
target_link_libraries(safesight-media PRIVATE PkgConfig::FFMPEG PkgConfig::SWSCALE) target_link_libraries(safesight-edge-server PRIVATE PkgConfig::FFMPEG PkgConfig::SWSCALE)
endif() endif()
if(RK3588_ENABLE_MPP) if(RK3588_ENABLE_MPP)
target_include_directories(safesight-media SYSTEM PRIVATE target_include_directories(safesight-edge-server SYSTEM PRIVATE
${RK_MPP_ROOT}/inc ${RK_MPP_ROOT}/inc
${RK_RKNN_ROOT}/examples/3rdparty/mpp/include ${RK_RKNN_ROOT}/examples/3rdparty/mpp/include
) )
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") 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() 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") message(WARNING "RGA enabled but librga not found; disable RK3588_ENABLE_RGA or install librga-dev")
else() else()
message(STATUS "Found librga: ${RK_RGA_LIB}") message(STATUS "Found librga: ${RK_RGA_LIB}")
target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_RGA) target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_RGA)
target_include_directories(safesight-media SYSTEM PRIVATE ${RK_RGA_INCLUDE_DIR}) target_include_directories(safesight-edge-server SYSTEM PRIVATE ${RK_RGA_INCLUDE_DIR})
target_link_libraries(safesight-media PRIVATE ${RK_RGA_LIB}) target_link_libraries(safesight-edge-server PRIVATE ${RK_RGA_LIB})
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") 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() endif()
endif() endif()
@ -142,21 +142,21 @@ if(RK3588_ENABLE_RKNN)
if(NOT RK_RKNN_LIB) if(NOT RK_RKNN_LIB)
message(WARNING "RKNN enabled but librknnrt not found; disable RK3588_ENABLE_RKNN or set RKNN_RUNTIME_LIB_DIR") message(WARNING "RKNN enabled but librknnrt not found; disable RK3588_ENABLE_RKNN or set RKNN_RUNTIME_LIB_DIR")
else() else()
target_compile_definitions(safesight-media PRIVATE RK3588_ENABLE_RKNN) target_compile_definitions(safesight-edge-server PRIVATE RK3588_ENABLE_RKNN)
target_include_directories(safesight-media PRIVATE ${RKNN_RUNTIME_INCLUDE_DIR}) target_include_directories(safesight-edge-server PRIVATE ${RKNN_RUNTIME_INCLUDE_DIR})
target_link_libraries(safesight-media PRIVATE ${RK_RKNN_LIB}) target_link_libraries(safesight-edge-server PRIVATE ${RK_RKNN_LIB})
endif() endif()
endif() endif()
if(WIN32) if(WIN32)
target_link_libraries(safesight-media PRIVATE ws2_32) target_link_libraries(safesight-edge-server PRIVATE ws2_32)
endif() endif()
target_compile_definitions(safesight-media PRIVATE target_compile_definitions(safesight-edge-server PRIVATE
RK_PROJECT_VERSION="${PROJECT_VERSION}" RK_PROJECT_VERSION="${PROJECT_VERSION}"
RK_GIT_SHA="${RK_GIT_SHA}" RK_GIT_SHA="${RK_GIT_SHA}"
) )
install(TARGETS safesight-media RUNTIME DESTINATION bin) install(TARGETS safesight-edge-server RUNTIME DESTINATION bin)
if(BUILD_SAMPLES) if(BUILD_SAMPLES)
add_subdirectory(samples) add_subdirectory(samples)
@ -170,4 +170,4 @@ endif()
add_subdirectory(plugins) add_subdirectory(plugins)
include(GNUInstallDirs) 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)

4
scripts/build.sh
View File

@ -165,8 +165,8 @@ if [ $BUILD_MEDIA -eq 1 ]; then
cmake --build "$BUILD_DIR" -j"$JOBS" cmake --build "$BUILD_DIR" -j"$JOBS"
echo -e "${GREEN}✓${NC} Media Server 编译完成" echo -e "${GREEN}✓${NC} Media Server 编译完成"
echo " 输出: $BUILD_DIR/media-server" echo " 输出: $BUILD_DIR/safesight-edge-server"
ls -lh "$BUILD_DIR/media-server" ls -lh "$BUILD_DIR/safesight-edge-server"
echo "" echo ""
fi fi

8
scripts/deploy/media-server.service
View File

@ -7,11 +7,11 @@ Wants=network.target
Type=simple Type=simple
User=root User=root
Group=root Group=root
WorkingDirectory=/opt/rk3588-media-server WorkingDirectory=/opt/safesight-edge-server
Environment="LD_LIBRARY_PATH=/opt/rk3588-media-server/lib:/opt/rk3588-media-server/bin/plugins:/usr/local/lib" Environment="LD_LIBRARY_PATH=/opt/safesight-edge-server/lib:/opt/safesight-edge-server/bin/plugins:/usr/local/lib"
Environment="RKNPU_LOG_LEVEL=2" 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' 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/rk3588-media-server/bin/media-server --config /opt/rk3588-media-server/etc/media-server.json ExecStart=/opt/safesight-edge-server/bin/safesight-edge-server --config /opt/safesight-edge-server/etc/media-server.json
Restart=always Restart=always
RestartSec=5 RestartSec=5
StartLimitInterval=60s StartLimitInterval=60s