external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
5047 commits 13 branches 107 tags 375 MiB
Commit graph

1511 commits

Author SHA1 Message Date
winlin
ad70589347 For #1229, fix the security risk in HDS. 3.0.69 2019-12-11 11:31:32 +08:00
winlin
35e0ec27ed The official website https://ossrs.net recovered 2019-12-11 07:39:50 +08:00
winlin
1c227f4f8a Refine logger for hls_dts_directly 2019-12-10 15:59:15 +08:00
winlin
b4870a6d6f Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68 2019-12-05 20:47:23 +08:00
winlin
341d1e9aab Merge 3.0release 2019-12-03 18:28:20 +08:00
winlin
3fd0639fe3 Update readme with statistics 2019-12-03 18:23:10 +08:00
winlin
19a4cc46c8 Update readme with statistics 2019-12-03 18:22:48 +08:00
winlin
e3488378a4 Refine the readme, remove download site, recommend use docker 2019-12-02 18:41:17 +08:00
winlin
1df1485d34 Update readme about run SRS in docker. 2019-12-02 18:06:02 +08:00
winlin
ef1f6c189e Fix the link problem 2019-12-02 16:33:49 +08:00
winlin
cedf2a603d Update 2019-12-02 15:01:25 +08:00
winlin
67af179352 Release v3.0-a3, 3.0.67 2019-12-01 19:30:08 +08:00
winlin
5a3fd1e68a Release v3.0-a2, 3.0.67 2019-12-01 19:24:17 +08:00
winlin
75fd041279 Release v3.0-a2 2019-11-30 19:16:12 +08:00
winlin
517974d451 Refine redirect flow for origin cluster 2019-11-30 19:06:41 +08:00
winlin
e5285ecabf Fix #1501, use request ip for origin cluster. 3.0.66 2019-11-30 18:50:24 +08:00
winlin
488f16f60c Random tid for docker. 3.0.65 2019-11-30 17:34:25 +08:00
winlin
4cd03a7c06 Refine debug info for edge. 3.0.64 2019-11-30 17:31:27 +08:00
winlin
fa621433b5 Merge SRS2 2019-11-29 19:21:53 +08:00
winlin
d695cd958f Release r2.0-r7 2019-11-29 18:28:19 +08:00
winlin
a5b01fc6be Release r2.0-r7 2019-11-29 18:27:59 +08:00
winlin
1c943f27c9 Release 2.0.265, r2.0-r7 2019-11-29 18:26:40 +08:00
winlin
f1c42f7ee0 Change docker centos to dev 2019-11-29 12:33:09 +08:00
winlin
a74a586e3c Merge branch '3.0release' into develop 2019-10-28 08:50:32 +08:00
winlin
1583f6cc3f Cover protocol stack RTMP. 3.0.63 2019-10-25 08:18:21 +08:00
winlin
a147d6e41e Merge 3.0release 2019-10-22 08:36:39 +08:00
winlin
dccf814794 Use http://ossrs.net:8000 as homepage. 2019-10-13 08:51:36 +08:00
winlin
f24d82fada Cover AMF0 codec. 3.0.61 2019-10-10 08:49:57 +08:00
winlin
20e2cd1199 Update readme 2019-10-10 08:06:09 +08:00
winlin
a76a36a237 Merge branch '3.0release' into develop 2019-10-07 20:26:35 +08:00
winlin
2579c5fc9e Release 3.0a1, 3.0.60 2019-10-07 20:24:28 +08:00
winlin
c848050bb6 Merge branch '3.0release' into develop 2019-10-07 17:54:37 +08:00
winlin
8ca7f7e5a4 Support log rotate by init.d command. 3.0.60 2019-10-07 17:44:25 +08:00
winlin
e045b0a619 We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59 2019-10-07 10:34:55 +08:00
winlin
64288d1f1e Support systemctl service for CentOS7. 3.0.58 2019-10-05 20:33:26 +08:00
winlin
d42f0d8ffb Remove skype 2019-10-04 20:59:35 +08:00
winlin
9d90a8177f Disable SO_REUSEPORT if not supported. 3.0.57 2019-10-04 20:02:51 +08:00
winlin
2a1f8e5c1d Merge branch '3.0release' into develop 2019-10-04 19:37:57 +08:00
winlin
6f5809c80b Update README 2019-10-04 19:37:42 +08:00
winlin
e7e9fea866 Release 3.0 alpha0, 3.0.56 2019-10-04 19:25:58 +08:00
winlin
db077254b2 Update README 2019-10-04 19:18:55 +08:00
winlin
2c59aa1c69 Update README 2019-10-04 19:13:52 +08:00
winlin
687bcef192 Merge branch '3.0release' into develop 2019-10-04 19:05:46 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
3483c1526f Update README 2019-10-03 16:47:09 +08:00
winlin
bccb3ce98f Update README 2019-10-03 16:12:06 +08:00
winlin
8182814965 Update README 2019-10-03 16:11:13 +08:00
winlin
d3b142a0d9 Fix #775, Support SO_REUSEPORT. 3.0.54 2019-10-03 16:10:22 +08:00
winlin
cd27aecb07 Merge branch '3.0release' into develop 2019-10-03 13:20:19 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
ab66773aae Merge branch '3.0release' into develop 2019-05-14 08:42:56 +08:00
winlin
1605000817 Covert Kernel File reader/writer. 3.0.52 2019-05-14 08:13:27 +08:00
winlin
5c8ef7c005 Update readme. 2019-05-07 08:28:06 +08:00
winlin
89f85dc463 Update readme 2019-05-07 08:00:16 +08:00
winlin
3835661b8d Update readme 2019-05-07 07:58:25 +08:00
winlin
b18f0c6118 Merge branch '3.0release' into develop 2019-05-07 07:40:29 +08:00
winlin
bf2a74f8da Refine readme. 2019-05-05 08:48:53 +08:00
winlin
7c002308e9 Merge branch 3.0release into develop 2019-05-05 07:59:15 +08:00
winlin
ad1197e706 Update readme 2019-05-05 07:45:49 +08:00
winlin
6b2c71d385 Refine typo in files. 3.0.51 2019-04-30 08:30:13 +08:00
winlin
c933f8a870 Upgrade http-parser from 2.1 to 2.9.2 and cover it. 3.0.50 2019-04-25 10:41:59 +08:00
winlin
cf00bb7606 Merge branch 3.0release into develop 2019-04-22 08:12:26 +08:00
winlin
394cdb5f04 Refine in time unit. 3.0.49 2019-04-22 08:12:17 +08:00
winlin
a5babfe080 Merge branch 3.0release into develop 2019-04-14 23:35:11 +00:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
f73a17eac3 Merge branch 3.0release into develop 2019-04-06 16:11:18 +08:00
winlin
f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 2019-04-06 16:10:33 +08:00
winlin
128dc67776 Merge branch 3.0release into develop 2019-04-06 15:42:39 +08:00
winlin
23a2d8eefd Support HTTP-FLV params. 3.0.46 2019-04-06 15:42:24 +08:00
winlin
a8781aee3e For #1304, Default HSTRS to on. 2.0.264 2019-04-06 15:35:12 +08:00
winlin
ffe4ac654d Update readme 2019-04-05 20:13:02 +08:00
winlin
6e6e996bba Release 2.0.263 2019-04-05 20:09:23 +08:00
winlin
a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 2019-04-05 19:54:32 +08:00
winlin
85db08cef9 Merge branch 3.0release into develop 2019-04-05 18:49:34 +08:00
winlin
b9750baa52 For #1339, Support HTTP-FLV params. 2019-04-05 18:44:50 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00
winlin
75b3ca9456 Update readme 2019-02-11 11:35:00 +08:00
winlin
d5ea3c39b3 Update readme 2019-02-11 11:30:10 +08:00
winlin
84438b5c0f Update readme 2019-02-11 11:22:35 +08:00
winlin
9f10f890cf Merge 3.0release 2019-02-11 11:12:39 +08:00
winlin
663a003fa5 Update reamde 2019-02-07 21:06:25 +08:00
Keegan H
eeffb6d3ff Update README.md (#1317) 2019-02-07 21:01:14 +08:00
winlin
c646e3f287 CI: Research support codecov 2019-02-03 09:27:08 +08:00
winlin
19f1bf4e27 Update Readme 2019-02-02 21:54:11 +08:00
winlin
a25efa3764 CI: Update codecov badge 2019-02-02 21:51:08 +08:00
winlin
408c2d05ed CI: Update badges 2019-02-02 20:22:49 +08:00
winlin
3e8f070635 CI: Update badges 2019-02-02 20:17:57 +08:00
winlin
15f75ffb22 CI: Update badges 2019-02-02 20:13:26 +08:00
winlin
1e87623a70 CI: Update badges 2019-02-02 20:08:49 +08:00
winlin
abfc35c6c7 Update readme 2019-01-01 13:41:18 +08:00
winlin
7ee3dad2f9 Update readme 2018-12-16 23:39:45 +08:00
winlin
432a575c7a Use docker for #1274 and #1250 2018-12-10 00:07:38 +08:00
winlin
b0e91e8fe9 Use docker for #1274 and #1250 2018-12-10 00:05:23 +08:00
winlin
a8be5f8f27 Allow OSX for utest 2018-12-09 19:41:59 +08:00
winlin
f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 2018-12-01 20:21:35 +08:00
winlin
24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 2018-11-11 13:51:10 +08:00
winlin
99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 2018-11-11 13:33:47 +08:00
winlin
b2066cbf68 #1263, Fix string trim bug. 2.0.259 2018-11-11 13:30:12 +08:00
winlin
39f1629168 Merge from SRS2 2018-10-28 14:24:18 +08:00
winlin
4cb8de3029 Release r2.0r5, 2.0.258 2018-10-28 14:18:36 +08:00
winlin
58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 2018-10-28 14:09:55 +08:00
winlin
63ac93a642 Merge #1236 from 2.0release 2018-10-08 07:22:21 +08:00
winlin
a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 2018-10-08 07:16:07 +08:00
winlin
3f009937ee Merge #1237 from 2.0release 2018-10-08 07:10:29 +08:00
winlin
9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 2018-10-08 07:09:31 +08:00
winlin
580b94c9c8 SRS console support both Chinese and English 2018-08-26 19:38:46 +08:00
winlin
5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 2018-08-25 21:17:33 +08:00
winlin
e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 2018-08-25 18:10:55 +08:00
winlin
a61bfb2066 Merge 2.0r4 2018-08-12 12:09:18 +08:00
winlin
36cebc4b71 Release 2.0r4, 2.0.255 2018-08-12 12:03:31 +08:00
winlin
728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 2018-08-12 10:46:06 +08:00
winlin
74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 2018-08-12 10:44:55 +08:00
winlin
1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 2018-08-11 19:23:51 +08:00
winlin
1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 2018-08-11 19:09:56 +08:00
winlin
c582590bb0 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:15:14 +08:00
winlin
6cea551c64 For #1110, Refine params in http callback. 2.0.253 2018-08-11 10:12:40 +08:00
winlin
0e1ddb046d Update readme for FLV realtime 2018-08-05 20:35:33 +08:00
winlin
33f6e9a21f Update readme for FLV realtime 2018-08-05 20:33:45 +08:00
winlin
d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 2018-08-05 20:30:04 +08:00
winlin
03ac48f8fa Merge 2.0, for FLV latency 2018-08-05 20:25:28 +08:00
winlin
c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 2018-08-05 20:23:17 +08:00
winlin
ae99131512 Fix #1087, Ignore iface without address. 3.0.37 2018-08-05 10:41:31 +08:00
winlin
29b74c7220 For #1110, Support params in http callback. 3.0.36 2018-08-04 19:51:04 +08:00
winlin
85d3a5001c For #1110, Support params in http callback. 2.0.251 2018-08-04 19:36:42 +08:00
winlin
68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 2018-08-02 09:17:49 +08:00
winlin
a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 2018-08-02 07:14:06 +08:00
winlin
586899a010 For #1031, SRS edge support douyu.com. 2.0.250 2018-08-02 06:59:57 +08:00
winlin
41c6e833b9 Replace hex to string to match MIT license. 3.0.33 2018-07-22 18:47:38 +08:00
winlin
84f81983aa Replace base64 to match MIT license. 3.0.32 2018-07-22 17:56:38 +08:00
winlin
0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 2018-07-22 15:21:05 +08:00
winlin
e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 2018-07-21 20:58:20 +08:00
winlin
608c88b8f2 Merge 2.0release 2018-07-21 17:52:12 +08:00
winlin
6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 2018-07-21 17:49:46 +08:00
winlin
f5c4d5a539 Release 2.0r3, SRS/2.0.248 2018-07-18 20:31:03 +08:00
winlin
5952671689 Release 2.0r3, SRS/2.0.248 2018-07-18 20:27:54 +08:00
winlin
e4742ddac7 Merge 2.0release 2018-07-17 13:59:51 +08:00
winlin
2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 2018-07-17 13:44:01 +08:00
winlin
c20b819a29 Refine readme 2018-03-03 10:04:21 +08:00
winlin
449c632e49 For #464: Add example for origin cluster 2018-03-03 10:01:01 +08:00
winlin
459272b94c Merge #1077 from 2.0release 2018-02-28 14:10:09 +08:00
winlin
0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 2018-02-28 13:37:30 +08:00
winlin
c528b4170e Refine readme 2018-02-28 13:34:26 +08:00
winlin
4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 2018-02-16 16:40:48 +08:00
winlin
db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 2018-02-13 09:05:01 +08:00
winlin
681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 2018-02-13 08:52:57 +08:00
winlin
1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 2018-02-13 08:31:25 +08:00
winlin
049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 2018-01-07 17:23:36 +08:00
winlin
911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 2018-01-07 17:18:43 +08:00
winlin
1aa36f3bbc Refine readme 2018-01-07 13:10:47 +08:00
winlin
7d4c4750dd Refine readme 2018-01-07 12:44:54 +08:00