676 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
panda1986	797c1b0762	support all acodec. not forced to aac.	2015-01-20 14:06:27 +08:00
panda1986	e7d54c2ca9	Update srs_app_ffmpeg.cpp ... srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断	2015-01-20 13:52:31 +08:00
winlin	5f194bc87c	merge from feilong, the crash for cosumer wait.	2015-01-19 14:05:59 +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	29a8932b49	for bug #293, use http stream cache for android weixin to happy.	2015-01-19 12:56:05 +08:00
winlin	f9f2fcbb9c	for #293, add http stream cache for audio mp3/aac stream.	2015-01-19 12:24:18 +08:00
winlin	d364a81d8f	for #293, support http mp3 streaming	2015-01-19 10:13:43 +08:00
winlin	99bf397487	for bug #293, add mp3 id3 spec	2015-01-19 09:25:07 +08:00
winlin	b04888a35d	for #293, #277, support http chunked encoding	2015-01-19 01:05:24 +08:00
winlin	3244c083c7	for bug #293, support http aac stream	2015-01-19 00:05:12 +08:00
winlin	7674524c31	for #239, empty the aac encoder	2015-01-18 22:56:01 +08:00
winlin	c0233542bf	for #293, add aac encoder for http aac stream.	2015-01-18 22:51:07 +08:00
winlin	c0a7752718	for #293, add aac mime audio/x-aac	2015-01-18 21:17:41 +08:00
winlin	d546827b1c	for #293, refine the mime of content type.	2015-01-18 21:04:52 +08:00
winlin	3b853a6dbd	fix #293, support rtmp remux to http flv live stream.	2015-01-18 20:07:54 +08:00
winlin	eea31ef4f3	for #293, support rtmp remux to http flv live stream.	2015-01-18 19:49:03 +08:00
winlin	faaa9187f2	for #293, mount http flv stream when publish.	2015-01-18 18:50:15 +08:00
winlin	2698e6dbae	for bug #293, http live streaming framework.	2015-01-18 18:39:53 +08:00
winlin	eff2d81016	for #293, add http flv stream	2015-01-18 18:00:40 +08:00
winlin	c4302b9b61	for bug #277, the http server subscribe the reload.	2015-01-18 17:17:07 +08:00
winlin	f1393ee43f	for bug #277, use http not found when no file.	2015-01-18 17:02:05 +08:00
winlin	398b212bfa	for bug #277, refine code, support default http vhost.	2015-01-18 17:01:39 +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	bfff8413b6	refine code for #277, the copy first param is the dest.	2015-01-18 09:16:14 +08:00
winlin	c695a8fcbd	refine code for #277, extract the flv vod stream.	2015-01-18 09:12:53 +08:00
winlin	e71bc0cbc5	for bug #277, refine the http server.	2015-01-17 23:44:21 +08:00
winlin	bbe96a4b31	for bug #277, support flv stream.	2015-01-17 23:19:30 +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	29be14dd37	merge from feilong, fix memory leak.	2015-01-17 11:16:13 +08:00
winlin	a4b61081cc	merge from feilong, fix memory leak.	2015-01-15 11:26:30 +08:00
winlin	63309a0538	refine for bug #288, drop info frame without error.	2015-01-14 11:55:15 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	964668dc73	merge from feilong, print format error.	2015-01-14 11:20:21 +08:00
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	2015-01-09 09:00:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	2015-01-08 17:48:45 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	2015-01-07 15:01:58 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00