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
4869 commits 13 branches 107 tags 375 MiB
Commit graph

1446 commits

Author SHA1 Message Date
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
winlin
2e80403ecd Refine readme 2018-01-07 12:44:25 +08:00
winlin
c67fe0323b Refine product target 2018-01-07 10:51:18 +08:00
winlin
d9e37d2f54 Merge branch '2.0release' into 3.0release 2018-01-04 13:49:55 +08:00
winlin
a6bc53cb85 Merge #1039, fix bug of init.d script. 2018-01-04 13:49:11 +08:00
winlin
5730bf8e43 Fix #913, support complex error. 3.0.26 2018-01-01 23:03:42 +08:00
winlin
b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 2018-01-01 23:01:13 +08:00
winlin
59b53dab8b Merge from SRS2 2017-09-22 16:27:24 +08:00
winlin
a1df3c6f36 Remove CSDN mirror 2017-09-22 16:23:04 +08:00
winlin
b88265fc78 Update readme 2017-07-26 09:28:40 +08:00
winlin
ba2b82f29c Refine English of Readme 2017-07-24 08:45:36 +08:00
winlin
1d35ae21ec Update README.md 2017-06-30 10:30:16 +08:00
winlin
4d6c1b1a17 Update README.md 2017-06-29 09:38:20 +08:00
winlin
9c6d7a71d0 Update README.md 2017-06-29 09:38:03 +08:00
winlin
535fa034af Update README.md 2017-06-29 09:37:16 +08:00
winlin
ad6f318ea6 Update README.md 2017-06-29 09:35:57 +08:00
winlin
92fb9b4a72 Update README.md 2017-06-28 09:54:14 +08:00
winlin
f871c26380 Update README.md 2017-06-28 09:38:05 +08:00
winlin
2207adebed Update README.md 2017-06-28 09:27:45 +08:00
winlin
ec335c692d Update README.md 2017-06-28 09:23:42 +08:00
winlin
6749582f1e Update README.md 2017-06-28 09:21:06 +08:00
winlin
a5925ca904 Update README.md 2017-06-28 09:19:09 +08:00
winlin
159ef9e1c4 Update README.md 2017-06-28 09:18:13 +08:00
winlin
f9056caae0 Merge branch 'develop' into 3.0release 2017-06-28 09:09:00 +08:00
winlin
494879f6ed Update README.md 2017-06-27 08:26:02 +08:00
winlin
f641f06171 Update README.md 2017-06-27 08:19:48 +08:00
winlin
34c73b6bec Update README.md 2017-06-27 08:15:39 +08:00
winlin
9ae54850bf Update readme for json 2017-06-11 14:06:54 +08:00
winlin
4e4091231e Refine object create in server. 2017-06-10 14:19:10 +08:00
winlin
c32afb95ab Release v2.0-r2, 2.0.243 2017-06-10 09:02:16 +08:00
winlin
e309be154e Release v2.0-r2, 2.0.243 2017-06-10 08:59:14 +08:00
winlin
20cacd5ea0 Update readme for DASH 2017-06-10 08:54:59 +08:00
winlin
58521751c3 Fix #299, support experimental MPEG-DASH. 3.0.25 2017-06-04 19:56:29 +08:00
winlin
6c64297264 Fix #821, support MP4 file parser. 3.0.24 2017-05-30 19:40:03 +08:00
winlin
1bf99e8f3e For #907, Wrap ST, only use in service ST. 2017-05-30 09:05:02 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
5792c462b8 Merge branch 'develop' into 3.0release 2017-05-29 12:17:25 +08:00
winlin
c4966484e1 For #893, #899, merge SRS2 2017-05-29 12:17:16 +08:00
winlin
e8cb2e6be4 Merge #899 to fix #893, ts PES ext length. 2.0.243 2017-05-29 12:15:04 +08:00
winlin
2677ec8c3f Update license mixing 2017-05-24 14:14:45 +08:00
winlin
f97260be1d Merge SRS2 2017-05-01 16:44:14 +08:00
winlin
a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 2017-05-01 16:39:59 +08:00
winlin
ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 2017-04-30 12:03:31 +08:00
winlin
c97f2233a2 Merge SRS2 for #851 2017-04-23 21:00:06 +08:00
winlin
ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 2017-04-23 20:55:51 +08:00
winlin
d0bf47906d Merge SRS2 2017-04-18 21:11:36 +08:00
winlin
4167715153 Release 2.0r1, 2.0.239 2017-04-18 21:08:31 +08:00
winlin
d15c21a034 Merge branch '2.0release' into develop 2017-04-18 11:51:25 +08:00
winlin
f2dd866c78 Fix typo of Readme. 2017-04-18 11:51:19 +08:00
winlin
9a2a6ab95f Merge SRS2 2017-04-18 11:42:11 +08:00
winlin
5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 2017-04-18 11:41:09 +08:00
winlin
a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 2017-04-16 21:33:39 +08:00
winlin
1054b0a90f Merge SRS2 2017-04-15 20:46:00 +08:00
winlin
33a0abdeff Fix #844, support Haivision encoder. 2.0.238 2017-04-15 20:44:02 +08:00
winlin
d6e28bde69 Merge from SRS2. 2017-04-15 17:09:50 +08:00
winlin
1c139d8fd8 Merge #846, fix fd leak for FLV stream caster. 2.0.237 2017-04-15 16:59:36 +08:00
winlin
8d35585c13 Merge #841, avoid the duplicated sps/pps in ts. 2.0.236 2017-04-15 16:54:42 +08:00
winlin
5fed19941d Update links for compare 2017-04-12 10:39:20 +08:00
winlin
33375db401 Merge from SRS2, for #834 2017-04-09 18:52:21 +08:00
winlin
b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 2017-04-09 18:45:42 +08:00
winlin
609605a50b Fix #820, extract service for modules. 3.0.21 2017-03-26 17:05:50 +08:00
winlin
b4b5fb77f3 Add skype for English user. 2017-03-26 14:33:55 +08:00
winlin
7d1a91ca7d Add skype for English user. 2017-03-26 14:32:46 +08:00
winlin
b83be2f29c Add skype for English user. 2017-03-26 14:32:05 +08:00
winlin
4ccb17ddfb Add skype for English user. 2017-03-26 14:31:44 +08:00
winlin
19632e5b4b Add skype for English user. 2017-03-26 14:31:17 +08:00