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

1135 commits

Author SHA1 Message Date
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