92 commits

Author	SHA1	Message	Date
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	20ebf68ea5	fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.	2014-09-26 17:47:43 +08:00
winlin	002facb85b	refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215	2014-09-26 16:34:13 +08:00
winlin	83f266b9e2	fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.	2014-09-25 10:59:29 +08:00
winlin	901c9590e4	refine log, log important to file. 1.0.210	2014-08-29 15:07:04 +08:00
winlin	e9e0cd757c	fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.	2014-08-19 10:59:59 +08:00
winlin	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	2014-08-16 19:59:14 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +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	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	7207c2f435	refine config, check all config item name.	2014-07-25 10:44:04 +08:00
winlin	1c27f3b913	refine config, warning when feature disabled.	2014-07-25 09:38:48 +08:00
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	2014-07-22 11:01:20 +08:00
winlin	77236920b6	add config utest, for default vhost	2014-07-21 12:13:01 +08:00
winlin	f1b1dc0c64	add utest for config full.conf, fix the chunk-size bug	2014-07-21 10:50:08 +08:00
winlin	c65a6b5d63	fix the conf_line bug of parse config directive.	2014-07-20 16:16:29 +08:00
winlin	86ad39f001	finish basic utest for config	2014-07-20 15:53:19 +08:00
winlin	baa20b2f31	refine the config consts	2014-07-20 13:16:24 +08:00
winlin	736ec48c71	move some consts to kernel consts	2014-07-20 13:11:53 +08:00
winlin	073d900674	add consts to kernel	2014-07-20 13:04:48 +08:00
winlin	9bf7b722db	fix #119: use iformat and oformat for ffmpeg transcode.	2014-07-19 10:54:38 +08:00
winlin	2f0a72d7d1	refine config, add comments	2014-07-18 12:12:25 +08:00
winlin	a5f4323ea8	refine config, add comments	2014-07-18 11:46:29 +08:00
winlin	b4e2d70390	refine config comments, return the engines of transcode.	2014-07-18 11:15:59 +08:00
winlin	2293700728	refine config, remove the const string&	2014-07-18 10:56:06 +08:00
winlin	1accd8c790	refine config, add comments.	2014-07-18 10:50:02 +08:00
winlin	f572531eca	refine config, return the vhosts vector.	2014-07-18 10:35:31 +08:00
winlin	96e0e699dd	refine the get port, return a vector<string> contains ports.	2014-07-18 10:21:34 +08:00
winlin	b37aeff8d5	refine config, check name	2014-07-17 12:07:01 +08:00
winlin	25180c51b4	refine the config comments.	2014-07-17 11:53:51 +08:00
winlin	1e8981eb08	extracta parse_buffer for config	2014-07-17 11:34:49 +08:00
winlin	784d7499cf	refine config, add error line log	2014-07-17 11:28:20 +08:00
winlin	9f7d488fa4	refine config, add comments.	2014-07-17 11:05:09 +08:00
winlin	f6b084b679	remove the reload create function.	2014-07-16 11:59:44 +08:00
winlin	f4ffe0aaee	refine config, move file buffer to internal namespace	2014-07-16 11:49:34 +08:00
winlin	921b7d239f	refine code, use macro for hls resample audio	2014-07-05 23:43:28 +08:00
winlin	95e73d0be1	remove the config log http api. 0.9.148	2014-07-05 13:02:50 +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	55b99c90c7	refine detect tool, support atc stream.	2014-06-11 14:16:44 +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	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	d6355efe22	support http api json, to PUT/POST, to 0.9.103	2014-05-18 16:15:35 +08:00
winlin	a1fed15789	add uptime, startup time, load to api	2014-05-08 15:45:51 +08:00