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

1559 commits

Author SHA1 Message Date
winlin
874ae85e47 update readme. 2015-09-21 14:26:31 +08:00
winlin
22d6ec4f93 update readme. 2015-09-21 14:24:06 +08:00
winlin
841d9ee5ad update readme. 2015-09-21 14:20:30 +08:00
winlin
f07d7dcf35 update readme. 2015-09-21 14:19:07 +08:00
winlin
ddb0dcdcaa update readme. 2015-09-21 14:13:07 +08:00
winlin
99e27c035a update readme. 2015-09-21 13:52:16 +08:00
winlin
0fb353f1f6 update readme. 2015-09-21 13:50:01 +08:00
winlin
e5581981d4 Merge branch '2.0release' into develop 2015-09-21 13:39:15 +08:00
winlin
534a8c9fa3 update readme. 2015-09-21 13:39:08 +08:00
winlin
bbbb4e5025 update readme. 2015-09-21 13:37:42 +08:00
winlin
e5429fef02 update readme. 2015-09-21 13:34:28 +08:00
winlin
a6377fe456 refine readme 2015-09-21 13:26:08 +08:00
winlin
533b9a5cfb Merge branch '2.0release' into develop 2015-09-21 13:24:34 +08:00
winlin
87d007d087 refine readme 2015-09-21 13:24:29 +08:00
winlin
f42cd55078 refine readme 2015-09-21 13:24:05 +08:00
winlin
2d99e8a563 refine readme 2015-09-21 13:20:04 +08:00
winlin
d129c1079b refine readme 2015-09-21 13:19:32 +08:00
winlin
21fa01d706 refine readme 2015-09-21 13:19:06 +08:00
winlin
03c2884f8c refine readme 2015-09-21 13:17:54 +08:00
winlin
c90e117bbf refine readme 2015-09-21 12:41:45 +08:00
winlin
d98fc58e8b refine readme 2015-09-21 12:32:14 +08:00
winlin
e4e36a0166 merge from srs2, fix openssl build 2015-09-21 12:03:47 +08:00
winlin
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
b59d9ba6a1 support amf0 and json to convert with each other. 2015-09-19 13:31:57 +08:00
winlin
3f7e69b617 json objects support dumps to string. 2015-09-19 12:27:31 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
95979674f9 merge srs 2 2015-09-14 21:09:34 +08:00
winlin
2c21f74efb update readme. 2015-09-14 21:08:19 +08:00
winlin
a865eb9ccb merge from srs2 2015-09-14 20:58:54 +08:00
winlin
1d477ae71b srs 2.0 alpha1 released. 89269 lines. 2015-09-14 20:48:32 +08:00
winlin
a7c4b786cf merge from 2.0 2015-09-14 18:42:31 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
a994191ddc for #474, always release publish for source. 2015-09-14 15:10:34 +08:00
winlin
eb9aa47ab1 merge from 2.0 2015-09-14 13:48:27 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +08:00
winlin
3b483094bd merge from 2.0 2015-09-14 12:24:57 +08:00
winlin
6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 2015-09-14 12:22:19 +08:00
winlin
ad6de898a5 Merge branch '2.0release' into develop 2015-09-14 09:29:09 +08:00
winlin
d07bfa459a update donation 2015-09-14 09:28:47 +08:00
winlin
1518ea6142 update donation 2015-09-13 18:15:51 +08:00
winlin
589d430086 Update README.md 2015-09-13 18:14:56 +08:00
winlin
61d817bad5 Update README.md 2015-09-13 18:07:26 +08:00
winlin
f9228464b6 update donation 2015-09-13 17:59:37 +08:00
winlin
f09019ea0d update donation 2015-09-13 17:57:40 +08:00
winlin
77d21f7e32 refine readme, fix typo 2015-09-11 08:02:45 +08:00
winlin
6931bdd6d5 refine readme, the module and arch 2015-09-11 08:00:16 +08:00
winlin
d76eda35ab refine readme, add exec for stream arch 2015-09-11 07:47:40 +08:00
winlin
a0c6e4ee8c refine readme, add exec for stream arch 2015-09-11 07:47:08 +08:00
winlin
9d85025114 Update README.md 2015-09-11 07:38:58 +08:00
winlin
db1ed513be Update README.md 2015-09-11 07:37:57 +08:00
winlin
d56b9fd90f refine readme 2015-09-11 07:35:42 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
5efd1912f2 refine readme 2015-08-28 22:21:18 +08:00
winlin
871ac95c2e merge from srs 2 2015-08-28 18:49:41 +08:00
winlin
0221434ae9 refine links 2015-08-28 18:48:35 +08:00
winlin
166e487d24 refine links 2015-08-28 18:47:39 +08:00
winlin
f3b4f2bc53 refine readme for links 2015-08-28 18:29:46 +08:00
winlin
7f2bbcb248 refine readme links. 2015-08-28 18:26:25 +08:00
winlin
c290951d20 merge from srs2 2015-08-28 18:18:49 +08:00
winlin
cf48559752 refine the readme. 2015-08-28 18:17:56 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
5e48dab2b9 Merge branch '2.0release' into develop 2015-08-23 09:57:07 +08:00
winlin
21b175b4db add remote console to feature list. 2015-08-23 09:57:04 +08:00
winlin
ce1627eb34 Merge branch '2.0release' into develop 2015-08-23 09:55:46 +08:00
winlin
899ecb5661 add remote console to feature list. 2015-08-23 09:55:41 +08:00
winlin
8d2b2d0148 Merge branch '2.0release' into develop 2015-08-23 09:39:23 +08:00
winlin
ada33bdad7 add srs 1.0release time 2015-08-23 09:39:16 +08:00
winlin
b4040a5fc9 Merge branch '2.0release' into develop 2015-08-23 09:11:38 +08:00
winlin
724498bb09 update 2.0 release file to srs2.0a0 2015-08-23 09:11:32 +08:00
winlin
7e475e15b0 release 2.0a0 2015-08-23 09:00:57 +08:00
winlin
28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 2015-08-23 09:00:21 +08:00
winlin
7a2836ae2a Merge branch '2.0release' into develop 2015-08-22 19:49:39 +08:00
winlin
6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 2015-08-22 18:18:18 +08:00
winlin
77765b463a Merge branch '2.0release' into develop 2015-08-20 14:20:58 +08:00
winlin
575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 2015-08-20 14:20:49 +08:00
winlin
f10e399991 Merge branch '2.0release' into develop 2015-08-19 19:02:40 +08:00
winlin
170ad05148 add gfps and nb_packets 2015-08-19 15:31:19 +08:00
winlin
22491b0c99 merge from 2.0 2015-08-19 14:21:12 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
8d3d5dd10b Merge branch '2.0release' into develop 2015-08-14 14:35:47 +08:00
winlin
a0a89a8ca6 use reduce_sequence_header for stream control. 2015-08-14 14:35:41 +08:00
winlin
807299589e merge from srs2. 2015-08-14 11:14:33 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
a64340c2b5 Merge branch '2.0release' into develop 2015-08-13 21:58:08 +08:00
winlin
c02da33c11 add bytes api benchmark. 2015-08-13 21:57:18 +08:00
winlin
035cd40866 add bytes api benchmark. 2015-08-13 21:55:05 +08:00
winlin
653afd0700 merge from 2.0 2015-08-12 13:23:00 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
267846a3fa for #442, support kickoff connected client. 2.0.181 2015-08-12 13:20:18 +08:00
winlin
6a39bf4731 refine for srs3 2015-08-11 15:52:25 +08:00
winlin
34fe51a85c refine for 2.0release 2015-08-11 15:51:56 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
a62d1cdf2a refine the readme 2015-07-30 17:47:40 +08:00
winlin
de64f6829d update readme 2015-07-27 14:14:59 +08:00
winlin
3d5fbc7a61 update README, remove the 1.0history. 2015-07-27 14:13:12 +08:00
winlin
4c3d3013a2 Merge branch '2.0release' into develop 2015-07-23 14:35:04 +08:00
winlin
cd8be3f194 Update README.md 2015-07-23 14:34:22 +08:00
winlin
fb46481fc7 Update README.md 2015-07-23 14:30:58 +08:00
winlin
9e6746fcaa Update README.md 2015-07-23 14:29:37 +08:00
winlin
94569b181f merge from 2.0 2015-07-21 12:08:05 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
48c040c92b Merge branch '2.0release' into develop 2015-07-21 11:41:13 +08:00
winlin
89183c52c9 update hls and transcode wiki 2015-07-21 11:41:02 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
146a44a2ce merge from 2.0 2015-07-20 09:32:46 +08:00
winlin
b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 2015-07-20 09:31:46 +08:00
winlin
fdb17a1864 merge from 2.0 2015-07-17 14:06:15 +08:00
winlin
366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 2015-07-16 17:30:27 +08:00
winlin
8e293f927f merge 2.0release 2015-07-14 11:47:08 +08:00
winlin
5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 2015-07-14 11:46:23 +08:00
winlin
5f91fbc970 merge from 2.0release 2015-07-14 11:32:40 +08:00
winlin
ef5ddd01e4 Update README.md 2015-07-13 12:08:53 +08:00
winlin
c8fef99cb6 merge from 2.0release 2015-07-01 14:51:27 +08:00
winlin
438914c481 fix #433, fix the sps parse bug. 2.0.176 2015-07-01 14:50:45 +08:00
winlin
8951752086 Merge branch '2.0release' into develop 2015-06-17 16:47:08 +08:00
Jonathan Barratt
2e437a28b4 Update README.md 
Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server
 2015-06-17 16:46:39 +08:00
