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

1819 commits

Author SHA1 Message Date
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
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
winlin
c1e07d6a96 For #1634, always check status in thread loop. 3.0.126 2020-03-12 08:59:13 +08:00
winlin
6a765ab849 Merge SRS3 2020-03-11 19:45:01 +08:00
winlin
c61c2a939f For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 2020-03-11 19:33:55 +08:00
winlin
0290009b4e Refine readme 2020-03-11 19:27:26 +08:00
winlin
927c0c8e39 For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124 2020-03-11 19:04:52 +08:00
winlin
dcb0553cc8 For #1612, fix crash bug for RTSP. 4.0.12 2020-03-07 22:35:11 +08:00
winlin
41acf9ca8e For #1631, support sei_filter for SRT. 4.0.11 2020-03-07 22:25:19 +08:00
winlin
d5bbf84439 Release 3.0b2, 3.0.123 2020-03-05 11:34:16 +08:00
winlin
72155fc645 For #1621, support mix_correct for aggregate aac for SRT. 4.0.10 2020-03-01 10:34:33 +08:00
winlin
1b9a705e4b For #1621, support mix_correct for aggregate aac packets. 4.0.10 2020-03-01 10:17:03 +08:00
winlin
90afd06c85 For #1615, support default app(live) for vmix SRT. 4.0.9 2020-02-25 13:22:44 +08:00
winlin
67d78dff0e For #1598, support SLB health checking by TCP. 4.0.8 2020-02-21 23:56:40 +08:00
winlin
ef2b123325 Merge branch '3.0release' into 4.0release 2020-02-21 23:52:04 +08:00
winlin
20b9d6ab02 For #1598, support SLB health checking by TCP. 3.0.123 2020-02-21 23:51:40 +08:00
winlin
4a69499f2c Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122 2020-02-21 23:11:09 +08:00
winlin
1d01ef499d For #1579, support rolling update of k8s. 4.0.7 2020-02-20 01:06:33 +08:00
winlin
ad3cfbfd2c For #1579, support start/final wait for gracefully quit. 4.0.6 2020-02-18 23:39:40 +08:00
winlin
388ad61cdc Merge branch '3.0release' into 4.0release 2020-02-18 23:38:52 +08:00
winlin
dc0f804452 For #1579, support start/final wait for gracefully quit. 3.0.121 2020-02-18 23:37:11 +08:00
winlin
d87f58a611 For #1579, support gracefully quit and force to. 4.0.5 2020-02-18 22:16:28 +08:00
winlin
0c48c42f36 Merge branch '3.0release' into 4.0release 2020-02-18 22:15:29 +08:00
winlin
58b40478b6 For #1579, support force gracefully quit. 3.0.120 2020-02-18 22:15:12 +08:00
winlin
eefd74e0e4 Merge branch '3.0release' into develop 2020-02-18 20:25:07 +08:00
winlin
3c597545b1 For #1579, support gracefully quit. 3.0.119 2020-02-18 19:59:47 +08:00
winlin
5be69d290f For #1601, flush async on_dvr/on_hls events before stop. 3.0.118 2020-02-17 11:53:04 +08:00
winlin
bf45d8e23b Merge branch '3.0release' into develop 2020-02-16 14:11:42 +08:00
winlin
304b92cc36 Update maintainers 2020-02-16 13:41:47 +08:00
winlin
8079564077 Update maintainers 2020-02-16 13:39:25 +08:00
winlin
0723b36f0e Merge branch '3.0release' into develop 2020-02-16 13:31:54 +08:00
winlin
1604fcf35a Update authors 2020-02-16 13:31:03 +08:00
winlin
16173194b9 Release 3.0-beta1, r3.0b1, 3.0.117 2020-02-14 23:05:54 +08:00
winlin
131acf5bb0 For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117 2020-02-14 23:04:01 +08:00
winlin
8b7fbac7d4 SRT supports detail config for DynamicConfig. 4.0.4 2020-02-13 12:17:09 +08:00
winlin
bdc7973596 Merge branch '3.0release' into develop 2020-02-05 14:18:07 +08:00
winlin
fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 2020-02-05 14:17:30 +08:00
winlin
c6d914bc13 Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115 2020-02-05 13:04:00 +08:00
winlin
823b4fa56f Merge branch '3.0release' into develop 2020-02-04 19:34:09 +08:00
winlin
c51c378869 For #1186, refactor security check. 3.0.114 2020-02-04 19:07:54 +08:00
winlin
3023dc7b40 Update project code. 4.0.3 2020-02-04 17:11:22 +08:00
winlin
59439cf8b5 Merge branch '3.0release' into develop 2020-02-04 17:05:19 +08:00
winlin
4f39303f37 Fix #939, response right A/V flag in FLV header. 3.0.113 2020-02-04 17:02:02 +08:00
winlin
a2a6ca8258 For #939, always enable fast FLV streaming. 2020-02-04 16:13:48 +08:00
winlin
0621cd8c34 Merge branch '3.0release' into develop 2020-02-02 12:53:21 +08:00
winlin
d57c85827c Release 3.0-b0, 3.0.112 2020-02-02 11:15:08 +08:00
winlin
fb555b4d8f Merge branch '3.0release' into develop 2020-01-29 20:31:05 +08:00
winlin
c9a2e19b2f Support isolate version file. 3.0.112 2020-01-29 20:30:58 +08:00
winlin
77114c7df0 Merge SRS3 2020-01-29 20:30:06 +08:00
winlin
23ece94064 Fix #1206, dispose ingester while server quiting. 3.0.111 2020-01-29 20:22:28 +08:00
winlin
f18cc89860 Update version 2020-01-28 21:50:08 +08:00
winlin
31db28b70d Update version 2020-01-28 21:48:53 +08:00
winlin
7c3b3608c0 Update version 2020-01-28 21:46:19 +08:00
winlin
6a514732b5 Update version 2020-01-28 21:45:05 +08:00
winlin
afc0faf738 Use multiple revisions. 3.0.111 2020-01-28 21:42:48 +08:00
winlin
6ed6ce58e4 Merge SRS3 2020-01-28 21:37:37 +08:00
winlin
adf7ef4511 Fix #1230, racing condition in source fetch or create. 3.0.110 2020-01-28 21:35:06 +08:00
winlin
b605edb9b3 Merge 3.0 2020-01-27 19:52:41 +08:00
winlin
5d365bade8 Fix #1303, do not dispatch previous meta when not publishing. 3.0.109 2020-01-27 19:46:08 +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
88c9c13707 Update readme for SRT 2020-01-26 14:17:42 +08:00
winlin
7460729c0e Update readme 2020-01-26 14:16:50 +08:00
winlin
4b1108c821 How to speedup clone 2020-01-26 14:14:29 +08:00
winlin
fe78c75b0f Fix #607, set RTMP identifying recursive depth to 3. 2020-01-26 09:25:44 +08:00
winlin
2775a391e0 Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108 2020-01-25 20:03:22 +08:00
winlin
74154cdfd9 Fix #703, drop video data util sps/pps. 3.0.107 2020-01-25 18:05:18 +08:00
winlin
bbc7023f85 Merge SRS3 2020-01-25 15:05:52 +08:00
winlin
978d5e993b Fix #1108, reap DVR tmp file when unpublish. 3.0.106 2020-01-25 15:04:34 +08:00
winlin
a1ca3774a4 Merge SRS2 2020-01-25 13:08:53 +08:00
winlin
6864e1ca6d Release 2.0r8, 2.0.272 2020-01-25 12:56:01 +08:00
winlin
fddfbdde5f Fix #1147, support SRT(Secure Reliable Transport). 4.0.1 2020-01-24 16:16:16 +08:00
winlin
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
db1e06d3c9 Update README 2020-01-24 16:03:32 +08:00
winlin
db5788b205 Update README for SRT 2020-01-23 20:47:32 +08:00
winlin
33c6bf1f8f Refactor SRT, using reverse dependency, SRT depends on APP. 2020-01-23 19:40:40 +08:00
winlin
d88d422794 Update doc for SRT. 2020-01-23 16:49:05 +08:00
winlin
abac04af6f Start developing SRS4(Leo) 2020-01-23 09:07:04 +08:00
winlin
1b68b39d97 Merge branch '3.0release' into develop 2020-01-21 16:15:12 +08:00
winlin
6107db91f5 Release 3.0 alpha9, 3.0a9, 3.0.105 2020-01-21 16:14:15 +08:00
winlin
ba61fe8bc5 Fix #1221, remove complex configure options. 3.0.104 2020-01-21 15:22:55 +08:00
winlin
0df108740a Fix #1547, support crossbuild for ARM/MIPS. 2020-01-21 13:59:43 +08:00
winlin
6af8e38017 For #1547, support setting cc/cxx/ar tools. 3.0.103 2020-01-21 10:28:25 +08:00
l
86d04a70ed Fix #1580, fix cid range problem. 3.0.102 2020-01-19 18:21:28 +08:00
winlin
3900179685 For #307, #1070, define FLV CodecID for AV1 and Opus. 3.0.101 2020-01-19 11:22:35 +08:00
winlin
bdd0b1f7a2 SRS is a live streaming cluster, high efficiency, stable and simple. SRS是一个流媒体直播集群,高效、稳定、易用,简单而快乐。 2020-01-18 19:54:26 +08:00
winlin
4a5a2db69d Merge branch '3.0release' into develop 2020-01-16 14:37:44 +08:00
winlin
fea293d0b1 Fix #1042, improve test coverage for core/kernel/protocol/service. 2020-01-16 14:37:30 +08:00
winlin
11c2ca3b0a word the cr comment 2020-01-16 14:33:48 +08:00
winlin
0e750ab3eb For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100 2020-01-16 14:28:05 +08:00
winlin
7240fe3040 For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99 2020-01-15 21:26:02 +08:00
winlin
857c783efc For #1509, release coroutine when source is idle. 3.0.98 2020-01-15 19:51:33 +08:00
winlin
1f493cc037 Release 3.0 alpha8, 3.0.97 2020-01-10 18:20:37 +08:00
winlin
98df29c6fb For #1042, improve test coverage for service. 3.0.97 2020-01-10 11:36:38 +08:00
winlin
6c1067d56a Merge from 2.0 2020-01-09 10:20:49 +08:00
winlin
dd46a4f700 Fix #1554, support logrotate copytruncate. 2.0.272 2020-01-09 10:03:17 +08:00
winlin
c08b6f1961 Merge 2.0, support logrotate copytruncate. 3.0.96 2020-01-08 18:05:42 +08:00
winlin
731e87876e Fix #1554, support logrotate copytruncate. 2.0.271 2020-01-08 17:57:04 +08:00
winlin
048742f468 Merge branch '3.0release' into develop 2020-01-05 22:19:56 +08:00
winlin
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +08:00
winlin
b794c9e4ec For #460, fix ipv6 hostport parsing bug. 3.0.94 2020-01-05 22:16:21 +08:00
winlin
76d92792b7 For #460, fix ipv6 intranet address filter bug. 3.0.93 2020-01-05 21:25:51 +08:00
winlin
bc6c61e546 Fix #1543, use getpeername to retrieve client ip. 3.0.92 2020-01-05 20:06:25 +08:00
winlin
e13a0c3ab4 Merge branch '3.0release' into develop 2020-01-05 17:15:29 +08:00
winlin
6d0ac35db9 Merge 2.0release #1551 2020-01-05 14:43:46 +08:00
winlin
b5f4b96060 Merge #1551, fix memory leak in RTSP stack. 2.0.270 2020-01-05 14:41:31 +08:00
winlin
646eeb05e9 For #1042, improve test coverage for config. 3.0.91 2020-01-02 11:18:45 +08:00
winlin
9c0875ceb5 Merge branch '3.0release' into develop 2019-12-30 20:51:40 +08:00
winlin
b63f2f283d Fix mp4 security issue, check buffer when required size is variable. 2019-12-30 14:34:23 +08:00