From c0f362af33a8f43f3403d55d668c97e46db7da8a Mon Sep 17 00:00:00 2001 From: xiongguangjie Date: Fri, 25 Jun 2021 22:03:52 +0800 Subject: [PATCH] for linux compile --start-group and --end-group --- tests/CMakeLists.txt | 8 +++++++- webrtc/WebRtcTransport.cpp | 7 +------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 64ec28a1..99326fbe 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -62,7 +62,13 @@ foreach(TEST_SRC ${TEST_SRC_LIST}) if(WIN32) set_target_properties(${TEST_EXE_NAME} PROPERTIES COMPILE_FLAGS ${VS_FALGS} ) endif(WIN32) - target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) + if (CMAKE_SYSTEM_NAME MATCHES "Linux") + target_link_libraries(${TEST_EXE_NAME} -Wl,--start-group ${LINK_LIB_LIST} -Wl,--end-group) + else () + target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) + endif () + + #target_link_libraries(${TEST_EXE_NAME} ${LINK_LIB_LIST}) endforeach() if(MSVC AND SDL2_FOUND AND AVCODEC_FOUND AND AVUTIL_FOUND) diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 6ad1b896..2eb7cb1f 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -745,12 +745,7 @@ void WebRtcTransportImp::onRtp(const char *buf, size_t len) { } #endif //解析并排序rtp - if(!ref){ - InfoL << "ignore no rtp receiver of ssrc:" << ssrc<<" is rtx:"<inputRtp(info->media->type, info->plan_rtp->sample_rate, (uint8_t *) buf, len); + ref->inputRtp(track->media->type, track->plan_rtp->sample_rate, (uint8_t *) buf, len, false); return; }