253 commits

Author	SHA1	Message	Date
winlin	7d86c6d9e9	for bug #293, refine for fast cache of http stream.	2015-01-22 13:16:54 +08:00
winlin	25807298ad	alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux	2015-01-22 09:34:33 +08:00
winlin	bb1331cc91	update conf.	2015-01-20 13:46:50 +08:00
winlin	b735e29d05	refine conf, add port.	2015-01-20 12:02:25 +08:00
winlin	e5ef4c2e66	update the conf of http static and stream.	2015-01-20 10:53:57 +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	eff2d81016	for #293, add http flv stream	2015-01-18 18:00:40 +08:00
winlin	2742c0d3c2	for #277, support http vhost mount.	2015-01-18 16:38:26 +08:00
winlin	4513486266	refine http server, support mount dir for vhost.	2015-01-18 13:34:26 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	7f60d472e6	remove the change vhost forward.	2015-01-03 14:47:19 +08:00
winlin	45724bfaec	update conf for transcode.	2015-01-03 14:46:29 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	2014-12-13 10:13:49 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	68ade0a267	add log info for rtmp conn. change the mw_latency to 100 for realtime.	2014-12-10 18:06:09 +08:00
winlin	a3de1c71fc	reset the mw_latency to 350.	2014-12-08 09:49:45 +08:00
winlin	1311b6fe65	fix #251, support 10k clients. 2.0.67	2014-12-07 16:31:47 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:06 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:58:53 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +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	cc8dc0fee0	remove the not-supported features, add bug #163, #164.	2014-08-20 09:18:07 +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	33bc8755ab	refine code, add comments for ossrs.net monitor.	2014-08-04 10:50:28 +08:00
winlin	84450e1588	fix #138, fix http hooks bug, regression bug. 0.9.184.	2014-08-02 19:24:49 +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	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	ebf9e560b1	refine the max connections, compare the system ulimit max open files, error when exeed limit	2014-07-26 15:34:45 +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	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	e9c96af91a	add wiki and conf for token traverse auth	2014-06-21 12:58:33 +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	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