1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

591 commits

Author SHA1 Message Date
winlin
3fa767f3cc Build: Support --ssl-local to rebuild openssl even system exists 2021-01-31 18:07:39 +08:00
winlin
6e3bd61599 Enable --nasm and --srtp-asm by default for performance. 4.0.64 2021-01-31 18:07:20 +08:00
winlin
0fe85a295c Refine options with default value 2021-01-31 18:05:26 +08:00
winlin
b9a5d4beb6 Refine options with default value 2021-01-31 18:05:07 +08:00
winlin
62909bb2d0 Merge branch '4.0release' into develop 2021-01-31 17:56:58 +08:00
winlin
73c4b1cb6e RTC: Enable -std=c++11 by default. 4.0.65 2021-01-31 14:54:51 +08:00
winlin
849703bca1 Build: Support --ssl-local to rebuild openssl even system exists 2021-01-26 17:54:44 +08:00
winlin
f6720c18c6 Enable --nasm and --srtp-asm by default for performance. 4.0.64 2021-01-25 22:23:42 +08:00
winlin
0c56d11605 Refine options with default value 2021-01-18 17:32:14 +08:00
winlin
1371a47962 Refine options with default value 2021-01-18 17:28:51 +08:00
winlin
e26b685169 Refine script 2021-01-18 12:34:11 +08:00
winlin
8580b1e5fb Merge branch '4.0release' into develop 2021-01-07 18:02:42 +08:00
winlin
f8266fe3b7 Add usage for --cherrypy=on|off when configure 2021-01-07 18:02:24 +08:00
johzzy
3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 2021-01-07 13:47:30 +08:00
winlin
18d049accc Support disable CherryPy. 4.0.57 2020-12-24 11:33:49 +08:00
winlin
d2df045d0e For #1657, enable HTTPS by default 2020-11-03 16:56:05 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
365d3b8bda Merge SRS3.0 2020-10-31 21:53:15 +08:00
winlin
9a963c6fd2 Fix #509, Always malloc stack on heap. 3.0.153 2020-10-31 21:27:09 +08:00
winlin
99afdb361f Merge branch '3.0release' into 4.0release 2020-10-23 21:48:17 +08:00
winlin
aac170b75e Refine build script 2020-10-23 21:45:32 +08:00
winlin
0a09b53fc1 Refine build script 2020-10-23 21:35:46 +08:00
winlin
a51e275414 Merge SRS3 2020-10-23 21:35:13 +08:00
winlin
6dc3d85ded Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147 2020-10-23 21:32:57 +08:00
winlin
1d92ff73fb Fix build script 2020-10-23 21:24:29 +08:00
winlin
be1a1d99de Merge SRS3 2020-10-23 21:22:58 +08:00
winlin
e1ff69f292 Refine build script, use libssl in docker. 3.0.146 2020-10-23 21:14:40 +08:00
winlin
8860d0ec62 RTC: Refine options 2020-08-28 11:19:21 +08:00
winlin
994c53b6c1 Merge branch '4.0release' into develop 2020-08-06 12:08:46 +08:00
winlin
4984bcbaef Revert "supprot LAS(live adaptive stream)"
This reverts commit c1f98ddcc8.
2020-08-06 12:02:32 +08:00
winlin
dd13889772 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:33:34 +08:00
winlin
b847a0a218 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:31:14 +08:00
winlin
0905558d49 BUILD: Compatible with 3.0 options, ignore it 2020-08-03 19:28:52 +08:00
winlin
0408040ed7 Fix utest fail for C++11 or C++14 2020-07-30 19:26:28 +08:00
winlin
8ae3ab0ba7 Merge SRS 4.0 2020-07-19 10:09:28 +08:00
winlin
bff7ef085d Log: Allow log verbose and info 2020-07-05 22:01:03 +08:00
liulichuan
c1f98ddcc8 supprot LAS(live adaptive stream)
Change-Id: I2f9fd889fc924a3b080667bd2114f4632be461a0
2020-07-03 11:18:10 +08:00
winlin
b72cfd2405 Refine options 2020-06-30 09:53:47 +08:00
winlin
98924943a6 Build: Refine the options for configure 2020-06-24 17:03:56 +08:00
winlin
7c572dbae3 Merge branch 'feature/rtc' into develop 2020-06-24 13:46:12 +08:00
winlin
be5d76009e RTC: Support build without RTMP2RTC bridger, no FFmpeg fit. 2020-06-24 12:44:13 +08:00
winlin
1c72a89fca Merge branch 'feature/rtc' into develop 2020-06-23 18:58:37 +08:00
winlin
a822c841cb Merge branch '3.0release' into develop 2020-06-20 21:48:24 +08:00
winlin
ac69889b3a Link FFmpeg if exists 2020-06-20 21:48:04 +08:00
winlin
1343d4f605 RTC: Disable c++14 2020-06-11 18:16:48 +08:00
莫战
db8d91cbee add c++14 support 2020-06-11 18:15:45 +08:00
winlin
b694550456 Support c++ .h and .cc 2020-06-09 17:17:36 +08:00
winlin
6e04c66402 Support enable C++11. 4.0.29 2020-06-03 19:18:41 +08:00
winlin
0992eb4580 Remove unused files 2020-06-03 18:00:21 +08:00
winlin
812403a44d Remove srslibrtmp 2020-06-03 17:32:55 +08:00
winlin
70d51ffc5b Refine build script 2020-06-02 16:43:07 +08:00
winlin
95f656b46d Merge service to protocol 2020-06-02 15:02:59 +08:00
winlin
a78b6b8cda RTC: Remove --research 2020-05-29 17:02:10 +08:00
winlin
d43d9674a3 RTC: Remove --librtmp 2020-05-29 17:00:06 +08:00
winlin
a3388bf624 RTC: Remove export srs-librtmp support 2020-05-27 14:20:40 +08:00
winlin
01f05f920f RTC: Remove sendmmsg 2020-05-21 16:52:25 +08:00
忘篱
3f5ab8dc63 RTC: Add utest for srs_rtp_seq_distance 2020-05-17 00:03:14 +08:00
winlin
3a58d9859c RTC: Extract rtc server in app 2020-05-11 11:45:20 +08:00
winlin
db503975fb Disable simulator API by default. 2020-05-07 16:29:11 +08:00
winlin
f71b833520 Refine sendmmsg, move to ST 2020-05-03 11:32:54 +08:00
winlin
2a0562da5e Refine RTC, disable NASM, SENDMMSG, SRTP-NASM 2020-05-03 11:14:11 +08:00
winlin
ed338f4c0a Refactor macro SRS_AUTO_XXX to SRS_XXX. 2020-04-29 20:02:28 +08:00
winlin
5eba90ded9 Refine build script 2020-04-29 19:07:25 +08:00
winlin
0b62ca02b7 Merge develop 2020-04-27 14:01:33 +08:00
winlin
ded37c6719 Refine build script 2020-04-27 13:59:57 +08:00
winlin
028ef56772 Fix sendmmsg build failed bug 2020-04-26 22:41:03 +08:00
winlin
613baa561a Update script 2020-04-24 09:42:15 +08:00
winlin
38f7299a51 Remove double check for FFMPEG 2020-04-22 09:28:13 +08:00
winlin
f2b575e841 Merge branch 'feature/rtc' into develop 2020-04-21 14:04:27 +08:00
winlin
20896325ea Update script 2020-04-21 14:02:26 +08:00
winlin
72322836c6 Update demo for zerocopy 2020-04-20 20:25:23 +08:00
winlin
c96ffd272c Cache RTP packet vector 2020-04-15 21:59:27 +08:00
winlin
095e7c5a4e Fix build script 2020-04-15 10:36:39 +08:00
winlin
6e9e0d6ce3 Fix build script 2020-04-15 10:35:38 +08:00
winlin
a80084289b Support debug 2020-04-14 20:12:33 +08:00
winlin
b1438bf52c Merge branch 'develop' into feature/rtc 2020-04-13 19:51:35 +08:00
winlin
f072f30854 Merge branch '4.0release' into develop 2020-04-13 19:51:13 +08:00
winlin
bfe40f0115 Check pkg-config 2020-04-13 19:50:40 +08:00
winlin
40eb5c0ef5 For #307, disable vappi for FFmpeg-fit 2020-04-10 08:55:04 +08:00
winlin
8e0f83fdd2 Fix CentOS8 build failed 2020-04-07 20:22:18 +08:00
winlin
11bcd0cb27 Merge branch 'develop' into feature/rtc 2020-04-07 20:19:06 +08:00
winlin
737e4fce9f Merge branch '4.0release' into develop 2020-04-07 20:18:48 +08:00
winlin
61c7443c4b Merge from SRS3 2020-04-07 20:18:31 +08:00
winlin
c2657bf672 Use isolate cache for different SRS version. 2020-04-07 20:11:56 +08:00
winlin
fa635e3333 Refine sendmmsg detect script 2020-04-07 17:28:24 +08:00
winlin
bb0ca05390 Merge branch 'develop' into feature/rtc 2020-04-06 21:38:05 +08:00
winlin
9c1dfb79d3 Fix gperf build bug 2020-04-06 21:37:37 +08:00
winlin
b8db61bd9c For #307, Support disable sendmmsg 2020-04-05 22:13:49 +08:00
winlin
dc3df926eb For #307, support configure with sendmmsg. 2020-04-05 18:34:57 +08:00
winlin
10d5f99d3d For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22 2020-04-05 17:14:22 +08:00
winlin
3793404ceb Refine scripts 2020-04-04 20:24:24 +08:00
winlin
634fa27320 Refine configure cleanup script 2020-04-04 18:47:12 +08:00
winlin
654cde109d Fix options script bug 2020-04-04 17:10:45 +08:00
winlin
c5c0df6536 Update build script 2020-04-04 15:44:56 +08:00
winlin
5144794044 Detect older docker and disable SRTP ASM 2020-04-04 14:50:36 +08:00
winlin
f504cb2724 Refine build script 2020-04-03 22:46:04 +08:00
winlin
366d800720 For #307, use files of openssl 1.0.* 2020-04-03 21:59:32 +08:00
winlin
5e06a2568b For #370, support SRTP with ASM(enable openssl) by default 2020-04-03 14:37:48 +08:00
winlin
81bb8747f2 Refine script 2020-04-03 13:42:52 +08:00
winlin
bd05f69d0b Refine openssl build script on OSX 2020-04-03 13:42:24 +08:00
winlin
15384e61e2 Remove duplicated build for srtp2 2020-04-02 12:33:58 +08:00
winlin
302da32fc5 When configure, default to make clean 2020-04-02 11:41:36 +08:00
winlin
608f3d0fae For #1500, support push stream by GB28181. 4.0.18 2020-03-31 23:06:07 +08:00
winlin
f9f9cfda9b Refine cherrypy install script 2020-03-30 18:25:22 +08:00
winlin
60d810693c Refine rebuild components 2020-03-29 21:30:32 +08:00
winlin
056fcd2928 Refine clean script 2020-03-29 19:06:51 +08:00
winlin
40cc8ed47c Refine file path for st and ffmpeg 2020-03-29 18:44:01 +08:00
winlin
a60dbc167a Update macro 2020-03-29 18:01:46 +08:00
winlin
6935bb18ae Merge branch '4.0release' into develop 2020-03-29 17:36:33 +08:00
winlin
6b8f0d84a3 Merge branch '3.0release' into 4.0release 2020-03-29 17:31:41 +08:00
winlin
80f315f1ae Support utest on mac osx 2020-03-29 17:29:09 +08:00
winlin
22fbae139c Refine links use relative path 2020-03-29 17:15:29 +08:00
winlin
22ec783c3f Merge branch '3.0release' into 4.0release 2020-03-29 16:52:46 +08:00
winlin
1c65987472 Refine links use relative path 2020-03-29 16:51:56 +08:00
winlin
2ba8104b37 Update coverage script 2020-03-29 16:36:49 +08:00
winlin
b9a3df5c55 Update utest script 2020-03-29 16:18:20 +08:00
winlin
c0a8193537 Update build script 2020-03-29 15:23:40 +08:00
winlin
cc6a447332 Merge feature/rtc 2020-03-29 00:21:00 +08:00
winlin
32d818d69c Merge 4.0release 2020-03-29 00:16:37 +08:00
winlin
13ee53434e Merge branch '4.0release' into develop 2020-03-29 00:14:46 +08:00
winlin
3e0a7ee7fb Merge branch '3.0release' into 4.0release 2020-03-29 00:13:41 +08:00
winlin
98a71954da Support multiple OS/Platform build cache. 3.0.139 2020-03-29 00:09:17 +08:00
winlin
0fd75434a6 For #307, fast build openssl 2020-03-28 21:33:47 +08:00
winlin
dae7af8444 For #307, rtc support osx 2020-03-28 20:52:42 +08:00
winlin
f29db522c1 Merge branch '4.0release' into develop 2020-03-28 18:05:46 +08:00
winlin
9e8b88825b Merge branch '3.0release' into 4.0release 2020-03-28 18:05:19 +08:00
winlin
218fe332aa For #1250, support osx build 2020-03-28 18:04:34 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +08:00
winlin
41acc5033e For #307, support disable asm for FFMPEG 2020-03-22 19:26:26 +08:00
winlin
602a478e1b For #1659, #307, add switch to disable rtc 2020-03-22 18:17:05 +08:00
winlin
37c84eccc0 For #1659, #307, add x86 asm for ffmpeg for rtc 2020-03-22 17:14:07 +08:00
winlin
4308f238c0 For #1659, #307, add ffmpeg-4.2-fit for rtc 2020-03-22 16:34:54 +08:00
winlin
634a14bfa6 For #1659, #307, add opus codec library 2020-03-22 14:03:48 +08:00
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
850a4bbf20 Fix #1619, configure without utest by default. 3.0.136 2020-03-21 20:41:37 +08:00
xiaozhihong
936ba7583e modify depend.sh 2020-03-06 23:40:20 +08:00
xiaozhihong
9d5495c0c2 "stun and dtls done" 2020-03-06 23:01:48 +08:00
winlin
4e7e9809f3 Fix bash script bug for macOS, eventhough we don't support it. 2020-02-16 22:35:40 +08:00
winlin
d9bbd97d72 Allow use libsrt.so for SRT is MPL license. 2020-01-26 17:41:05 +08:00
winlin
07f4bc65c3 Merge branch '3.0release' into develop 2020-01-26 17:33:29 +08:00
winlin
01870cce56 Allow use libst.so for ST is MPL license. 2020-01-26 17:33:10 +08:00
winlin
5d0833fcc3 Add author runner365 2020-01-24 18:41:09 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
e3169a080b Refactor SRT build, use libsrt.a static library 2020-01-24 07:06:30 +08:00
winlin
f143757429 Use macro to disable SRT in code 2020-01-23 14:23:09 +08:00
winlin
fb29096505 For SRT, allow/default disable it by --without-srt 2020-01-23 14:22:22 +08:00
winlin
fb5928f927 Fix build failed for SRT with modules. 2020-01-23 13:24:47 +08:00