922 commits

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