Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
ZLMediaKit
Commits
aacd6416
Commit
aacd6416
authored
3 years ago
by
xiongziliang
Browse files
Options
Download
Email Patches
Plain Diff
修正多线程编程线程数异常相关问题
parent
9ab5ea2b
master
feature/transcode
feature/transcode2
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/ccpp.yml
+1
-1
.github/workflows/ccpp.yml
.github/workflows/macos.yml
+1
-1
.github/workflows/macos.yml
dockerfile
+2
-2
dockerfile
with
4 additions
and
4 deletions
+4
-4
.github/workflows/ccpp.yml
+
1
-
1
View file @
aacd6416
...
...
@@ -28,7 +28,7 @@ jobs:
run
:
cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install
-
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
run
:
pwd && cd release/linux/Debug && sudo ./MediaServer -d &
...
...
This diff is collapsed.
Click to expand it.
.github/workflows/macos.yml
+
1
-
1
View file @
aacd6416
...
...
@@ -31,7 +31,7 @@ jobs:
# run: cd 3rdpart/libsrtp && ./configure --enable-openssl && make -j4 && sudo make install
-
name
:
编译
run
:
mkdir -p build && cd build && cmake .. && make -j $
{
nproc
}
run
:
mkdir -p build && cd build && cmake .. && make -j $
(
nproc
)
-
name
:
运行MediaServer
run
:
pwd && cd release/linux/Debug && sudo ./MediaServer -d &
...
...
This diff is collapsed.
Click to expand it.
dockerfile
+
2
-
2
View file @
aacd6416
...
...
@@ -33,7 +33,7 @@ RUN apt-get update && \
apt-get autoremove
-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
&&
\
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/
*
RUN
mkdir
-p
/opt/media
...
...
@@ -44,7 +44,7 @@ RUN mkdir -p build release/linux/${MODEL}/
WORKDIR
/opt/media/ZLMediaKit/build
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
ARG
MODEL
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help