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

5433 commits

Author SHA1 Message Date
winlin
b23525033b Merge branch 'develop' into feature/rtc 2020-04-05 17:21:07 +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
133e3ce075 For #307, use sendmmsg in rtc server 2020-04-05 16:53:08 +08:00
winlin
737dcdd2c8 Merge branch 'develop' into feature/rtc 2020-04-04 22:48:33 +08:00
winlin
9943565ec9 Merge RTC and GB28181, with bugs fixed. 4.0.21 2020-04-04 22:45:16 +08:00
winlin
fbdec8a760 Merge branch 'develop' into 4.0release 2020-04-04 22:43:53 +08:00
winlin
55a4052d90 For #307, support sendmmsg to improve RTC performance 2020-04-04 22:43:44 +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
573449f1b0 For #307, refine RTC latency from 600ms to 200ms. 4.0.20 2020-04-04 15:36:35 +08:00
winlin
5144794044 Detect older docker and disable SRTP ASM 2020-04-04 14:50:36 +08:00
winlin
c666933cd2 Fix circleci script 2020-04-03 23:02:52 +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
5ad58933a9 For #307, build SRTP with openssl to improve performance. 4.0.19 2020-04-03 21:14:06 +08:00
winlin
0ff3ce7464 Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-04-03 15:17:13 +08:00
winlin
9e7e80f5f5 Add TODO comment for Cert 2020-04-03 15:08:52 +08:00
winlin
8c42ad622b Config to use RSA or ECDSA 2020-04-03 15:05:04 +08:00
winlin
c70a0eb07c Config to use RSA or ECDSA 2020-04-03 15:03:09 +08:00
winlin
5e06a2568b For #370, support SRTP with ASM(enable openssl) by default 2020-04-03 14:37:48 +08:00
winlin
cdb20c79cc Revert part of 01d5e4da, to keep both openssl 1.0 and 1.1, because SRTP depends on 1.0 2020-04-03 14:03:57 +08:00
winlin
862c211acd Support openssl 1.0 and 1.1, RSA and ECDSA 2020-04-03 13:43:13 +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
9ad5a5d9b6 RTC support openssl 1.0.* 2020-04-03 13:41:45 +08:00
winlin
f853c7a1e0 Support start SRS when wireshark capturing 2020-04-03 13:40:34 +08:00
xiaozhihong
3cf03393c0 format a=candidate line 2020-04-02 21:31:22 +08:00
xiaozhihong
d6adb5cd8d process USE-CANDIDATE/ICE-CONTROLLING/ICE-CONTROLLED atrribute in STUN 2020-04-02 21:31:06 +08:00
winlin
15384e61e2 Remove duplicated build for srtp2 2020-04-02 12:33:58 +08:00
winlin
8de89f3f37 Add TODO for SRTP-GCM for RTC 2020-04-02 12:28:47 +08:00
winlin
51bae42560 For RTC, verify peer and accept all certificate. 2020-04-02 11:41:57 +08:00
winlin
302da32fc5 When configure, default to make clean 2020-04-02 11:41:36 +08:00
xiaozhihong
bfd8971db8 fix compile warning. 2020-04-01 14:56:31 +08:00
xiaozhihong
4f671b1de2 Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-01 14:39:05 +08:00
xiaozhihong
14421a7f0b add annotation about some sdp line 2020-04-01 14:38:00 +08:00
xiaozhihong
f4067bcb4d fix nack bug 2020-04-01 14:37:14 +08:00
winlin
608f3d0fae For #1500, support push stream by GB28181. 4.0.18 2020-03-31 23:06:07 +08:00
winlin
d81cde695d Refactor code 2020-03-31 22:48:38 +08:00
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +08:00
winlin
6012ac4eb0 Refine code 2020-03-31 22:30:57 +08:00
winlin
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
winlin
df6274daf8 Merge branch 'feature/rtc' into develop 2020-03-31 18:19:15 +08:00
winlin
4ac8991a8e Update author to runner365 for SRT 2020-03-31 18:10:44 +08:00
winlin
74ad7143e7 Change authro to Bepartofyou for RTC codec 2020-03-31 18:05:32 +08:00
winlin
45db63249d Update author to John for RTC 2020-03-31 18:03:04 +08:00
winlin
6022ac5cdb Add comments for RTC candidate. 2020-03-31 17:33:04 +08:00
winlin
ecf0f012b5 Add comments for RTC candidate. 2020-03-31 17:26:32 +08:00