348 commits

Author	SHA1	Message	Date
winlin	c7ec6f511c	fix the script error	2013-12-15 16:53:37 +08:00
winlin	63cec6f967	update readme	2013-12-15 13:41:17 +08:00
winlin	d911c85a12	add todo for the reload	2013-12-15 13:27:08 +08:00
winlin	b3ef28f831	fix bug of get hls enabled config	2013-12-15 13:23:03 +08:00
winlin	fb67f91167	support reload the hls/forwarder/transcoder	2013-12-15 13:07:39 +08:00
winlin	aaba290c1d	add reload readme.	2013-12-15 12:44:09 +08:00
winlin	b90b64954e	support reload the forwarder	2013-12-15 12:34:22 +08:00
winlin	7622878979	support reload the gop_cache	2013-12-15 12:08:01 +08:00
winlin	2f397d0460	support reload the gop_cache	2013-12-15 12:04:28 +08:00
winlin	e2bb38c483	support reload the removed vhost	2013-12-14 22:54:10 +08:00
winlin	f016914ac1	rename SrsReloadHandler to ISrsReloadHandler	2013-12-14 21:34:54 +08:00
winlin	010b7a7595	refine config.	2013-12-14 21:19:47 +08:00
winlin	5b29d0ec42	refine the config	2013-12-14 16:44:27 +08:00
winlin	3dd7156f0d	refine the config buffer.	2013-12-14 15:56:20 +08:00
winlin	ac5ccbc77e	refine the thread model for the retry threads	2013-12-14 14:06:32 +08:00
winlin	6329284b39	add todo for the bug of forwarder	2013-12-12 16:18:32 +08:00
winlin	7baa53a8d6	add todo for memory increase when forwarder server failed.	2013-12-12 12:42:53 +08:00
winlin	ff9c434eb9	add todo for memory increase when forwarder server failed.	2013-12-12 10:41:27 +08:00
winlin	66048cebbb	add todo for source	2013-12-10 14:49:35 +08:00
winlin	ae18c388c1	fix bug of build script on centos	2013-12-10 11:37:59 +08:00
winlin	5d349882bb	update build script for ubuntu	2013-12-10 10:37:18 +08:00
winlin	86e30ec2c9	update build script for ubuntu	2013-12-10 10:34:33 +08:00
winlin	bb90881489	auto install depends software for ubuntu or centos.	2013-12-10 10:09:29 +08:00
winlin	5d50bdc3fc	update build ffmpeg script bug for ubuntu, remove the opencl from x264	2013-12-10 09:20:11 +08:00
winlin	8887754b17	change version to 0.9 dev	2013-12-08 14:28:04 +08:00
winlin	c618229487	regression test ok	2013-12-08 13:17:39 +08:00
winlin	3fd3ac5a11	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:48:03 +08:00
winlin	889ad9238b	support http hooks: on_connect/close/publish/unpublish/play/stop.	2013-12-08 12:45:12 +08:00
winlin	3d4474f620	support multiple http hooks for a event.	2013-12-08 10:53:18 +08:00
winlin	2887cda176	support multiple http hooks for a event.	2013-12-08 10:46:33 +08:00
winlin	30099dfa09	support multiple http hooks for a event.	2013-12-08 10:46:15 +08:00
winlin	9f3139c5c3	add comments for api server	2013-12-08 09:22:33 +08:00
winlin	a478452f57	support http callback hooks: on_connect	2013-12-07 23:23:19 +08:00
winlin	65fde21e6c	add http client	2013-12-07 22:06:53 +08:00
winlin	bb22c3b5cd	add http library, support in build script	2013-12-07 20:51:27 +08:00
winlin	3600be9796	add http callback in config	2013-12-07 20:38:14 +08:00
winlin	d3cee00b3b	add cherrypy api server	2013-12-07 20:34:42 +08:00
winlin	4b9eabdf01	udpate files.	2013-12-07 19:28:11 +08:00
winlin	263213d8b6	update version, add build date	2013-12-07 19:27:31 +08:00
winlin	3b09f9bea9	support audio transcode only, speex/mp3 to aac	2013-12-06 14:35:03 +08:00
winlin	2d592d177d	refine the signals of ffmpeg.	2013-12-06 14:12:01 +08:00
winlin	71895a4da6	fix the ffmpeg kill bug, wait until ffmpeg quit.	2013-12-06 14:07:37 +08:00
winlin	cab88dfe70	hls support multiple publish/unpublish. disable hls when not support	2013-12-06 14:02:10 +08:00
winlin	679e851f07	support max_connections, drop if exceed.	2013-12-06 11:00:37 +08:00
winlin	4827777035	fix the build ffmpeg script bug, add yasm to path when build	2013-12-06 10:46:32 +08:00
winlin	86b1f3349a	fix bug of forward, erase msgs when error	2013-12-06 10:23:28 +08:00
winlin	89c0170850	fix bug of forward, earse the forwarded msgs.	2013-12-06 10:16:24 +08:00
winlin	8c5661b9ff	fix bug of hls muxer, support close/open/flush even muxer is closed.	2013-12-06 09:44:23 +08:00
winlin	6207a2f19e	fix the rewind bug, support republish by restart the ffmpeg encoder.	2013-12-05 23:54:30 +08:00
winlin	b9440df745	add encoder/hls pithy print	2013-12-05 23:34:26 +08:00
winlin	464d78b762	add todo for ffmpeg	2013-12-03 00:26:40 +08:00
winlin	113731dd6b	reap the transcode process	2013-12-02 23:51:51 +08:00
winlin	b5bba29768	refine hls, extract ts cache for ts cache audio and flush once	2013-12-02 22:09:10 +08:00
winlin	1c2f5052dd	refine the hls muxer module	2013-12-02 15:55:10 +08:00
winlin	b4eb38c86b	refine hls code, reorder classes.	2013-12-02 14:24:09 +08:00
winlin	d6897205c7	add todo for protocol	2013-12-02 12:56:52 +08:00
winlin	a2e6e6718e	fix the m3u8 crash bug, simplify it	2013-12-02 11:46:39 +08:00
winlin	2b0bef18ed	add todo for forward	2013-12-01 20:03:07 +08:00
winlin	09f9811a97	fix the hls crash bug	2013-12-01 19:54:52 +08:00
winlin	6f0bba9856	add todo: cycle all process, reap the exited	2013-12-01 18:53:24 +08:00
winlin	2695e4d0c6	fix bug of core	2013-12-01 17:42:09 +08:00
winlin	6af0794bab	support dead-loop detect for forwarder and transcoder.	2013-12-01 17:32:06 +08:00
winlin	e4ea965a3a	update conf	2013-12-01 14:28:07 +08:00
winlin	9d65cd1c9f	change server name to demo, dev used for development vhost	2013-12-01 14:08:28 +08:00
winlin	35676920be	convert to unix format	2013-12-01 13:05:43 +08:00
winlin	18028ad4cb	update readme	2013-12-01 13:04:09 +08:00
winlin	bf18a3ac96	change demo video to 200kbps	2013-12-01 12:41:52 +08:00
winlin	bbf7b9bb01	disable the forward for bug. update the steps	2013-12-01 12:31:23 +08:00
winlin	41fcda1d86	use hosts to play stream	2013-12-01 12:25:04 +08:00
winlin	5502344e85	add forward sample	2013-12-01 12:16:57 +08:00
winlin	5cc1ad6da8	add drawtext filter sample	2013-12-01 12:04:00 +08:00
winlin	1da09e5ffb	add sample video	2013-12-01 11:24:26 +08:00
winlin	a7c83b1aee	support ffmpeg filter	2013-12-01 10:55:06 +08:00
winlin	9a0d8855d8	support ffmpeg filter	2013-12-01 10:54:41 +08:00
winlin	f85b70966c	rename global username and email	2013-11-30 23:26:40 +08:00
winlin	951cd08f1f	refine the params	2013-11-30 23:21:14 +08:00
winlin	407801b8a6	add ffempty	2013-11-30 23:20:46 +08:00
winlin	b88596b6dc	update readme	2013-11-30 23:15:25 +08:00
winlin	601a69aa70	update readme	2013-11-30 23:15:13 +08:00
winlin	52e6115f9a	update readme	2013-11-30 23:12:47 +08:00
winlin	525af4599f	support live stream transcoding by ffmpeg.	2013-11-30 23:04:47 +08:00
winlin	ee18b9f537	add ffempty	2013-11-30 21:56:50 +08:00
winlin	2be9ef2a8b	add research empty ffmpeg	2013-11-30 21:53:42 +08:00
winlin	06278176dd	add research empty ffmpeg	2013-11-30 21:53:28 +08:00
winlin	80a81b1661	parse ffmpeg params	2013-11-30 21:02:21 +08:00
winlin	ce15f4bce3	update encoder framework	2013-11-30 19:14:19 +08:00
winlin	8d91561ca0	add ffmpeg transcoding framework	2013-11-30 18:31:07 +08:00
winlin	b1466c8883	fix build ffmpeg bug, add -ldl compile option	2013-11-30 16:45:47 +08:00
winlin	129244aafa	change x264 from 10bit to 8bit	2013-11-30 16:37:33 +08:00
winlin	a086e2bbfa	add transcoding params to config	2013-11-30 16:23:01 +08:00
winlin	57064237d0	rename author to contributor	2013-11-30 14:35:59 +08:00
winlin	9a582b0e4a	refine the configure	2013-11-30 14:12:19 +08:00
winlin	ad618702aa	add ffmpeg build script	2013-11-30 13:55:14 +08:00
winlin	041ce8f18f	add ffmpeg build script	2013-11-30 12:52:15 +08:00
winlin	e4840d4480	add ffmpeg build script	2013-11-30 12:43:55 +08:00
winlin	14c2585cc3	add build ffmpeg script	2013-11-30 11:59:21 +08:00
winlin	df53681a07	add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2.	2013-11-30 11:50:00 +08:00
winlin	93fec0997f	add ffmpeg2.1	2013-11-30 11:48:00 +08:00
winlin	790294f437	add authors	2013-11-29 23:08:50 +08:00
winlin	28572b009a	remove the clock msg from log	2013-11-29 22:39:50 +08:00