1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Commit graph

1828 commits

Author SHA1 Message Date
winlin
c3414a30dc RTC: Refine UDP packet peer fast id. 4.0.68 2021-02-10 15:57:25 +08:00
winlin
b0208029bb RTC: Reuse UDP socket to receive packet. 4.0.67 2021-02-10 15:55:35 +08:00
winlin
9ada516e98 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 2021-02-10 15:55:01 +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
5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 2021-01-31 18:06:46 +08:00
winlin
ed32965aa4 Revert "Fix #2142, Async release bridger when unpublish. 4.0.60"
This reverts commit 06adb9dc42.
2021-01-15 13:30:52 +08:00
winlin
06adb9dc42 Fix #2142, Async release bridger when unpublish. 4.0.60 2021-01-14 19:12:01 +08:00
winlin
10ffb2da36 HTML5 video tag resolution adaptive. 4.0.59 2021-01-08 14:16:20 +08:00
winlin
26dec1b037 Release 4.0.58
Merge #2109, Fix bugs for GB28181.
Merge #2109, Refine srs_string_split.
Fix memory leak and bugs for RTC.
2021-01-08 14:16:11 +08:00
winlin
1c41f5d796 Merge SRS3, change id of stat to string 2021-01-07 17:04:11 +08:00
winlin
fb7c051833 Change id from int to string for the statistics. 3.0.157 2021-01-07 16:47:49 +08:00
winlin
010878889c Release 3.0r3 2021-01-02 19:16:30 +08:00
winlin
2538b02a9b Merge branch '3.0release' into 4.0release 2020-12-26 22:15:37 +08:00
winlin
6e43ef6866 For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156 2020-12-26 22:11:23 +08:00
winlin
18d049accc Support disable CherryPy. 4.0.57 2020-12-24 11:33:49 +08:00
winlin
c17474627b Merge SRS3 2020-12-18 09:34:32 +08:00
winlin
25c76c1e8a Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155 2020-12-17 18:43:45 +08:00
winlin
c97e943b07 Merge SRS3 2020-12-17 12:27:47 +08:00
winlin
ab5ddd24e2 Fix #1548, Add edts in MP4 for Windows10. 3.0.154 2020-12-17 12:07:34 +08:00
winlin
4650d47082 For #1998, Support Firefox, use PT in offer. 4.0.55 2020-11-12 18:38:30 +08:00
winlin
9908433bc8 For #1508, Transform http header name to upper camel case. 4.0.54 2020-11-11 16:38:05 +08:00
winlin
cb4c668249 Merge SRS3 2020-11-10 10:20:55 +08:00
winlin
6e922b9589 Refine README for SRS3 2020-11-10 10:19:43 +08:00
winlin
c5be7ce8f4 For #1657, Update readme 2020-11-06 19:23:17 +08:00
winlin
a20f02ffe1 For #1657, Read cached data first in SSL. 4.0.48 2020-11-06 19:14:04 +08:00
winlin
a49b2d7b0e For #1657, Support HTTPS Callback, HTTPS API, HTTPS FLV, etc. 4.0.47 2020-11-06 17:35:54 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
d98a85b368 Release 3.0-r2, 3.0.153 2020-10-31 22:16:46 +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
71c9732bff Support gdb/srs.py to stat coroutines. 4.0.44 2020-10-31 19:30:56 +08:00
winlin
8c1eca98b0 Merge SRS3.0 2020-10-31 19:25:56 +08:00
winlin
b348539687 Remove some global elements for debugging. 3.0.152 2020-10-31 17:53:00 +08:00
winlin
07ecc25071 Merge branch '3.0release' into 4.0release 2020-10-25 13:49:03 +08:00
winlin
7b68330651 Add hls.realtime.conf for low-latency HLS. 3.0.149 2020-10-25 11:44:02 +08:00
winlin
adadbb7e9c Merge branch '3.0release' into 4.0release 2020-10-24 18:29:12 +08:00
winlin
8445d5543b Refine script and startup logs. 3.0.148 2020-10-24 18:28:53 +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
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
2d11e5f2d7 Update wiki 2020-10-23 20:57:41 +08:00
winlin
4ff8a055c5 Update conf to follow wiki 2020-10-23 20:54:36 +08:00
winlin
cc6b71e1ae Update conf to follow wiki 2020-10-23 20:50:56 +08:00
winlin
07ea733901 Merge branch 'develop' into feature/rtc 2020-10-14 11:40:01 +08:00
winlin
bce55d2789 Merge branch '4.0release' into develop 2020-10-14 11:39:45 +08:00
winlin
913d920ec5 Merge branch '3.0release' into 4.0release 2020-10-14 11:39:26 +08:00
winlin
3f3a23f978 Fix #1987, Fix Kbps resample bug. 3.0.145 2020-10-14 11:38:54 +08:00
winlin
b602aef56f Merge branch 'develop' into feature/rtc 2020-10-10 17:56:05 +08:00
winlin
39dc118c00 Merge branch '4.0release' into develop 2020-10-10 17:55:48 +08:00
winlin
20293e7e5d Merge 3.0release 2020-10-10 17:54:34 +08:00
winlin
3809d43ee5 Release 3.0r1, 3.0.144 2020-10-10 16:50:19 +08:00
winlin
5342596fc0 Update README for #1780 2020-10-10 16:47:25 +08:00
winlin
253aa23fb1 RTC: Extract resource manager. Use any UDP packet to keep alive. 4.0.43 2020-09-19 11:06:06 +08:00
winlin
783029778c Merge branch 'develop' into feature/rtc 2020-09-14 20:55:30 +08:00
winlin
eea36bc261 Merge branch '4.0release' into develop 2020-09-14 20:52:45 +08:00
winlin
991ef94535 Merge branch '3.0release' into 4.0release 2020-09-14 20:52:11 +08:00
winlin
905444a1c7 For #1684, Prevent stop ingest for multiple times. 3.0.143 2020-09-14 20:48:44 +08:00
winlin
697f7d5251 Merge branch 'develop' into feature/rtc 2020-09-10 19:39:25 +08:00
winlin
8b279a9ac4 Merge branch '4.0release' into develop 2020-09-10 19:38:02 +08:00
winlin
0cadbca52f Merge SRS3 2020-09-10 19:36:55 +08:00
winlin
63b5c51748 RTC: Change SO_REUSEPORT fail to warning. 3.0.142 2020-09-10 19:35:04 +08:00
winlin
c708103cd4 RTC: Refine NACK RTT and efficiency. 4.0.42 2020-09-09 15:42:02 +08:00
winlin
3026f2fda8 Refine PLI/NACK/DTLS logs. 4.0.41 2020-09-08 13:37:23 +08:00
winlin
e4ea2be008 Fix serval bugs for RTC. Refine context API. 4.0.40 2020-08-30 12:26:42 +08:00
winlin
1da97b7cde Merge branch 'develop' into feature/rtc 2020-08-24 13:11:32 +08:00
winlin
8609bcf344 Merge branch '3.0release' into 4.0release 2020-08-24 13:10:17 +08:00
winlin
18192f7efb Update SRS to Simple-Realtime-Server 2020-08-24 13:08:21 +08:00
winlin
a3e912f5dc RTC: DTLS support ARQ, covered with utest. 4.0.39 2020-08-18 20:24:49 +08:00
winlin
994c53b6c1 Merge branch '4.0release' into develop 2020-08-06 12:08:46 +08:00
winlin
bbfe457335 Update README 2020-08-06 12:07:03 +08:00
winlin
9530ea73e3 RTC: Refine error check. 4.0.37 2020-08-06 11:15:28 +08:00
winlin
21835c38b7 RTC: Support multiple address for client. 4.0.36 2020-07-25 09:33:18 +08:00
winlin
70c3fc78af Refine log context with random string. 4.0.35 2020-07-11 22:24:17 +08:00
winlin
d453c6c22e Fix some bugs for RTC. 4.0.34 2020-07-03 09:24:13 +08:00
winlin
4146346243 Merge #1830 to fix bugs in GB28181. 4.0.33 2020-07-03 09:20:02 +08:00
winlin
f514dd78c1 Merge branch '4.0release' into develop 2020-06-28 10:28:39 +08:00
winlin
78e28dcfde Merge branch '3.0release' into 4.0release 2020-06-28 10:28:14 +08:00
winlin
e3f1aee6c1 Release 3.0 r0, 3.0.141 2020-06-27 11:47:36 +08:00
winlin
7c572dbae3 Merge branch 'feature/rtc' into develop 2020-06-24 13:46:12 +08:00
winlin
6314c273ff Support static link c++ libraries. 4.0.32 2020-06-24 13:36:18 +08:00
winlin
677a006709 Update README 2020-06-24 11:45:07 +08:00
winlin
a18cda91b3 Merge branch '4.0release' into develop 2020-06-24 11:40:07 +08:00
winlin
14afe78662 Merge branch '3.0release' into 4.0release 2020-06-24 11:39:17 +08:00
winlin
024df5bdbf Refine README 2020-06-24 11:38:48 +08:00
winlin
5d286776a5 Fix README link 2020-06-24 11:37:25 +08:00
winlin
ab6bc39676 Change log cid from int to string. 4.0.31 2020-06-23 18:35:59 +08:00
winlin
2c1bd6da3e Merge SRS 2020-06-14 12:35:03 +08:00
winlin
e75f28a327 GB28181 with JitterBuffer support. 4.0.29 2020-06-13 13:17:23 +08:00
winlin
6e04c66402 Support enable C++11. 4.0.29 2020-06-03 19:18:41 +08:00
winlin
95f656b46d Merge service to protocol 2020-06-02 15:02:59 +08:00
winlin
f83276c457 Remove srs-librtmp. 2020-05-31 10:56:36 +08:00
winlin
471bb0914f RTC: disable GSO and sendmmsg. 4.0.27 2020-05-21 19:03:50 +08:00
winlin
3cb797dccd For #307, refine core structure, RTMP base on frame, RTC base on RTP. 4.0.26 2020-05-14 10:47:21 +08:00
winlin
d0d8f676c3 For #307, refine RTC publisher structure. 4.0.25 2020-05-11 13:51:50 +08:00
winlin
5ee5ef6ab2 For #307, support publish RTC with passing opus. 4.0.24 2020-04-30 10:57:03 +08:00
winlin
ee812290c7 Update usage in README for RTC and GB28181 2020-04-22 17:38:19 +08:00
winlin
7574dbefb1 For #307, support sendmmsg, GSO and reuseport. 4.0.23 2020-04-14 14:02:54 +08:00
winlin
1a7c98b5fc Refine README 2020-04-09 15:20:32 +08:00
winlin
61c7443c4b Merge from SRS3 2020-04-07 20:18:31 +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
9943565ec9 Merge RTC and GB28181, with bugs fixed. 4.0.21 2020-04-04 22:45:16 +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
5ad58933a9 For #307, build SRTP with openssl to improve performance. 4.0.19 2020-04-03 21:14:06 +08:00
winlin
608f3d0fae For #1500, support push stream by GB28181. 4.0.18 2020-03-31 23:06:07 +08:00
winlin
c7113f27e0 Play stream by WebRTC on iOS/Android/PC browser. 4.0.17 2020-03-31 09:35:36 +08:00
winlin
57604a9c65 For #1672, fix dvr close file failed bug. 3.0.140 2020-03-30 10:44:11 +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
f674cab84f Release 3.0-b4, 3.0.139 2020-03-29 14:00: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
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
04c3370458 Merge branch 'develop' into feature/rtc 2020-03-28 18:06:40 +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
ccd170a813 Update readme for RTC 2020-03-24 13:54:23 +08:00
winlin
b3b76b0ca6 Update readme 2020-03-24 13:17:05 +08:00
winlin
b12f0e8c8b Update readme 2020-03-24 13:12:00 +08:00
winlin
2b6da30ac6 Welcome maintainers Runner365, John, B.P.Y(Bepartofyou). 4.0.15 2020-03-22 21:22:15 +08:00
winlin
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +08:00
winlin
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +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
winlin
850a4bbf20 Fix #1619, configure without utest by default. 3.0.136 2020-03-21 20:41:37 +08:00
winlin
f89b4b3b26 For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135 2020-03-21 20:20:40 +08:00
winlin
955de3dac9 Merge branch '3.0release' into 4.0release 2020-03-21 19:36:16 +08:00
winlin
75f62dc653 Update mirror 2020-03-21 16:34:18 +08:00
winlin
5a55cff7ba Update mirror 2020-03-21 16:30:29 +08:00
winlin
881506883e Update 2020-03-20 15:16:30 +08:00
winlin
737e4bc32d Update 2020-03-19 17:57:23 +08:00
winlin
83f743645b Release multiple processes for SRS by reuseport 2020-03-19 17:49:37 +08:00
winlin
aead1a5b74 Release 3.0.134, 3.0-b3 2020-03-18 16:33:08 +08:00
winlin
a135eb2144 Merge SRS3 2020-03-14 14:39:11 +08:00
winlin
88336b1f5e Remove KAFKA config, because it's removed from code 2020-03-14 14:38:26 +08:00
winlin
70307ed8f9 Update README 2020-03-14 14:35:57 +08:00
winlin
446e5f9a0c Update README 2020-03-14 14:34:20 +08:00
winlin
fc3704e54e Update README 2020-03-14 14:32:49 +08:00
winlin
aa20a04abb For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 2020-03-13 16:56:00 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
856ed5a971 For #1635, inotify watch ConfigMap for reload. 3.0.134 2020-03-12 22:26:34 +08:00
winlin
940798a9c7 For #1635, inotify watch ConfigMap for reload. 3.0.131 2020-03-12 21:45:10 +08:00
winlin
5e60c8f9cc For #1635, inotify watch ConfigMap for reload. 3.0.130 2020-03-12 19:37:31 +08:00
winlin
9b663c070a Fix #1635, support auto reaload config by inotify. 3.0.129 2020-03-12 18:14:23 +08:00
winlin
b33751e2c1 Merge SRS3 2020-03-12 12:18:15 +08:00
winlin
4b395f6e16 Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128 2020-03-12 11:55:37 +08:00