From b026634a3e7e72b1aa7801bd119e35fe99aa9596 Mon Sep 17 00:00:00 2001 From: wxf Date: Sat, 26 Jun 2021 17:10:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AA=E5=90=AF=E7=94=A8=20WebRTC=20?= =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E7=A6=81=E7=94=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 64ec28a1..8219b816 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -55,6 +55,12 @@ else() endif() foreach(TEST_SRC ${TEST_SRC_LIST}) + if(NOT ENABLE_WEBRTC) + # 暂时过滤掉依赖 WebRTC 的测试模块 + if("${TEST_SRC}" MATCHES "test_rtcp_nack\.cpp") + continue() + endif() + endif() STRING(REGEX REPLACE "^\\./|\\.c[a-zA-Z0-9_]*$" "" TEST_EXE_NAME ${TEST_SRC}) message(STATUS "add test:${TEST_EXE_NAME}") add_executable(${TEST_EXE_NAME} ${TEST_SRC}) From 0a7acf94d3ee053947a1a1c343123311e14d3dff Mon Sep 17 00:00:00 2001 From: wxf Date: Sat, 26 Jun 2021 17:57:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=8E=E7=A1=AE=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=AF=91=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5ed1f294..092dd76e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -5,8 +5,8 @@ on: [push] jobs: build: - runs-on: ubuntu-latest - + runs-on: ubuntu-20.04 + steps: - uses: actions/checkout@v1 From 72e8b6efa447ed3fd1f8fbe9fc0a824e71a70a89 Mon Sep 17 00:00:00 2001 From: wxf Date: Sat, 26 Jun 2021 17:58:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=9B=86=E6=88=90=20WebR?= =?UTF-8?q?TC=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ccpp.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 092dd76e..09672376 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -16,8 +16,19 @@ jobs: - name: apt-get安装依赖库(非必选) run: sudo apt-get update && sudo apt-get install -y cmake libssl-dev libsdl-dev libavcodec-dev libavutil-dev + - name: 下载 SRTP + uses: actions/checkout@v2 + with: + repository: cisco/libsrtp + fetch-depth: 1 + ref: v2.3.0 + path: 3rdpart/libsrtp + + - name: 编译 SRTP + run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install + - name: 编译 - run: mkdir -p linux_build && cd linux_build && cmake .. && make -j4 + run: mkdir -p linux_build && cd linux_build && cmake .. -DENABLE_WEBRTC:BOOL=TRUE && make -j4 - name: 运行MediaServer run: pwd && cd release/linux/Debug && sudo ./MediaServer -d &