116 commits

Author	SHA1	Message	Date
winlin	5e419c66f8	For #299, add dash files.	2017-02-11 21:14:28 +08:00
winlin	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00
winlin	3209ad29e0	for #738, refine code for DVR mp4.	2017-02-06 20:58:52 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	7bfb648bd8	refine the meta cache name	2017-01-19 15:51:34 +08:00
winlin	4cff49afd2	for #742, refine source, meta and origin hub. 3.0.16	2017-01-19 12:38:55 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	9ba4bed648	merge srs2	2016-12-13 17:58:42 +08:00
winlin	cb1d47bfef	fix #713, refine source to avoid critical fetch and create. 2.0.222	2016-12-13 17:57:49 +08:00
winlin	0e9318e5d8	merge from 2.0	2016-09-05 14:16:24 +08:00
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	2016-09-05 14:13:37 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	07ef8160a3	clear the queue when edge republish.	2015-09-14 15:25:01 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	3b0b2e0b85	fix the bug to support dump packets with count.	2015-08-14 15:47:29 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
zhengfl	a5a9f7c8c5	refine code:优化edge模式回源播放线程启动流程	2015-07-16 11:36:14 +08:00
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	2015-07-09 15:45:55 +08:00
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
zhengfl	db9ea4e66e	rewrite #438	2015-07-08 17:08:29 +08:00
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	2015-07-08 15:43:09 +08:00
winlin	56938efdbd	fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175	2015-06-10 15:38:13 +08:00
winlin	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	2015-06-09 14:38:05 +08:00
winlin	811ef4bcf6	dispose the gop cache	2015-06-07 09:27:47 +08:00
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	2015-06-06 22:04:24 +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	0fbfad4172	fix gop cache, drop video only when video and not h.264	2015-06-06 20:23:18 +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	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	2015-04-15 17:12:22 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00