amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修正多线程编程线程数异常相关问题

Browse Source
This commit is contained in:
xiongziliang 2022-06-19 19:01:40 +08:00
parent 9ab5ea2b36
commit aacd6416ba
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ccpp.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install
- name: 编译 - name: 编译
run: mkdir -p linux_build && cd linux_build && cmake .. -DENABLE_WEBRTC:BOOL=TRUE && make -j ${nproc} run: mkdir -p linux_build && cd linux_build && cmake .. -DENABLE_WEBRTC:BOOL=TRUE && make -j $(nproc)
- name: 运行MediaServer - name: 运行MediaServer
run: pwd && cd release/linux/Debug && sudo ./MediaServer -d & run: pwd && cd release/linux/Debug && sudo ./MediaServer -d &

2
.github/workflows/macos.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
# run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install # run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install
- name: 编译 - name: 编译
run: mkdir -p build && cd build && cmake .. && make -j ${nproc} run: mkdir -p build && cd build && cmake .. && make -j $(nproc)
- name: 运行MediaServer - name: 运行MediaServer
run: pwd && cd release/linux/Debug && sudo ./MediaServer -d & run: pwd && cd release/linux/Debug && sudo ./MediaServer -d &

4
dockerfile
View File

@ -33,7 +33,7 @@ RUN apt-get update && \
apt-get autoremove -y && \ apt-get autoremove -y && \
apt-get clean -y && \ apt-get clean -y && \
wget https://github.com/cisco/libsrtp/archive/v2.2.0.tar.gz -O libsrtp-2.2.0.tar.gz && tar xfv libsrtp-2.2.0.tar.gz && \ wget https://github.com/cisco/libsrtp/archive/v2.2.0.tar.gz -O libsrtp-2.2.0.tar.gz && tar xfv libsrtp-2.2.0.tar.gz && \
cd libsrtp-2.2.0 && ./configure --enable-openssl && make -j ${nproc} && make install && \ cd libsrtp-2.2.0 && ./configure --enable-openssl && make -j $(nproc) && make install && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir -p /opt/media RUN mkdir -p /opt/media
@ -44,7 +44,7 @@ RUN mkdir -p build release/linux/${MODEL}/
WORKDIR /opt/media/ZLMediaKit/build WORKDIR /opt/media/ZLMediaKit/build
RUN cmake -DCMAKE_BUILD_TYPE=${MODEL} -DENABLE_WEBRTC=true -DENABLE_TESTS=false -DENABLE_API=false .. && \ RUN cmake -DCMAKE_BUILD_TYPE=${MODEL} -DENABLE_WEBRTC=true -DENABLE_TESTS=false -DENABLE_API=false .. && \
make -j ${nproc} make -j $(nproc)
FROM ubuntu:18.04 FROM ubuntu:18.04
ARG MODEL ARG MODEL