852 commits

Author	SHA1	Message	Date
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	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	2015-04-03 10:56:56 +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	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	2015-03-31 15:39:47 +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	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