winlin
b0ce38dc8f merge from 2.0 2015-06-10 15:38:44 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
12eab8a128 merge from srs2. 2015-06-10 13:53:57 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
5d75e32e1d Merge branch '2.0release' into develop 2015-06-06 21:24:06 +08:00
winlin
a1dd734318 fix #421, drop video for unkown RTMP header. 2015-06-06 21:23:57 +08:00
winlin
d10d57716a Merge branch '2.0release' into develop 2015-06-05 21:34:39 +08:00
winlin
26b76c0e4c fix #420, remove ts for hls ram mode. 2015-06-05 20:38:01 +08:00
winlin
9dce971d57 merge from srs2 2015-05-30 14:41:47 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
4a80a5a71e for #209, support cleanup when srs stop. 2015-05-30 13:48:29 +08:00
winlin
597993d414 support pure video hls. 2015-05-29 21:53:37 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
3ad030fe83 add HLS overload 2015-05-29 17:56:05 +08:00
winlin
27a1fee6b9 Merge branch '2.0release' into develop 2015-05-28 21:02:50 +08:00
winlin
41ead65345 support [srs-dolphin][srs-dolphin], the multiple-process SRS. 2015-05-28 19:58:16 +08:00
winlin
b44987fac7 Merge branch '2.0release' into develop 2015-05-28 14:59:19 +08:00
winlin
9ab579c6e8 refine the configure test script. 2015-05-27 07:06:16 +08:00
winlin
7349fed8b1 Merge branch '2.0release' into develop 2015-05-25 09:59:57 +08:00
winlin
8afeb29d8d update readme 2015-05-25 09:27:25 +08:00
winlin
cd162c2848 merge from 2.0 2015-05-25 01:04:04 +08:00
winlin
9e9f38133d update readme. 2015-05-25 01:03:34 +08:00
winlin
d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 2015-05-25 01:02:06 +08:00
winlin
4df19ba99a for #405, improve the http flv to 3k. 2.0.170 2015-05-24 23:29:17 +08:00
winlin
0e1ac2b923 update readme 2015-05-24 22:54:49 +08:00
winlin
960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 2015-05-24 22:43:02 +08:00
winlin
fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 2015-05-24 21:17:00 +08:00
winlin
f540ce307b merge from 2.0 2015-05-24 15:19:50 +08:00
winlin
069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 2015-05-24 15:19:09 +08:00
winlin
9e342f41a4 add rtmp cluster. 2015-05-24 09:39:03 +08:00
winlin
58b336451d Merge branch '2.0release' into develop 2015-05-24 09:15:37 +08:00
winlin
94efe3f727 update wiki 2015-05-24 09:15:30 +08:00
winlin
829b3a392b merge from 2.0 2015-05-23 18:11:33 +08:00
winlin
d63242b6e8 add http flv sample. 2015-05-23 18:10:16 +08:00
winlin
e4c97cde2f update readme 2015-05-23 16:01:12 +08:00
winlin
2d9103db77 update readme 2015-05-23 15:52:08 +08:00
winlin
dbb37d2a52 update readme 2015-05-23 15:48:24 +08:00
winlin
bbdc8b901b update readme 2015-05-23 15:20:15 +08:00
winlin
16d386df91 update readme 2015-05-23 15:15:22 +08:00
winlin
982b09f9a7 update readme 2015-05-23 15:11:45 +08:00
winlin
6418801487 update readme 2015-05-23 14:46:24 +08:00
winlin
fe7d5c70d1 update readme 2015-05-23 14:43:55 +08:00
winlin
25d28c1461 update readme 2015-05-23 14:12:06 +08:00
winlin
504d0b9385 update readme 2015-05-23 14:07:04 +08:00
winlin
6f60fefba4 update readme 2015-05-23 13:42:57 +08:00
winlin
6d13178e92 refine readme the features and compare. 2015-05-23 13:22:26 +08:00
winlin
353e37c5b6 rename summary to features. 2015-05-23 13:20:20 +08:00
winlin
03c6aa37ad Merge branch '2.0release' into develop 2015-05-23 13:10:20 +08:00
winlin
c19856be5c refine for 2.0 2015-05-23 13:10:11 +08:00
winlin
2b52960b50 Merge branch '2.0release' into develop 2015-05-23 13:07:53 +08:00
winlin
a993462f95 merge from srs1.0 2015-05-23 13:07:47 +08:00
winlin
56f014ecf2 refine the graph of srs arch. 2015-05-23 13:06:02 +08:00
winlin
6b28dec8ec merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:05:06 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
478873fdec Merge branch '2.0release' into develop 2015-05-23 09:49:23 +08:00
winlin
0bb90145ba fix #391, copy request for async call. 2015-05-23 07:46:45 +08:00
winlin
7243cdbff6 merge from 2.0release. 2015-05-22 17:20:30 +08:00
winlin
6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 2015-05-22 17:16:33 +08:00
winlin
948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 2015-05-22 12:00:48 +08:00
winlin
44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 2015-05-19 18:06:20 +08:00
winlin
f6d2fd991b merge from 2.0.162 2015-05-10 10:36:49 +08:00
winlin
c617d2aaa5 support push flv stream over HTTP POST to SRS. 2015-05-10 10:35:35 +08:00
winlin
f15e9f5b62 Merge branch '2.0release' into develop 2015-04-30 13:42:53 +08:00
winlin
4d18073dab update contact add skype. 2015-04-30 13:42:30 +08:00
winlin
5819614ff0 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:49:42 +08:00
winlin
fff838e4c1 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:48:52 +08:00
winlin
9189a408c1 Merge branch '2.0release' into develop 2015-04-29 17:28:23 +08:00
winlin
90b80ffc45 migarate from winlinvip to srs org. 2015-04-29 17:28:15 +08:00
winlin
7d5f1c2be8 Merge branch '2.0release' into develop 2015-04-20 18:31:52 +08:00
winlin
2239e9f1fd support ingest hls live stream to RTMP. 2015-04-20 16:25:48 +08:00
winlin
6726a88f47 merge from 2.0release 2015-04-15 17:12:57 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
0c939e7114 merge from 2.0.160: 2015-04-13 10:33:08 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
17c1423f4a Merge branch '2.0release' into develop 2015-04-10 12:01:52 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
7dbc95e085 refine the hls deviation for floor algorithm. 2015-04-10 10:21:30 +08:00
winlin
71e1602458 merge from 2.0.159 2015-04-09 12:35:53 +08:00
winlin
546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 2015-04-08 16:52:43 +08:00
winlin
4f9df4f1a0 merge from 2.0.157, reap ts on the IDR. 2015-04-04 13:31:02 +08:00
winlin
77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 2015-04-04 13:30:13 +08:00
winlin
70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 2015-04-03 23:17:50 +08:00
winlin
cb148e43ee merge from 2.0.155 2015-04-03 10:57:34 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
fe5783e7a4 merge 2.0.154 2015-04-02 11:52:49 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
2d3d628865 merge from 2.0.153 2015-03-31 18:09:13 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
e75b7e89d6 merge from 2.0.152 2015-03-31 17:53:32 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
ef28865991 merge from 2.0.151 2015-03-31 15:54:37 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
abbed8f66c merge from 2.0release 2015-03-30 12:56:52 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
4d27030c19 Merge branch '2.0release' into develop 2015-03-21 12:19:06 +08:00
winlin
6776065b04 big support from all friends of SRS 2015-03-21 12:18:58 +08:00
winlin
11b93803de revert to SRS2. 2015-03-17 23:55:56 +08:00
winlin
ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 2015-03-17 22:06:59 +08:00
winlin
19ec1dafb7 Merge branch '2.0release' into develop 2015-03-15 21:56:39 +08:00
winlin
c32d9ee43e remove the contact from index. 2015-03-15 21:56:30 +08:00
winlin
ef39a88f3d Merge branch '2.0release' into develop 2015-03-15 14:18:12 +08:00
winlin
5d7c24de48 update readme 2015-03-15 14:18:05 +08:00
winlin
a21243ea12 merge from 2.0 2015-03-15 08:16:37 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
519c25a064 fork srs2 and start srs3. 3.0.0 2015-03-15 08:06:41 +08:00
winlin
636bc574af start 2.0release, 80773 lines. 2015-03-15 07:48:27 +08:00
winlin
5e19f5f2b8 add qq and weixin image. 2015-03-14 22:14:04 +08:00
winlin
320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 2015-03-14 20:07:56 +08:00
winlin
27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 2015-03-14 19:45:13 +08:00
winlin
2adc069df0 update readme for why srs 2015-03-13 18:07:43 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 2015-03-08 19:59:10 +08:00
winlin
8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 2015-03-08 17:36:43 +08:00
winlin
f31412db21 update readme. 2015-03-06 17:07:44 +08:00
winlin
b3ef8e9d48 set stream caster to experiment state 2015-03-06 15:46:33 +08:00
winlin
f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 2015-03-06 13:37:57 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
012c29e124 for #133, update the wiki. 2015-03-01 21:08:44 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
4505983944 update readme, add why srs. 2015-02-28 23:41:49 +08:00
winlin
e282fa94c0 update readme, add why srs. 2015-02-28 23:27:43 +08:00
winlin
6b0a8092ab update readme, add why srs. 2015-02-28 23:24:30 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 2015-02-24 18:39:31 +08:00
winlin
a3648063d5 fix #179, support dvr http api. 2.0.123. 2015-02-24 17:29:30 +08:00
winlin
691f732204 for #179, update readme. 2015-02-23 19:51:13 +08:00
winlin
a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
9d233db27e fix #133, support push rtsp to srs. 2.0.120. 2015-02-18 22:28:39 +08:00
winlin
d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119. 2015-02-17 21:03:39 +08:00
winlin
ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 2015-02-17 21:01:44 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
9a7696a7c2 Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release 2015-02-12 10:41:55 +08:00
winlin
103ce78b35 Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 2015-02-12 10:20:47 +08:00
winlin
4cf263876c update readme 2015-02-12 10:20:33 +08:00
winlin
e1e12e5dba release 1.0r2 2015-02-12 10:19:19 +08:00
winlin
61b0ee55ed release 1.0r2 2015-02-12 10:18:45 +08:00
winlin
d4f642504f update readme 2015-02-12 10:16:06 +08:00
winlin
16bf0a1826 dev code HuKaiqun for 1.0.27. 2015-02-12 10:14:30 +08:00
winlin
f016245e20 dev code ZhouGuoWen for 2.0.115. 2015-02-12 10:12:49 +08:00
winlin
0e783f4548 Update README.md 2015-02-11 12:34:28 +08:00
winlin
d07f09aa0b Update README.md 2015-02-11 12:28:48 +08:00
winlin
e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 2015-02-10 23:15:43 +08:00
winlin
828aadf858 for #310, downcast aac SSR to LC. 2.0.113 2015-02-10 17:18:06 +08:00
winlin
d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 2015-02-10 17:15:50 +08:00
winlin
dba983d124 for #136, update the config for ram hls. 2015-02-03 16:29:59 +08:00
winlin
16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 2015-01-31 23:20:00 +08:00
winlin
8374017329 build libfdk-aac in ffmpeg. 2.0.108 2015-01-29 10:45:19 +08:00
winlin
52b62918d9 for #250, decode the PAT of PSI ts packet. 2015-01-27 16:25:46 +08:00
winlin
7fc3996e45 update readme for hls(h.264+mp3). 2015-01-25 17:42:04 +08:00
winlin
919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 2015-01-25 17:06:49 +08:00
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 2015-01-25 13:35:53 +08:00
winlin
7888506999 update readme for 1.0.25 2015-01-25 13:33:23 +08:00
winlin
16372365ae for #151, refine pcr=dts-800ms and use dts/pts directly. 2.0.104 2015-01-25 13:06:39 +08:00
winlin
1835957a2b for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24 2015-01-25 13:04:12 +08:00
winlin
8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 2015-01-23 15:29:14 +08:00
winlin
4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 2015-01-23 15:14:29 +08:00
winlin
1e26f54b5c update stream arch. 2015-01-23 11:27:27 +08:00
winlin
102736a94d for #250, update readme add streamer arch. 2015-01-23 10:38:54 +08:00
winlin
d8c7267cfc update readme. 2015-01-23 08:53:52 +08:00
winlin
a647043a06 update readme and wiki url for http ts stream 2015-01-22 18:39:53 +08:00
winlin
0702ad19b6 for #293, http ts stream, update readme. 2015-01-22 18:33:07 +08:00
winlin
463f75f1c9 update readme, add http live stream 2015-01-19 14:11:53 +08:00
winlin
3f0c80599b update reamde 2015-01-19 13:31:07 +08:00
winlin
b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 2015-01-19 13:17:46 +08:00
winlin
3b853a6dbd fix #293, support rtmp remux to http flv live stream. 2015-01-18 20:07:54 +08:00
winlin
53d9faf395 for #293, update readme. 2015-01-18 19:50:54 +08:00
winlin
9bf408ad25 for bug #277, update readme remove the experiment for http server and http vod stream. 2015-01-18 18:08:47 +08:00
winlin
cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 2015-01-17 23:00:40 +08:00
winlin
9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 2015-01-17 21:58:23 +08:00
winlin
cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 2015-01-17 13:06:18 +08:00
winlin
4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 2015-01-17 13:04:52 +08:00
winlin
1f9fae43a4 update readme for 1.0rc1 2015-01-15 11:39:04 +08:00
winlin
118efcbbf8 update the file for 1.0rc1. 2015-01-15 11:38:03 +08:00
winlin
8e2b871829 update readme for 1.0rc1 2015-01-15 11:33:24 +08:00
winlin
98fb50464a update readme for 1.0r1, 1.0.21 2015-01-15 11:31:07 +08:00
winlin
ad5956eab4 update readme 2015-01-15 11:24:35 +08:00
winlin
bb74c8dfc5 update readme for 1.0r1 2015-01-15 11:24:00 +08:00
winlin
df3b5c953b update donation link to develop 2015-01-15 09:18:48 +08:00
winlin
1316dab83c update donation link to develop 2015-01-15 09:17:35 +08:00
winlin
b1187b8c66 update readme 2015-01-08 19:04:19 +08:00
winlin
c80477d58e update readme. 2015-01-08 19:03:41 +08:00
winlin
b466756931 merge from feilong for bug #281. 2015-01-08 17:44:08 +08:00
winlin
27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 2015-01-08 17:37:28 +08:00
winlin
32657b0a50 update readme 2015-01-04 16:37:33 +08:00
winlin
2ea1c4fb61 update readme for security 2015-01-03 22:31:10 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 2015-01-03 15:08:46 +08:00
winlin
247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 2015-01-03 15:07:12 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 2015-01-02 12:57:44 +08:00
winlin
e590537dca fix #207, trim the last 0 of log. 1.0.18 2015-01-02 12:56:15 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 2015-01-02 09:22:49 +08:00
winlin
ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 2015-01-02 09:20:45 +08:00
winlin
518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 2015-01-02 09:05:16 +08:00
winlin
c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 2015-01-01 11:47:18 +08:00
winlin
bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 2015-01-01 11:44:28 +08:00
winlin
12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 2014-12-29 14:24:22 +08:00
winlin
c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 2014-12-29 09:07:50 +08:00
winlin
d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 2014-12-29 09:05:56 +08:00
winlin
e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 2014-12-29 08:45:19 +08:00
winlin
a1a9d636aa update readme for merged from 1.0release 2014-12-29 08:41:56 +08:00
winlin
513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 2014-12-29 08:38:29 +08:00
winlin
a7b6974dcb Merge branch '1.0release' into develop 2014-12-26 23:06:12 +08:00
winlin
e77e4cfb8b hotfix 1.0release, add gitlab remote mirror 2014-12-26 23:06:02 +08:00
winlin
a576bb20b6 merge from hotfix 1.0release. 2014-12-26 21:45:00 +08:00
winlin
02ec771030 hotfix 1.0release, update the system requirements. 2014-12-26 21:41:08 +08:00
winlin
49daee34b4 hotfix 1.0release, remove the multiple process arch, for 2.0 supports huge connections, and 3.0 will use other arch without st. 2014-12-26 21:39:53 +08:00
winlin
5a0bfd4fe2 test git, hotfix on release 1.0 branch. 2014-12-26 21:25:07 +08:00
winlin
3218efd242 merge from 1.0 2014-12-26 12:59:54 +08:00
winlin
ac11e33ea7 update readme for #264 2014-12-26 12:48:34 +08:00
winlin
9b8f6ff962 update readme, use table for performance. 2014-12-16 09:57:14 +08:00
winlin
b9147af38a update readme, use table for performance. 2014-12-16 09:55:31 +08:00
winlin
0133913b7c update readme, for latence refined. 2014-12-16 09:31:00 +08:00
winlin
bacbec6647 update readme 2014-12-13 12:50:23 +08:00
winlin
cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 2014-12-13 12:48:49 +08:00
winlin
66fd4bbf31 update readme 2014-12-13 10:41:14 +08:00
winlin
450eeb8dd6 update readme 2014-12-13 10:35:40 +08:00
winlin
d276ff3367 add latency benchmark table. 2014-12-13 10:34:00 +08:00
winlin
0af1154293 add latency benchmark table. 2014-12-13 10:32:39 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
149d5863e9 update reame 2014-12-08 11:06:33 +08:00
winlin
6a49ae4ffb update readme, for 10k performance 2014-12-08 09:51:51 +08:00
winlin
ffacf1b774 update 2.0 history for 1.0 released. 2014-12-07 16:45:20 +08:00
winlin
8c1023d816 fix #251, 10k+ clients, use queue cond wait and fast vector. 2.0.67 2014-12-07 16:43:14 +08:00
winlin
71155fc3d2 update readme for 1.0release 2014-12-07 16:39:22 +08:00
winlin
ed93c50218 update readme. 10k clients. 2014-12-07 16:36:00 +08:00
winlin
8aff915538 release SRS 1.0 2014-12-05 18:00:56 +08:00
winlin
cdb1984ba4 update readme 2014-12-05 17:24:40 +08:00
winlin
cd317859db add mw sleep time and msgs/iovs table. 2014-12-05 17:07:27 +08:00
winlin
9ee138746f for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57 2014-12-05 16:44:11 +08:00
winlin
fad6074a25 set send socket buf. mw/mr sleep default to 350. 2014-12-05 11:24:05 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
72fa33d9fb update performance to 4k, when mr_sleep to 2000ms. 2.0.52 2014-12-04 18:46:08 +08:00
winlin
5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 2014-12-04 18:21:04 +08:00
winlin
4b09531e2f for bug #241, simplify the merged read config macros. 2014-12-04 15:33:17 +08:00
winlin
310f51e6a1 update readme. 2014-12-04 15:00:22 +08:00
winlin
b84e87845e update readme 2014-12-04 14:14:29 +08:00
winlin
511a482fba for bug #241 and #248, improve about 25% performance. 2.0.50 2014-12-04 14:05:35 +08:00
winlin
fd5ef89030 update readme 2014-12-04 13:06:21 +08:00
winlin
19b1d750aa update readme 2014-12-03 19:51:04 +08:00
winlin
c083238760 update readme. 2014-12-03 12:35:50 +08:00
winlin
a88962daf2 update readme. 2014-12-03 12:24:29 +08:00
winlin
f70027cdeb update readme. 2014-12-03 12:21:26 +08:00
winlin
bf99069ed1 update readme. 2014-12-03 12:11:00 +08:00
winlin
787ab674e3 fix #244, conn thread use cond to wait for recv thread error. 2.0.47. 2014-12-03 12:08:29 +08:00
winlin
5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45. 2014-12-02 15:41:54 +08:00
winlin
9bda56cb42 update readme for bug #239 2014-12-02 15:39:32 +08:00
winlin
304208f822 fix #239, traverse the token before response connect. 1.0.10. 2014-12-02 15:27:36 +08:00
winlin
3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 2014-12-02 12:19:17 +08:00
winlin
212a9aa78c for bug #237, refine syscall for recv, supports 1.5k clients. 2.0.41. 2014-12-02 12:18:33 +08:00
winlin
af83e18d7e update the README for 1.5k publishers. 2.0.41 2014-12-02 07:27:20 +08:00
winlin
47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 2014-12-01 10:58:17 +08:00
winlin
efb73c5487 fix #235, refine handshake, replace union with template method. 2.0.38. 2014-11-29 18:41:14 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 2014-11-25 10:07:41 +08:00
winlin
32cf44e5bb update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:01:14 +08:00
winlin
5fde890603 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 09:50:57 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
5408169b6e update readme 2014-11-22 17:59:42 +08:00
winlin
58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 2014-11-22 17:58:02 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
d6072b16c0 support compile srs-librtmp on windows. 2.0.26 2014-11-19 16:16:04 +08:00
winlin
89110d9748 add report bug url. update readme 2014-11-18 17:52:41 +08:00
winlin
1bf32a15e1 refs #1670: update readme, SRS1.0/2.0 supports 500 clients to publish streams. 2014-11-18 16:31:26 +08:00
winlin
c1e9aed0ac all wiki translated to English. 1.0.7 2014-11-18 13:41:36 +08:00
winlin
fbcb63f775 v2.0, 2014-11-18, all wiki translated to English. 2.0.23. 2014-11-18 13:40:58 +08:00
winlin
520764fba3 update readme, add qq group. 2014-11-16 21:11:49 +08:00
winlin
a7faf54567 update readme, add qq group. 2014-11-16 21:11:10 +08:00
winlin
7f987bb2a0 update readme, add qq group. 2014-11-16 21:08:36 +08:00
winlin
ba5b3b92b1 update readme, add qq group. 2014-11-16 21:08:06 +08:00
winlin
2599165f90 update 1.0release readme, remove the unstable features. 2014-11-16 12:11:11 +08:00
winlin
c3986d9d6d update readme for wiki 2014-11-15 21:25:18 +08:00
winlin
8878367505 update readme for wiki 2014-11-15 21:24:47 +08:00
winlin
64a1d975d7 update readme for wiki 2014-11-15 21:16:11 +08:00
winlin
3f9e11ea83 update readme for wiki 2014-11-15 21:13:24 +08:00
winlin
68a09d5b5c update readme for wiki 2014-11-15 20:10:48 +08:00
winlin
3247121619 update readme for wiki 2014-11-15 20:09:05 +08:00
winlin
81b0f246f5 update readme for wiki 2014-11-15 20:08:19 +08:00
winlin
55d4c71362 update readme for wiki 2014-11-15 20:03:55 +08:00
winlin
273ba9c2e5 update readme for wiki 2014-11-15 19:54:00 +08:00
winlin
dca060dcde update readme for wiki 2014-11-15 19:50:02 +08:00
winlin
e70e864e5d add h264 stream publish usage. 2014-11-15 17:13:09 +08:00
winlin
fed87b3986 update readme, typo 2014-11-15 16:59:41 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 2014-11-15 14:29:25 +08:00
winlin
9b2da59eeb update readme 2014-11-14 17:33:34 +08:00
winlin
55d4ce603e update readme 2014-11-14 11:40:55 +08:00
winlin
1f5c82ecc4 update readme 2014-11-13 14:54:40 +08:00
winlin
eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 2014-11-13 14:48:21 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 2014-11-13 12:25:56 +08:00
winlin
8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 2014-11-12 12:59:53 +08:00
winlin
46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 2014-11-11 13:40:09 +08:00
winlin
4f34ac022f add benchmark for 1.0.5/2.0.12, 2700clients, 85%CPU, 66MB. 2014-11-11 13:36:54 +08:00
winlin
845c1e9329 update readme 2014-11-10 10:03:16 +08:00
winlin
f9a7d40364 update readme 2014-11-10 09:56:43 +08:00
winlin
9172dc14dc update the death link for readme. 2014-11-09 09:45:00 +08:00
winlin
2dde5dc89d update readme 2014-11-08 20:35:44 +08:00
winlin
805ff7b1be update readme for srs-librtmp 2014-11-08 20:08:08 +08:00
winlin
6968aef66a update readme for srs-librtmp 2014-11-08 20:06:31 +08:00
winlin
3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 2014-11-08 18:33:15 +08:00
winlin
926650840e fix #191, configure --export-librtmp. 2.0.10. 2014-11-08 16:45:50 +08:00
winlin
106bef802f fix #66, srs-librtmp support write h264 raw packet. 2.0.9. 2014-11-08 12:36:00 +08:00
winlin
f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 2014-11-06 14:28:03 +08:00
winlin
d88a2cc8dc update readme 2014-10-27 12:18:50 +08:00
winlin
74f7c32e81 update readme, add oschina mirror. 2014-10-27 11:35:09 +08:00
winlin
ff76afa81a update readme 2014-10-27 11:34:05 +08:00
winlin
85c2398e78 update readme. 2014-10-25 17:16:38 +08:00
winlin
6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 2014-10-25 17:12:56 +08:00
winlin
f4b779060b add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:36 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
fe59783d83 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:28:50 +08:00
winlin
d8e55d14cd rename EN/CN home 2014-10-24 11:10:41 +08:00
winlin
8295750821 rename EN/CN home 2014-10-24 11:10:30 +08:00
winlin
1bfc238fec hotfix for bug #186, drop connect args when not object. 2.0.4. 2014-10-24 10:35:40 +08:00
winlin
aa98ca60b9 fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3. 2014-10-24 10:34:00 +08:00
winlin
77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:01:00 +08:00
winlin
a169262099 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:00:23 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +08:00
winlin
6da21364f6 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:55:58 +08:00
winlin
b9b345ec37 update readme, ENHome_v1 to v1_ENHome 2014-10-24 09:44:05 +08:00
winlin
abe2779a37 update readme. 2014-10-21 09:46:40 +08:00
winlin
616d1cb2b3 update readme. 2014-10-20 09:52:19 +08:00
winlin
57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 2014-10-19 19:42:27 +08:00
winlin
bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 2014-10-19 11:33:56 +08:00
winlin
1f0f98ff04 update readme. 2014-10-18 14:04:52 +08:00
winlin
9ab6ff15fe remove supports for OSX. 2.0.1. 2014-10-18 13:58:47 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
4fe5a9bdb3 update readme 2014-10-18 11:03:15 +08:00
winlin
a4d1b136d8 update readme 2014-10-18 11:01:35 +08:00
winlin
b1b70cdf09 update readme. 2014-10-18 10:55:26 +08:00
winlin
e707006a68 revert github srs README to English. 2.0.0. 2014-10-16 10:58:20 +08:00
winlin
ba868da7c4 refine readme. 2014-10-16 10:37:33 +08:00
winlin
4ab4ce29bb refine readme. 2014-10-16 10:29:26 +08:00
winlin
cba9e51845 refine readme. 2014-10-16 10:21:12 +08:00
winlin
8053f0ba9d refine readme. 2014-10-16 09:22:05 +08:00
winlin
9b90a7444f remove all chinese in readme. 2014-10-16 09:19:09 +08:00
winlin
75f3df5d30 remove qq url. 2014-10-16 08:57:18 +08:00
winlin
cb7f3a82c7 remove qq url. 2014-10-16 08:56:54 +08:00
winlin
1bf6c32deb I donot think QQ is neccessary. 2014-10-15 15:08:37 +08:00
winlin
48e187a75d I donot think QQ is neccessary. 2014-10-15 15:07:19 +08:00
winlin
b370b176d4 update readme for 1.0beta 2014-10-09 15:22:07 +08:00
winlin
e455032dc7 update readme for 1.0beta 2014-10-09 14:53:44 +08:00
winlin
1d939f55ba update readme for 1.0beta. 2014-10-09 13:07:08 +08:00
winlin
570d2a450e update readme for 1.0beta. 2014-10-09 13:06:00 +08:00
winlin
fed8c31c5d update readme for 1.0beta. 1.0.0 2014-10-09 12:58:51 +08:00
winlin
9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 2014-10-08 15:15:57 +08:00
winlin
f33f91c8c2 update readme. 2014-10-08 14:06:33 +08:00
winlin
b830b995e6 fix bug #162, requires epoll. 0.9.222 2014-10-08 13:27:48 +08:00
winlin
f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 2014-09-30 11:21:46 +08:00
winlin
20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 2014-09-26 17:47:43 +08:00
winlin
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
winlin
728b749384 fix #167, add openssl includes to utest. 0.9.209. 2014-08-28 13:32:13 +08:00
winlin
d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 2014-08-27 13:31:39 +08:00
winlin
42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 2014-08-24 22:34:38 +08:00
winlin
cb311d998e fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206. 2014-08-22 12:47:50 +08:00
winlin
bda12e32f7 change plan to no-plan, for release 1.0 is feature-freezed. 2014-08-20 09:42:44 +08:00
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 2014-08-17 20:38:51 +08:00
winlin
8d5016f11b correct the readme for OSX(darwin), donot support it well, see bug #155. 2014-08-17 12:48:52 +08:00
winlin
08bc34e0df refine wiki, cluster to forward. 2014-08-14 16:33:26 +08:00
winlin
1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 2014-08-06 15:45:40 +08:00
winlin
5b28355a0b fix #147, support identify the srs edge. 0.9.190. 2014-08-06 09:57:30 +08:00
winlin
b703bb0fb5 update use nginx of ossrs.net 2014-08-03 22:32:47 +08:00
winlin
cc2633902a for 1.0 mainline7, 0.9.189, update readme. 2014-08-03 22:23:56 +08:00
winlin
902ae58534 for 1.0 mainline7, 0.9.189, update readme. 2014-08-03 22:12:38 +08:00
winlin
67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 2014-08-03 21:50:48 +08:00
winlin
ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 2014-08-03 21:22:40 +08:00
winlin
6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 2014-08-03 20:27:57 +08:00
winlin
5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 2014-08-03 13:06:37 +08:00
winlin
d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 2014-08-03 10:42:01 +08:00
winlin
84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 2014-08-02 19:24:49 +08:00
winlin
721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 2014-08-02 09:54:21 +08:00
winlin
f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 2014-07-31 10:37:34 +08:00
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
Steven Liu
3ff3938c8e Update README.md 
Update the Support platform from IOS to OSX
IOS is Embeded platform OS for Apple,
OSX is the X86 or PowerPC Platform OS for MacBook, IMac, Or Apple PC OS
 2014-07-28 08:29:21 +08:00
