1958 commits

Author	SHA1	Message	Date
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	89b37d3469	for #136, refine the conf for hls.	2015-02-02 13:39:23 +08:00
winlin	4d10cc9f59	for #250, add conf.	2015-01-31 23:44:35 +08:00
winlin	16afe7ddbb	fix #250, support push MPEGTS over UDP to SRS. 2.0.111	2015-01-31 23:20:00 +08:00
winlin	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	2015-01-31 21:16:42 +08:00
winlin	153a3a6c42	must user pithy print for mpegts print.	2015-01-31 19:49:35 +08:00
winlin	70c8fe13c4	for #250, support h264 video for push mpegts over udp. 2.0.110	2015-01-31 19:46:55 +08:00
winlin	66fccdbbd1	for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.	2015-01-31 12:21:04 +08:00
winlin	bce78fdab6	for #250, add comments for elemetary stream specifed by stream_id.	2015-01-31 11:46:51 +08:00
winlin	a384cc400a	for #250, use udp packet handler.	2015-01-30 00:04:20 +08:00
winlin	35ab0ea627	for #250, use buffer to cache bytes, for system will split the udp packet.	2015-01-29 23:54:04 +08:00
winlin	b38bae2a89	for #250, refine parse pes packet, remove the clear method.	2015-01-29 23:08:26 +08:00
winlin	1685cdd48e	for #250, parse pes packet ok, ts message ok.	2015-01-29 22:58:02 +08:00
winlin	486277089d	for #250, parse the PES ts packet payload.	2015-01-29 13:54:07 +08:00
winlin	755e61e011	update the qt project.	2015-01-29 11:27:56 +08:00
winlin	8374017329	build libfdk-aac in ffmpeg. 2.0.108	2015-01-29 10:45:19 +08:00
winlin	cc87992fe0	for #250, decode the PMT and PAT	2015-01-27 18:35:43 +08:00
winlin	7692e50fc2	for #250, calc and verify the crc32 of PAT.	2015-01-27 17:04:30 +08:00
winlin	52b62918d9	for #250, decode the PAT of PSI ts packet.	2015-01-27 16:25:46 +08:00
winlin	51aecb8fde	for #250, decode the ts packet header and adaptation field.	2015-01-27 14:28:59 +08:00
winlin	bd395904df	for #250, the ts packet and adaptation field.	2015-01-27 11:13:03 +08:00
winlin	aff7a1cb4d	add ts packet definition for #250.	2015-01-26 17:06:06 +08:00
winlin	919a85b103	for #301, hls support h.264+mp3, ok for vlc. 2.0.107	2015-01-25 17:06:49 +08:00
winlin	2c42350489	for #301, http ts stream support h.264+mp3. 2.0.106	2015-01-25 16:42:22 +08:00
winlin	aaade0f04f	for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105	2015-01-25 13:35:53 +08:00
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	2015-01-25 13:30:45 +08:00
winlin	c9d270fbe0	refine code for #250, ts remux	2015-01-25 13:19:22 +08:00
winlin	b0daf1482d	update version to 1.0.24	2015-01-25 13:10:30 +08:00
winlin	1835957a2b	for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24	2015-01-25 13:04:12 +08:00
winlin	ea85ad2e20	for #293, #250, move the ts codec to kernel ts.	2015-01-25 10:54:25 +08:00
winlin	d22e4e86d8	update projects for rtmp renamed to protocol	2015-01-24 16:59:36 +08:00
winlin	711b6ca277	for #250, basic stream caster framework. 2.0.104	2015-01-24 16:31:32 +08:00
winlin	6463d22a14	for #250, add mpegts over udp stream caster class.	2015-01-24 16:27:30 +08:00
winlin	7f02bfa3a4	for #250, the mpegts over udp stream caster framework.	2015-01-24 15:36:11 +08:00
winlin	52891b491a	listen and serve stream caster mpegts over udp.	2015-01-24 14:52:52 +08:00
winlin	f9d1e1111a	merge from feilong, consumer directly sleep when paused.	2015-01-23 17:07:17 +08:00
winlin	8ace73f30d	for #151, use absolutely overflow to make jwplayer happy. 2.0.103	2015-01-23 15:29:14 +08:00
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	6b89ffbc1d	add config section for stream caster.	2015-01-23 15:06:12 +08:00
winlin	73cfdea332	for #299, srs http server support dash vod stream over mp4 range. 2.0.103	2015-01-23 13:45:59 +08:00
winlin	e0ee8de2fb	for #299, srs http server support dash, flash request range in range or bytes.	2015-01-23 13:17:50 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	d9a012164e	update vs2010 project.	2015-01-22 19:01:21 +08:00
winlin	a647043a06	update readme and wiki url for http ts stream	2015-01-22 18:39:53 +08:00
winlin	2a05783d5c	for #293, support http ts stream. 2.0.101	2015-01-22 18:32:10 +08:00
winlin	dfe385d0c9	for #293, move the simple buffer to kernel.	2015-01-22 18:13:33 +08:00
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	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	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	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	a1f887f46f	refine code, move onMetaData to consts.	2015-01-17 13:29:11 +08:00
winlin	04aa6f8296	drop script data except the onMetaData packet.	2015-01-17 13:23:30 +08:00
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	2015-01-17 13:06:18 +08:00