SmartBench/cmvr-es
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cmake): build legacy and safety media managers

Browse Source
This commit is contained in:
linbo 2026-08-27 10:46:22 +08:00
parent ae4b54d9f7
commit e8d402db51
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmvr-es/CMakeLists.txt
View File

@ -10,6 +10,7 @@ add_subdirectory(manager/control_authority_manager)
add_subdirectory(manager/safety_manager) add_subdirectory(manager/safety_manager)
add_subdirectory(manager/device_manager) add_subdirectory(manager/device_manager)
add_subdirectory(service/grpc/stop_all) add_subdirectory(service/grpc/stop_all)
add_subdirectory(manager/media_source_hub)
add_subdirectory(manager/media_source_manager) add_subdirectory(manager/media_source_manager)
add_subdirectory(service/quic_edge) add_subdirectory(service/quic_edge)
add_subdirectory(task) add_subdirectory(task)

10
cmvr-es/manager/media_source_hub/CMakeLists.txt
View File

@ -17,22 +17,22 @@ target_include_directories(media_source_hub
add_library(cmvr_es::media_source_hub ALIAS media_source_hub) add_library(cmvr_es::media_source_hub ALIAS media_source_hub)
if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
add_library(device_media_source_adapter STATIC add_library(media_source_hub_device_adapter STATIC
src/device_media_source_adapter.cpp src/device_media_source_adapter.cpp
) )
target_compile_features(device_media_source_adapter PUBLIC cxx_std_17) target_compile_features(media_source_hub_device_adapter PUBLIC cxx_std_17)
target_include_directories(device_media_source_adapter target_include_directories(media_source_hub_device_adapter
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../..
) )
target_link_libraries(device_media_source_adapter target_link_libraries(media_source_hub_device_adapter
PUBLIC PUBLIC
cmvr_es::media_source_hub cmvr_es::media_source_hub
cmvr_es::common cmvr_es::common
cmvr_es::proto cmvr_es::proto
cmvr_es::logging cmvr_es::logging
) )
add_library(cmvr_es::device_media_source_adapter ALIAS device_media_source_adapter) add_library(cmvr_es::media_source_hub_device_adapter ALIAS media_source_hub_device_adapter)
endif() endif()
option(CMVR_MEDIA_SOURCE_HUB_BUILD_TESTS option(CMVR_MEDIA_SOURCE_HUB_BUILD_TESTS

3
cmvr-es/manager/media_source_hub/include/device_media_source_adapter.h
View File

@ -16,9 +16,6 @@ namespace cmvr::media {
// Process-wide protocol-neutral media hub shared by gRPC and QUIC services. // Process-wide protocol-neutral media hub shared by gRPC and QUIC services.
MediaSourceHub& globalMediaSourceHub(); MediaSourceHub& globalMediaSourceHub();
std::string cameraColorTrackId(const std::string& device_id);
std::string microphoneTrackId(const std::string& device_id);
// Registration is idempotent for an already registered track. The adapter owns a // Registration is idempotent for an already registered track. The adapter owns a
// short-lived pump thread and one startStreaming()/stopStreaming() lease only while // short-lived pump thread and one startStreaming()/stopStreaming() lease only while
// at least one Hub subscription is active. It ensures start() succeeds but deliberately // at least one Hub subscription is active. It ensures start() succeeds but deliberately

4
cmvr-es/manager/media_source_hub/src/device_media_source_adapter.cpp
View File

@ -613,11 +613,11 @@ MediaSourceHub& globalMediaSourceHub() {
return hub; return hub;
} }
std::string cameraColorTrackId(const std::string& device_id) { static std::string cameraColorTrackId(const std::string& device_id) {
return device_id + "/video/color"; return device_id + "/video/color";
} }
std::string microphoneTrackId(const std::string& device_id) { static std::string microphoneTrackId(const std::string& device_id) {
return device_id + "/audio/main"; return device_id + "/audio/main";
} }

2
cmvr-es/service/quic_edge/CMakeLists.txt
View File

@ -16,7 +16,7 @@ target_link_libraries(quic_edge_service
cmvr_es::proto cmvr_es::proto
cmvr_es::media_source_hub cmvr_es::media_source_hub
PRIVATE PRIVATE
cmvr_es::device_media_source_adapter cmvr_es::media_source_hub_device_adapter
cmvr_es::device_manager cmvr_es::device_manager
Threads::Threads Threads::Threads
msquic msquic