260 commits

Author	SHA1	Message	Date
winlin	37ceadd865	sync the conf file	2014-07-27 19:11:51 +08:00
winlin	6f700f3f40	rename network_device_index to network	2014-07-27 18:40:32 +08:00
winlin	f4ea48adcb	rename network_device_index to network	2014-07-27 18:39:20 +08:00
winlin	b334021836	add config item for the stat disk device name	2014-07-27 16:52:00 +08:00
winlin	abef029610	refine full conf	2014-07-27 15:04:31 +08:00
winlin	e76036f40b	refine config heartbeat, add new stats. 0.9.175	2014-07-27 14:43:55 +08:00
winlin	30ebba0673	add config check utest	2014-07-26 15:54:40 +08:00
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	2014-07-22 11:01:20 +08:00
winlin	9bf7b722db	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 10:54:38 +08:00
winlin	55989b4bc8	remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139	2014-06-29 10:43:53 +08:00
winlin	a3f9aa7e1e	fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136	2014-06-28 10:57:58 +08:00
winlin	1970e18ed6	fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133	2014-06-25 17:14:11 +08:00
winlin	f173345e15	support report summaries in heartbeat. 0.9.132	2014-06-23 15:44:49 +08:00
winlin	1ae3e6c64c	performance refine, support 3k+ connections(270kbps). 0.9.130	2014-06-22 20:01:25 +08:00
winlin	41857edaee	support edge token traverse, fix #104. 0.9.129	2014-06-21 12:39:04 +08:00
winlin	d74921e1ab	fix #89, config to /dev/null to disable ffmpeg log. 0.9.117	2014-05-27 14:10:46 +08:00
winlin	6bc0ecece7	add dvr, http heartbeat conf sample	2014-05-22 17:13:57 +08:00
winlin	d4b8fee61a	fix bug #73, http callback api support authentication in tcUrl	2014-05-22 10:23:12 +08:00
winlin	ef0f7f4da8	support http heartbeat, 0.9.107	2014-05-19 17:39:01 +08:00
winlin	7c804277b2	add heatbeat url, add stream for api-server	2014-05-19 15:27:05 +08:00
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	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	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	c11e266d5c	update readme	2014-04-07 15:04:31 +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	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	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	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	ed20bd7078	default write log to file.	2014-03-23 14:51:35 +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
winlin	d94b9f44b3	add srs_log_file to write log to file. change to 0.9.27	2014-03-23 12:21:36 +08:00
winlin	3c920b933c	add ./etc/init.d/srs, refine configure to support make clean then make.	2014-03-22 20:53:29 +08:00
winlin	f25c6558a5	write pid to ./objs/srs.pid.	2014-03-21 15:45:34 +08:00
winlin	a0c0c94cf0	refine conf, add comments for other listen type	2014-03-21 14:00:26 +08:00
winlin	b7d40b5aba	support vn/an to disable video/audio, for radio streaming	2014-03-19 22:45:58 +08:00
winlin	b52a051d80	refine readme, confs	2014-03-18 15:38:34 +08:00
winlin	b36338853a	refine the conf files, rename srs.conf to demo.conf	2014-03-18 15:13:25 +08:00