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 |
|