winlin
118ec29f8e refine the code for ios build. add authors StevenLiu. 0.9.177 2014-07-27 21:57:22 +08:00
winlin
df8414af63 api connections add udp, add disk iops. 0.9.176 2014-07-27 17:16:04 +08:00
winlin
13abb0d768 complete config utest. 0.9.173 2014-07-26 19:57:32 +08:00
winlin
b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 2014-07-26 12:22:39 +08:00
winlin
402f6e86df use nginx to delivery the web 2014-07-23 15:54:05 +08:00
winlin
91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 2014-07-23 11:21:35 +08:00
winlin
ffa72d3522 update readme. 2014-07-21 09:34:22 +08:00
winlin
4b1d64c2d1 [plan] Support <500ms latency, FRSC(fast RTMP-compatible stream channel tech). 2014-07-21 09:23:05 +08:00
winlin
044d6484a4 [plan] Support <500ms latency, use io to substitude timeout. 2014-07-21 09:09:10 +08:00
winlin
f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 15:20:16 +08:00
winlin
3218b042b8 update readme for 1.0 mainline6, 0.9.160 2014-07-13 20:57:35 +08:00
winlin
d609fbc7ce 1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines. 2014-07-13 20:39:31 +08:00
winlin
b3d3f9ce35 refine the bandwidth check/test, add as/js library, use srs-librtmp for linux tool. 0.9.159 2014-07-13 19:46:15 +08:00
winlin
7f21520e9f Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-07-12 10:49:25 +08:00
winlin
57471a7615 do performance test, support 2.7kclient, 500kbps 2014-07-12 10:46:48 +08:00
winlin
e7bb0896d3 Update README.md 2014-07-12 10:42:16 +08:00
winlin
83c419035e Update README.md 2014-07-12 10:41:17 +08:00
winlin
7e737db323 Update README.md 2014-07-12 10:40:43 +08:00
winlin
10b5058052 do performance test, support 2.7kclient, 500kbps 2014-07-12 10:38:09 +08:00
winlin
8f8db41faf do performance test, support 2.7kclient, 500kbps 2014-07-12 10:36:01 +08:00
winlin
bd69b337de do performance test, support 2.7kclient, 500kbps 2014-07-12 10:35:11 +08:00
winlin
6d12280b7c do performance test, support 2.7kclient, 500kbps 2014-07-12 10:32:11 +08:00
winlin
e2d273f493 do performance test, support 1.8k, improve 22% 2014-07-12 10:26:09 +08:00
winlin
1ccb52bac6 complete rtmp stack utest. 0.9.156 2014-07-12 09:04:59 +08:00
winlin
2ddd805297 update readme, add BLE. 2014-07-10 08:55:16 +08:00
winlin
d8ca8df7d0 fix #81: fix HLS codec info, IOS ok. 0.9.153. 2014-07-06 14:32:19 +08:00
winlin
57fa1ce6ec fix #81: fix HLS codec info, IOS ok. 0.9.153. 2014-07-06 14:31:48 +08:00
winlin
23a974b5e8 update readme. 2014-07-05 23:32:33 +08:00
winlin
034120c668 update readme 2014-07-05 15:31:50 +08:00
winlin
28a6a1214c update readme, add stream products list. 2014-07-05 12:29:56 +08:00
winlin
d971700b82 update readme, add stream products list. 2014-07-05 12:28:58 +08:00
winlin
e81d919289 update readme, add stream products list. 2014-07-05 12:23:41 +08:00
winlin
e6c08210f1 Update README.md 2014-07-02 23:57:11 +08:00
winlin
fb70602f93 fix #111, always use 31bits timestamp. 0.9.143. 2014-06-30 21:23:13 +08:00
winlin
fea8755719 response the call message with null. 0.9.137 2014-06-28 16:43:57 +08:00
winlin
4843c525b4 update readme, fix the date of history. 2014-06-28 11:50:19 +08:00
winlin
a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 2014-06-28 10:57:58 +08:00
winlin
b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 2014-06-27 13:35:28 +08:00
winlin
7de95c12e0 update readme for 1.0 mainline5 2014-06-27 10:54:42 +08:00
winlin
f800753997 prepare release 1.0 mainline5 2014-06-27 10:23:52 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
6c70e9192b performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:02:02 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
e9c96af91a add wiki and conf for token traverse auth 2014-06-21 12:58:33 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
094d82bd06 add connections count to api summaries. 0.9.127 2014-06-19 18:49:05 +08:00
winlin
6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 2014-06-19 15:28:05 +08:00
winlin
d0b08d0d51 add network bytes to api summaries. 0.9.125 2014-06-18 16:13:02 +08:00
winlin
18a7399b6b update the status of srs main. 2014-06-16 15:59:54 +08:00
winlin
0d96ee491d update branch status 2014-06-15 11:51:03 +08:00
winlin
de948b2892 update branch status 2014-06-15 11:48:12 +08:00
winlin
3d9fc3dcd3 update branch status 2014-06-15 11:47:13 +08:00
winlin
c84074f3da update branch status 2014-06-15 11:46:38 +08:00
winlin
f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 2014-06-14 20:44:38 +08:00
winlin
de591138dd use ossrs.net 2014-06-13 15:21:59 +08:00
winlin
b66ae86ee5 update readme 2014-05-30 11:44:30 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +08:00
winlin
99cfbaaad9 update readme 2014-05-28 13:27:38 +08:00
winlin
8897eb959a add RTMP 302 redirect dev plan 2014-05-28 11:47:34 +08:00
winlin
d71fd9822e update readme for 1.0 mainline4 2014-05-28 10:27:51 +08:00
winlin
df2e8f16b7 release 1.0 mainline4, 0.9.120 2014-05-28 09:33:48 +08:00
winlin
978e985519 fix #87: add source id for full trackable log. 0.9.120 2014-05-27 19:18:31 +08:00
winlin
b28593894b fix #84: unpublish when edge disconnect. 0.9.119 2014-05-27 18:00:55 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
870dc334ac fix #76: allow edge vhost to add or remove. 0.9.114 2014-05-25 10:09:48 +08:00
winlin
b4a31be0eb update readme 2014-05-25 10:09:01 +08:00
winlin
fe4a23e94a update readme 2014-05-25 09:50:12 +08:00
winlin
361daf0203 update readme 2014-05-25 09:46:03 +08:00
winlin
624b74cbd9 update readme 2014-05-25 09:43:27 +08:00
winlin
763f644098 revert to ip for ossrs.net is unavailable now 2014-05-25 00:35:14 +08:00
winlin
d0251c1196 update readme 2014-05-24 23:28:25 +08:00
winlin
2cd983ee61 update readme 2014-05-24 19:00:46 +08:00
winlin
0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 2014-05-23 17:23:33 +08:00
winlin
e6c99ce1f1 update readme 2014-05-23 10:37:53 +08:00
winlin
32fc6a05c8 update readme 2014-05-22 16:49:57 +08:00
winlin
7f48590239 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:29:42 +08:00
winlin
c8f80414ef update readme 2014-05-22 15:13:57 +08:00
winlin
60fdab7b3b fix #74, add tcUrl for http callback on_connect, 0.9.109 2014-05-22 10:25:20 +08:00
winlin
5bb6e657c3 support http heartbeat, 0.9.107 2014-05-19 17:39:25 +08:00
winlin
98b564ce64 update readme for 1.0 mainline3 2014-05-18 18:51:05 +08:00
winlin
dab8114f41 update readme for 1.0 mainline3 2014-05-18 18:45:23 +08:00
winlin
88bed84134 update readme 2014-05-18 18:14:15 +08:00
winlin
3dc8413a02 update readme 2014-05-18 18:13:30 +08:00
winlin
5e5d3679d3 update readme 2014-05-18 18:09:14 +08:00
winlin
a39300db8a update readme 2014-05-18 18:07:19 +08:00
winlin
5930eab72f update readme 2014-05-18 18:06:16 +08:00
winlin
ac644e26e0 update readme 2014-05-18 17:59:54 +08:00
winlin
0186247fee support http api json, to PUT/POST. 0.9.105 2014-05-18 17:57:20 +08:00
winlin
74e6e28993 refine the kbps calc module. 0.9.93 2014-05-12 18:06:13 +08:00
winlin
1c1efd7000 update readme, update api server stream list 2014-05-10 14:01:40 +08:00
winlin
e3e779b991 update reame. 2014-05-09 09:52:35 +08:00