270 commits

Author	SHA1	Message	Date
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
wenjiegit	c87e55a2cc	merged master	2013-12-13 02:41:31 +08:00
wenjiegit	25caf5db36	for merge	2013-12-13 02:07:50 +08:00
wenjie	6e9f375606	+server support band check +every vhost can have it's own chunk size	2013-12-12 20:56:19 +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	8887754b17	change version to 0.9 dev	2013-12-08 14:28:04 +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	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	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	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	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	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	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	525af4599f	support live stream transcoding by ffmpeg.	2013-11-30 23:04:47 +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	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	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
winlin	5d69236bff	convert to unix format	2013-11-29 22:21:31 +08:00
winlin	db405b7e0e	support forward stream to origin/edge	2013-11-29 22:20:51 +08:00
winlin	f656087d74	add forward framework	2013-11-29 16:52:24 +08:00
winlin	2fa7610f9c	add rtmp client	2013-11-29 15:07:05 +08:00
winlin	844718c99b	refine the forwarder	2013-11-28 23:43:52 +08:00
winlin	1f8bb0e935	add forward st thread	2013-11-28 23:18:05 +08:00
winlin	f09d457644	add forward framework	2013-11-28 22:59:00 +08:00
winlin	3515af9dff	add tools	2013-11-28 22:32:50 +08:00
winlin	de95bf74b1	refine source, extract gop cache, add srs forwarder.	2013-11-28 22:28:34 +08:00
winlin	ecebedfed2	refine code	2013-11-28 15:12:08 +08:00
winlin	af5e7f002f	fix the memory leak error	2013-11-28 14:53:46 +08:00
winlin	005f821441	fix bug of hls conf detect	2013-11-28 09:14:56 +08:00
winlin	3877ab0ff2	fix bug of hls conf detect	2013-11-28 09:14:31 +08:00
winlin	1653e444dd	add comments for auto ptr message	2013-11-27 23:02:37 +08:00
winlin	90af450d63	add todo for response client detail error	2013-11-27 22:54:43 +08:00
winlin	62a2384a35	check publish streaming available	2013-11-27 22:53:08 +08:00
winlin	ec5cb39b96	add options --with/without -hls/ssl	2013-11-27 22:41:58 +08:00
winlin	f8855cfcbb	fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio	2013-11-27 17:30:16 +08:00
winlin	c78baedf4e	fix bug of 0.5 release.	2013-11-26 18:20:04 +08:00
winlin	94623c0cee	fix bug of shared ptr, must copy the payload for it free it.	2013-11-26 18:11:45 +08:00
winlin	758dff0e97	fix bug of hls, close the muxer when segment finished	2013-11-26 17:56:55 +08:00
winlin	00ec634d56	support hls_fragment and hls_window	2013-11-26 17:48:35 +08:00
winlin	04cfe20279	support HLS, refine the dir use app	2013-11-26 17:21:49 +08:00
winlin	57ea56970d	add nginx and used as http server	2013-11-26 16:45:50 +08:00
winlin	0c72c56f74	support HLS(m3u8)	2013-11-26 16:06:58 +08:00
winlin	749b7bdb2a	refine hls, support time jitter detect and correct	2013-11-26 11:48:18 +08:00
winlin	326713fbed	refine code, extract the rtmp jitter for hls	2013-11-26 11:15:44 +08:00
winlin	501b182dc9	refine code, write audio immediatly	2013-11-26 10:56:29 +08:00
winlin	dbdfb29de1	refine code, remove the base dts, donot drop start BP frames	2013-11-26 10:48:37 +08:00
winlin	b4235582dc	refine code, remove the base dts, donot drop start BP frames	2013-11-26 10:47:05 +08:00
winlin	9e5b3afcbe	update readme	2013-11-26 00:03:07 +08:00
winlin	7ed20cc670	support write ts file	2013-11-25 23:54:01 +08:00
winlin	164392f6aa	fix bug of ts_info	2013-11-25 10:59:21 +08:00
winlin	d5b84b5e20	refine ts code	2013-11-25 00:46:08 +08:00
winlin	38e66be490	fix ts audio bug, aac adts header and PES_packet_length fixed	2013-11-25 00:02:01 +08:00
winlin	4fca914694	support write ts file	2013-11-24 23:13:14 +08:00
winlin	ca6720aab2	add time to write ts file	2013-11-24 18:55:39 +08:00
winlin	385394315d	add ts mux framework	2013-11-24 17:53:36 +08:00
winlin	4af3982721	add ts muxer to write hls/ts file	2013-11-24 17:15:37 +08:00