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

1384 commits

Author SHA1 Message Date
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
winlin
004381b7c9 Add skype for English user. 2017-03-26 14:28:53 +08:00
winlin
ff822b55cd For #820, extract service module. 2017-03-26 10:16:21 +08:00
winlin
8a53128a37 Merge SRS2 2017-03-02 21:55:52 +08:00
winlin
795c94a92f Release v2.0r0, 2.0.234 2017-03-02 21:41:15 +08:00
winlin
dee17df83e Release 2.0r0, 2.0.234 2017-03-02 21:02:25 +08:00
winlin
308c6fee18 Fix #786, simply don't reuse object. 3.0.20 2017-03-02 16:43:06 +08:00
winlin
121a2e5886 For #110, refine thread object. 3.0.19 2017-03-01 12:28:32 +08:00
winlin
e754ab7073 Update readme for Kafka, DVR MP4 and compare 2017-02-26 09:24:46 +08:00
winlin
bd84e476e6 For #730, remove the test code. 2.0.234 2017-02-25 20:24:56 +08:00
winlin
3903d2a8e3 For #730, remove the test code. 2.0.234 2017-02-25 20:24:18 +08:00
winlin
2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 2017-02-12 20:55:35 +08:00
winlin
b0789c54e4 Update HLS wiki to v3 2017-02-11 14:28:40 +08:00
winlin
292f62ab0f Update the wiki links 2017-02-11 14:13:55 +08:00
winlin
fdd81fa886 Update index 2017-02-11 14:03:13 +08:00
winlin
af0d98619a Merge srs2 2017-02-11 13:55:45 +08:00
winlin
1cf24905ce Update 2.0 wikis 2017-02-11 13:54:17 +08:00
winlin
ebc1be913f Merge branch '2.0release' into develop 2017-02-10 13:15:51 +08:00
winlin
605192f448 add wechat link 2017-02-10 13:14:29 +08:00
winlin
72ceeaf2ff Merge branch '2.0release' into develop 2017-02-10 12:54:55 +08:00
winlin
8d60318378 add wechat link 2017-02-10 12:54:04 +08:00
winlin
dd1929c7a1 add wechat link 2017-02-10 12:49:06 +08:00
winlin
e2d85d099e update readme for DVR mp4 2017-02-09 15:43:40 +08:00
winlin
00abaf4df2 merge srs2, remove donation 2017-02-09 15:42:42 +08:00
winlin
455d9b285e remove donation 2017-02-09 15:41:45 +08:00
winlin
5fec59ace2 merge from srs2, fix #503 2017-02-09 14:33:56 +08:00
winlin
99bffea328 fix #503, disable utilities when reload a source. 2.0.233 2017-02-09 14:29:57 +08:00
winlin
afbc3443f3 fix #738, support DVR general mp4. 3.0.17 2017-02-07 21:56:20 +08:00
winlin
e8eb050bf2 update readme 2017-02-03 14:57:28 +08:00
winlin
5c959fc781 merge from srs2, for kbps free io 2017-01-22 13:16:05 +08:00
winlin
6706bda42c for #752, release the io then free it for kbps. 2.0.232 2017-01-22 13:12:56 +08:00
winlin
4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 2017-01-19 12:38:55 +08:00
winlin
6209945a07 Merge branch '2.0release' into develop 2017-01-18 19:34:00 +08:00
winlin
80dfe601b1 add link for #750 2017-01-18 19:33:54 +08:00
winlin
e8c48ac8f8 merge srs2, use specific error code for dns resolve 2017-01-18 16:05:33 +08:00
winlin
60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 2017-01-18 16:03:57 +08:00
winlin
2656c97ccd merge srs2. release r2.0b4 2017-01-18 12:18:59 +08:00
winlin
727652c56a release r2.0b4, 2.0.230 2017-01-18 12:13:49 +08:00
winlin
310032d8d8 merge srs2, timestamp overflow for ATC. 2017-01-18 11:48:31 +08:00
winlin
d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 2017-01-18 11:47:43 +08:00
winlin
dca9749f37 for #742, refine the object live cycle. 3.0.15 2017-01-17 10:44:13 +08:00
winlin
750f4413c8 merge srs2 for #536 2017-01-16 12:47:48 +08:00
winlin
ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 2017-01-11 17:43:29 +08:00
winlin
e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 2017-01-11 17:42:34 +08:00
winlin
c902d0eb01 no donation anymore. 2017-01-11 13:06:39 +08:00
winlin
f92db0f87e merge srs2 for kbps 2017-01-11 11:46:50 +08:00
winlin
fec6f96a8f fix link for readme 2017-01-11 11:44:51 +08:00
winlin
c58dbe4d14 fix #588, kbps interface error. 2.0.228 2017-01-11 11:22:16 +08:00
winlin
7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 2017-01-11 09:45:22 +08:00
winlin
7bbb3bae42 merge srs2 2017-01-11 09:33:26 +08:00
winlin
e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 2017-01-11 09:25:48 +08:00
winlin
db231f6d37 refine hls html5 video template. 2017-01-10 18:43:36 +08:00
winlin
087a596a63 refine hls html5 video template. 2017-01-10 18:43:10 +08:00
winlin
1dd877c0d6 merge srs2 2017-01-10 11:17:37 +08:00
winlin
c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 2017-01-10 11:14:20 +08:00
winlin
15dfb0957c update introduction for SRS3 2017-01-06 19:02:49 +08:00
winlin
8017311369 update introduction for SRS3 2017-01-06 19:01:43 +08:00
winlin
463ff9374f update introduction for SRS3 2017-01-06 18:50:56 +08:00
winlin
7119b2a31e update introduction for SRS3 2017-01-06 18:50:22 +08:00
winlin
309abde790 merge srs2 2017-01-06 18:18:02 +08:00
winlin
ba1c92a7b1 update readme 2017-01-06 18:17:11 +08:00
winlin
1b175b1107 for #730, support config in/out ack size. 3.0.13 2017-01-06 14:57:54 +08:00
winlin
e434c09dc0 for #730, merge srs2 2017-01-06 14:13:19 +08:00
winlin
c67036d52e for #730, reset ack follow flash player rules. 2.0.225 2017-01-06 14:04:34 +08:00
winlin
4709d0214c for #711, support prefile for transcode. 3.0.12 2017-01-06 10:39:37 +08:00
winlin
35cd4c407c patch ST for valgrind and ARM. 3.0.11 2017-01-05 10:50:02 +08:00
winlin
f9a159cd21 patch ST for valgrind and ARM. 3.0.11 2017-01-05 10:45:41 +08:00
winlin
1581b15d86 update feature list 2017-01-05 10:10:27 +08:00
winlin
a4b82d7def update feature list 2017-01-05 09:55:57 +08:00
winlin
0f95964a8e update feature list 2017-01-05 09:32:24 +08:00
winlin
5a1b067fcf update feature list 2017-01-05 09:31:14 +08:00
winlin
8bdf50b14d update feature list 2017-01-05 09:29:12 +08:00
winlin
f2efa96015 for #324, always enable hstrs. 3.0.10 2017-01-05 09:08:56 +08:00
winlin
b4a815641b refine the links 2017-01-04 17:50:06 +08:00
winlin
df8ad774ef refine the content 2017-01-04 11:52:30 +08:00
winlin
704038e36e refine the content 2017-01-04 11:49:31 +08:00
winlin
977f82ad1d refine the content 2017-01-04 11:46:22 +08:00
winlin
6cf7089bae refine the content 2017-01-04 11:45:45 +08:00
winlin
9b85d9fca5 refine the content 2017-01-04 11:45:22 +08:00
winlin
412f6f3b47 refine the content 2017-01-04 11:42:56 +08:00
winlin
85ceea1c98 refine the content 2017-01-04 11:34:59 +08:00
winlin
b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 2016-12-15 16:22:04 +08:00
winlin
759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 2016-12-15 14:48:38 +08:00
winlin
fd693915c3 Merge branch '2.0release' into develop 2016-12-13 19:14:36 +08:00
winlin
34e5cdcd12 update latest srs2 2016-12-13 19:14:30 +08:00
winlin
c8aa34f0be merge srs2 2016-12-13 19:08:09 +08:00
winlin
6d3184029a release v2.0b3 2.0.223 2016-12-13 19:07:22 +08:00
winlin
aca8a79d95 fix #713, disable the source cleanup. 2.0.223 2016-12-13 18:41:45 +08:00
winlin
9ba4bed648 merge srs2 2016-12-13 17:58:42 +08:00
winlin
cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 2016-12-13 17:57:49 +08:00
winlin
2955b1fd2d support log rotate signal SIGUSR1. 3.0.8 2016-12-08 18:23:22 +08:00
winlin
5a76f15e4e fix typo and refine grammar. 3.0.7 2016-12-07 14:43:14 +08:00
winlin
cda9beeba7 refine comments 2016-12-07 14:40:25 +08:00
winlin
d194691c09 refine comments 2016-12-07 14:37:28 +08:00
winlin
0a8d40925f merge from 2.0 2016-11-09 09:44:19 +08:00
winlin
625ca23739 release r2.0b2, 2.0.221 2016-11-09 09:43:51 +08:00
winlin
d8599a56ca fix #654, crash when source cleanup for edge. 2.0.221 2016-11-05 10:48:49 +08:00
winlin
8b00e56a84 fix #666, crash when source cleanup for http-flv. 2.0.220 2016-10-26 09:54:49 +08:00
winlin
d6fc289c6a fix #661, close fd after thread stopped. 2.0.219 2016-10-10 11:54:08 +08:00
winlin
b748fac23a support asprocess for oryx. 2.0.218 2016-09-23 15:00:50 +08:00
winlin
2a01540433 support change work_dir for oryx. 2016-09-23 14:53:58 +08:00
winlin
0fb71281a9 add circleci 2016-09-15 14:28:54 +08:00
winlin
9bd2ff16e2 add badage 2016-09-15 14:17:33 +08:00
winlin
ff3f8272a9 fix #640, typo for rtmp type. 2.0.217 2016-09-15 13:37:11 +08:00
winlin
c2cb666995 fix fast stream error bug. 2.0.216 2016-09-12 18:21:14 +08:00
winlin
c231f45fe8 Merge branch '2.0release' into develop 2016-09-09 14:57:58 +08:00
winlin
4e756bd0eb refine readme 2016-09-09 14:52:35 +08:00
winlin
66f251c6be update readme 2016-09-09 14:33:07 +08:00
winlin
4af1299e08 refine readme 2016-09-09 14:32:26 +08:00
winlin
b14ae72c8a update binary 2016-09-09 14:31:28 +08:00
winlin
8a4e241eec merge from srs2 2016-09-09 14:29:33 +08:00
winlin
6c4c68ccb6 2.0 beta1(2.0.215) released. 2016-09-09 14:26:16 +08:00
winlin
4342d3ed18 Merge branch '2.0release' into develop 2016-09-09 10:59:24 +08:00
winlin
5cd5ee73cd refine tags 2016-09-09 10:59:20 +08:00
winlin
c7b97aa1c3 fix memory leak at source. 2.0.214 2016-09-05 14:13:37 +08:00
winlin
6ec60b0a21 fix memory leak at handshake. 2.0.213 2016-09-05 09:38:30 +08:00
winlin
e775eb3ff2 support all arm for patched st. 2.0.212 2016-09-03 18:47:46 +08:00
winlin
7933b6abd2 update readme 2016-09-01 17:11:18 +08:00
winlin
6696782d56 refine readme 2016-09-01 17:07:07 +08:00
winlin
861d845f54 refine readme 2016-09-01 17:05:43 +08:00
winlin
7d96a33207 Merge branch '2.0release' into develop 2016-09-01 16:51:18 +08:00
winlin
e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 2016-09-01 16:51:09 +08:00
winlin
b49cb3d379 Merge branch '2.0release' into develop 2016-08-30 19:30:05 +08:00
winlin
a0890fe06a comment the pcr 2016-08-30 19:29:59 +08:00
winlin
bf22acd689 Merge branch '2.0release' into develop 2016-08-18 11:29:22 +08:00
winlin
f080537887 update readme 2016-08-18 11:28:54 +08:00
winlin
7df7156e07 Merge branch '2.0release' into develop 2016-08-17 10:12:34 +08:00
winlin
dbc6d94028 update readme. 2016-08-17 09:33:11 +08:00
winlin
abeb4f46a9 merge 2.0 2016-08-06 17:28:43 +08:00
winlin
007f7da50b release 2.0beta0, 2.0.10 2016-08-06 16:44:33 +08:00
winlin
ceb0187bd1 update readme 2016-05-17 10:58:09 +08:00
winlin
768cbd3a1a refine readme 2016-01-20 14:21:00 +08:00
winlin
6c80ecbbf9 update readme 2016-01-20 14:19:53 +08:00
winlin
27690f9e52 Merge branch '2.0release' into develop 2016-01-13 17:31:40 +08:00
winlin
b51cd599cc add linked in page. 2016-01-13 17:31:33 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
a11ab5ad24 merge from srs2. 2016-01-11 13:22:45 +08:00
winlin
e2e6e76f92 for #558 and #559, 2.0.208 2016-01-11 13:21:28 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
384de15094 merge srs2 2015-12-23 10:18:18 +08:00
winlin
d3139c52cc release 2.0.205, 2.0-alpha3. 2015-12-23 09:58:17 +08:00
winlin
714c13d88d merge from srs2 2015-12-22 19:19:28 +08:00
winlin
5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 2015-12-22 19:18:46 +08:00
winlin
65b81a4e68 merge from srs2 2015-12-22 17:01:06 +08:00
winlin
8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 2015-12-22 17:00:22 +08:00
winlin
b881166f9a merge from srs2 2015-12-22 16:18:09 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +08:00
winlin
5f915aa959 merge from srs2 2015-12-22 15:40:03 +08:00
winlin
cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 2015-12-22 15:39:12 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
cafe886c3f merge srs2 2015-11-27 17:46:00 +08:00
winlin
34d1ce9922 update readme, add gitter. 2015-11-27 17:45:04 +08:00
winlin
18eb8c81b3 merge from srs2 2015-11-16 18:10:06 +08:00
winlin
2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 2015-11-16 18:06:44 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
a3a6282fe9 merge srs2. 2015-11-06 10:52:29 +08:00
winlin
a89ed68aa3 update readme for #511. 2015-11-06 10:51:32 +08:00
winlin
6e3eb50b78 Merge branch '2.0release' into develop 2015-11-02 13:51:07 +08:00
winlin
6d0adb9f22 fix typo 2015-11-02 13:51:01 +08:00
winlin
57536bf428 fix typo in readme. 2015-11-02 13:47:56 +08:00
winlin
2b21a63d8f merge from srs2. 2015-11-02 13:43:22 +08:00
winlin
49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 2015-11-02 13:42:05 +08:00