6035 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	77d78eac5c	for #293, add http ts stream framework.	2015-01-22 17:40:06 +08:00
winlin	0f59073400	refine code, rename the pts to dts although both ok for audio.	2015-01-22 17:35:07 +08:00
winlin	913f98b902	for bug #293, http ts stream, move the avc codec from app to kernel.	2015-01-22 17:08:38 +08:00
winlin	dc6299171f	refine http stream code.	2015-01-22 15:05:38 +08:00
winlin	7d86c6d9e9	for bug #293, refine for fast cache of http stream.	2015-01-22 13:16:54 +08:00
winlin	2167a8385c	update version to 3.0.101	2015-01-22 09:36:19 +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	7305fa6f03	update vs2010 filter	2015-01-22 08:51:24 +08:00
winlin	f26a2a8f0e	add vs2010 filters.	2015-01-22 08:50:16 +08:00
winlin	db700a0c64	update vs solution	2015-01-20 19:11:14 +08:00
winlin	31efea4f33	rename srs cmake ide to jetbrains clion	2015-01-20 18:35:24 +08:00
winlin	664c85cf3d	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-01-20 18:33:48 +08:00
winlin	a3607c9193	use ide dir for ides.	2015-01-20 18:33:04 +08:00
winlin	49330b98b3	Merge pull request #296 from panda1986/develop ... 支持mp3音频编码	2015-01-20 14:27:46 +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	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	463f75f1c9	update readme, add http live stream	2015-01-19 14:11:53 +08:00
winlin	5f194bc87c	merge from feilong, the crash for cosumer wait.	2015-01-19 14:05:59 +08:00
winlin	3f0c80599b	update reamde	2015-01-19 13:31:07 +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	e6549b261c	for #293, support http mp3 streaming	2015-01-19 10:18: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	15d87537a1	for bug #293, support aac stream.	2015-01-19 00:14:14 +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	77e43d1813	refine comments of aac publish for #212	2015-01-18 22:11:38 +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	53d9faf395	for #293, update readme.	2015-01-18 19:50: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	9bf408ad25	for bug #277, update readme remove the experiment for http server and http vod stream.	2015-01-18 18:08:47 +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