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

4246 commits

Author SHA1 Message Date
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
winlin
c7113f27e0 Play stream by WebRTC on iOS/Android/PC browser. 4.0.17 2020-03-31 09:35:36 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
winlin
03289012fd Refactor code for RTC 2020-03-30 21:21:31 +08:00
winlin
e65b6283df Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-03-30 20:46:15 +08:00
winlin
f9f9cfda9b Refine cherrypy install script 2020-03-30 18:25:22 +08:00
xiaozhihong
9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 2020-03-30 15:16:44 +08:00
xiaozhihong
49da2099c1 sdp exchange. 2020-03-30 15:16:29 +08:00
winlin
f3d708c2b5 Fix utest build warnings 2020-03-30 12:46:53 +08:00
winlin
57604a9c65 For #1672, fix dvr close file failed bug. 3.0.140 2020-03-30 10:44:11 +08:00
xfalcon
cd1513d6a3
fix fs not close,when dvr error (#1672) 2020-03-30 10:37:16 +08:00
winlin
bf297fd070 Refine make help 2020-03-29 21:36:41 +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
3b8450d4bd Support cleanup componets 2020-03-29 17:54:27 +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
f8b0bc122b Update build script 2020-03-29 15:48:57 +08:00
winlin
0081525380 Update package script 2020-03-29 15:29:07 +08:00
winlin
c0a8193537 Update build script 2020-03-29 15:23:40 +08:00
winlin
d5339acc57 Update package script 2020-03-29 14:12:37 +08:00
winlin
84652265d9 Update README 2020-03-29 00:23:16 +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
c1e124786c For #307, fix build warnings for rtc 2020-03-28 20:57:03 +08:00
winlin
dae7af8444 For #307, rtc support osx 2020-03-28 20:52:42 +08:00
winlin
04c3370458 Merge branch 'develop' into feature/rtc 2020-03-28 18:06:40 +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
0a030a4ade Update 2020-03-28 17:42:26 +08:00
winlin
3556da40ce Fix #1250, Support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138 2020-03-28 17:23:11 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
90a39ec46d Add api to stat mw iovec 2020-03-27 13:37:39 +08:00
winlin
0d060a1cec For #1659, #307, support aliyun slb UDP health check 2020-03-24 12:12:41 +08:00
winlin
57c23d93c1 Refactor url for rtc player 2020-03-23 13:36:17 +08:00
winlin
4c63319b5d Release rtc_player to ossrs.net 2020-03-23 10:36:15 +08:00
winlin
8a7f35dc6d Release rtc_player to ossrs.net 2020-03-22 22:52:51 +08:00
winlin
6edca6147c Release rtc_player to ossrs.net 2020-03-22 22:51:09 +08:00
winlin
f8b4ba1e5a Release rtc_player to ossrs.net 2020-03-22 22:48:51 +08:00
winlin
98d372bd40 Release rtc_player to ossrs.net 2020-03-22 21:54:18 +08:00
winlin
2b6da30ac6 Welcome maintainers Runner365, John, B.P.Y(Bepartofyou). 4.0.15 2020-03-22 21:22:15 +08:00
bepartofyou
923209b070 Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 2020-03-22 20:16:24 +08:00
bepartofyou
8332a2fbdb ffmpeg ubuntu build files 2020-03-22 20:15:23 +08:00
bepartofyou
766da5188b Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 2020-03-22 19:55:29 +08:00
winlin
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +08:00
bepartofyou
4a17259471 err wrap change to new 2020-03-22 19:36:11 +08:00
winlin
41acc5033e For #307, support disable asm for FFMPEG 2020-03-22 19:26:26 +08:00
winlin
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +08:00
winlin
c00ffa530b Merge branch 'feature/codec' into feature/rtc 2020-03-22 18:42:49 +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
xiaozhihong
734e848741 Update RtcSession peer address when changed. 2020-03-22 16:54:31 +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
2da4e0a43e For #1638, #307, config to discard aac for rtc 2020-03-22 08:28:51 +08:00
winlin
e1fe2d1c1d For #1638, #307, add comments for audio codec 2020-03-22 07:18:25 +08:00
七曦
f09dda85fc Exception handle 2020-03-21 23:27:28 +08:00
winlin
2757ec7973 Merge from bepartofyou 2020-03-21 23:09:57 +08:00
winlin
0cd67a997e For #1638, #307, add comments for vhost rtc config 2020-03-21 22:52:59 +08:00
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
0dd6c31487 Fix #1629, fix kickoff FLV client bug. 3.0.137 2020-03-21 22:41:25 +08:00