143 commits

Author	SHA1	Message	Date
winlin	a4410a4fa9	update pithy-print to 10s. refine log	2014-05-04 10:45:13 +08:00
winlin	fc501b050b	add atc_auto to disable or enable auto detect atc	2014-04-30 12:08:11 +08:00
winlin	30bb3ff704	add dvr_plan hss to full.conf	2014-04-30 11:56:19 +08:00
winlin	0622004eff	update conf, add todo for edge/forward	2014-04-29 09:10:17 +08:00
winlin	2bcaeccc51	edge support play and ingest origin stream. change to 0.9.77	2014-04-26 21:41:18 +08:00
winlin	d6948d613f	add author byteman for h264 to flv.	2014-04-25 15:27:50 +08:00
winlin	bfd1d07827	update readme	2014-04-24 17:46:10 +08:00
winlin	3ed59f190b	refine srs live flashP2P(integrated by chnvideo)	2014-04-24 17:38:57 +08:00
winlin	67e1988b81	support live flashP2P(integrated by chnvideo VDN). 0.9.75	2014-04-24 16:32:19 +08:00
winlin	733ca2475d	call http api when dvr got keyframe	2014-04-22 17:32:45 +08:00
winlin	03af43017d	update dvr config comments	2014-04-17 18:32:43 +08:00
winlin	2d1c28cff9	update dvr, support segment plan	2014-04-17 17:35:21 +08:00
winlin	73459547e1	support dvr. change to 0.9.69	2014-04-17 16:06:49 +08:00
winlin	28231cadda	add transcode for demo meeting hls.	2014-04-16 16:40:54 +08:00
winlin	ae3f7d9cb8	change meeting hls to an	2014-04-16 16:18:02 +08:00
winlin	b1877db405	fix typo of full.conf. fix api server bug	2014-04-14 17:31:59 +08:00
winlin	821b58af03	support reload atc	2014-04-12 22:00:27 +08:00
winlin	9eb76cb1eb	update demo.conf	2014-04-11 14:40:38 +08:00
winlin	189da7e12e	fix bug of demo.conf	2014-04-11 14:23:19 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	64727ce616	add bandwidth test conf	2014-04-10 17:41:55 +08:00
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	4af7b6e383	update conf file, add id for ingest.	2014-04-08 15:51:43 +08:00
winlin	5a3b59d3c8	update conf file, add id for ingest.	2014-04-08 15:47:52 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +08:00
winlin	05e22e9530	fix script run/build/stop bug	2014-04-07 15:26:21 +08:00
winlin	c11e266d5c	update readme	2014-04-07 15:04:31 +08:00
winlin	3d073f9ef6	update demo script, remove ffmpeg publish. use ingest instead	2014-04-07 14:33:27 +08:00
winlin	e89ab84e4e	implements ingest, change to 0.9.53	2014-04-07 14:20:03 +08:00
winlin	2742679354	implements the ingest framework	2014-04-07 13:32:00 +08:00
winlin	7384ad0caa	add ingest config section of full.conf	2014-04-06 21:26:57 +08:00
winlin	d546f815df	update build/run/stop script	2014-04-06 19:13:29 +08:00
winlin	43979f7505	add htt.hls sample	2014-04-05 13:56:14 +08:00
winlin	30e3323fe4	update readme, add SampleHTTP link	2014-04-05 13:38:05 +08:00
winlin	00eda0d7b2	implements the http stream module.	2014-04-04 23:04:38 +08:00
winlin	83f35d10b1	add http delivery framework	2014-04-04 18:55:21 +08:00
winlin	b7093246e4	fix forward conf file bug, change pid file. change to 0.9.48	2014-04-04 15:35:17 +08:00
winlin	3f13726544	add log level in conf. change to 0.9.45	2014-04-03 18:32:51 +08:00
winlin	ec6d696565	refine http framework, use http message	2014-04-02 12:03:49 +08:00
winlin	c7a4dd8863	move wiki images to srs.release	2014-03-31 11:35:00 +08:00
winlin	aa89f9f51e	change to 0.9.37, for http api/stream	2014-03-27 12:14:04 +08:00
winlin	041a07dfda	add http config in srs conf	2014-03-26 23:19:50 +08:00
winlin	4c8d6d2eb1	fix bug of hls and rename demo player stream to live/demo. change to 0.9.36	2014-03-26 18:13:33 +08:00
winlin	97435c6bb4	fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir	2014-03-26 16:57:20 +08:00
winlin	0858bd8b6f	Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35	2014-03-26 16:25:02 +08:00
winlin	9055d8eecf	update readme.	2014-03-23 18:03:24 +08:00
winlin	ed20bd7078	default write log to file.	2014-03-23 14:51:35 +08:00
winlin	76290a5a12	fix bug of get daemon	2014-03-23 14:47:09 +08:00
winlin	7930add7f9	add log tank config, default to console.	2014-03-23 14:40:55 +08:00
winlin	3ec3c1f532	support daemon	2014-03-23 12:42:05 +08:00