3302 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	8b3bd5b4b9	add srs memory watcher.	2015-06-07 15:13:41 +08:00
winlin	bb4db61192	add srs memory watcher.	2015-06-07 15:12:55 +08:00
winlin	811ef4bcf6	dispose the gop cache	2015-06-07 09:27:47 +08:00
winlin	600e8e10d0	Merge branch '2.0release' into develop	2015-06-06 22:04:37 +08:00
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	2015-06-06 22:04:24 +08:00
winlin	57f01185f5	Merge branch '2.0release' into develop	2015-06-06 21:54:54 +08:00
winlin	2d9f258eaf	refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.	2015-06-06 21:54:43 +08:00
winlin	17d6016bf6	Merge branch '2.0release' into develop	2015-06-06 21:42:12 +08:00
winlin	ec24533955	use smaller value for publish timeout.	2015-06-06 21:42:01 +08:00
winlin	a6dd8fb3a1	fix #421, when mix correct on, must check the type of dequeue msg.	2015-06-06 21:31:39 +08:00
winlin	5d75e32e1d	Merge branch '2.0release' into develop	2015-06-06 21:24:06 +08:00
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	2015-06-06 21:23:57 +08:00
winlin	679b4317d8	fix the build failed bug.	2015-06-06 20:34:49 +08:00
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	2015-06-06 20:23:18 +08:00
winlin	2a1db36750	refine the pithy print of ingesters.	2015-06-06 18:57:41 +08:00
winlin	d10d57716a	Merge branch '2.0release' into develop	2015-06-05 21:34:39 +08:00
winlin	e4c27a51b8	fix the hls bug	2015-06-05 21:34:28 +08:00
winlin	4400b12515	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-06-05 20:38:51 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00
winlin	5dd81d182c	Merge branch '2.0release' into develop	2015-06-03 10:13:58 +08:00
winlin	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	2015-06-03 10:13:46 +08:00
winlin	982a937e84	Merge branch '2.0release' into develop	2015-06-02 12:56:17 +08:00
winlin	4e42b9c628	copy the request for hls.	2015-06-02 12:56:04 +08:00
winlin	091b480ac9	Merge branch '2.0release' into develop	2015-06-01 10:14:58 +08:00
winlin	679583dad6	refine comments of ffmpeg.	2015-06-01 10:14:46 +08:00
winlin	c1172c9940	Merge branch '2.0release' into develop	2015-05-30 21:40:51 +08:00
winlin	03d951c0fb	fix the audio or video pid generate bug.	2015-05-30 21:40:39 +08:00
winlin	c3c4cb2f2a	Merge branch '2.0release' into develop	2015-05-30 21:20:21 +08:00
winlin	96f8f1f502	fix build bug.	2015-05-30 21:20:07 +08:00
winlin	09750082e5	Merge branch '2.0release' into develop	2015-05-30 21:14:56 +08:00
winlin	0a87b567f6	fix the build failed bug.	2015-05-30 21:14:10 +08:00
winlin	9dce971d57	merge from srs2	2015-05-30 14:41:47 +08:00
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	2015-05-30 14:41:09 +08:00
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	2015-05-30 13:48:29 +08:00
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	2015-05-30 09:58:17 +08:00
winlin	db57a519a9	for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.	2015-05-30 09:32:03 +08:00
winlin	597993d414	support pure video hls.	2015-05-29 21:53:37 +08:00
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	2015-05-29 21:43:17 +08:00
winlin	3ad030fe83	add HLS overload	2015-05-29 17:56:05 +08:00
winlin	27a1fee6b9	Merge branch '2.0release' into develop	2015-05-28 21:02:50 +08:00
winlin	af4eec90ac	for srs-dolphin, support HTTP and RTMP.	2015-05-28 21:02:43 +08:00
winlin	41ead65345	support [srs-dolphin][srs-dolphin], the multiple-process SRS.	2015-05-28 19:58:16 +08:00
winlin	b44987fac7	Merge branch '2.0release' into develop	2015-05-28 14:59:19 +08:00
winlin	394e070b2e	support dolphin	2015-05-28 14:59:12 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	60775485c4	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-05-27 23:44:07 +08:00
winlin	385ee893f5	update readme	2015-05-27 23:43:44 +08:00
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	2015-05-27 16:16:15 +08:00