3276 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	5f77724021	refine hls disable the time jitter, support not mix monotonically increase. 2.0.177	2015-07-14 11:46:23 +08:00
winlin	5f91fbc970	merge from 2.0release	2015-07-14 11:32:40 +08:00
winlin	d995726fee	fix the http flv mount bug.	2015-07-14 11:31:17 +08:00
winlin	9743e02541	refine the mix correct algorithm.	2015-07-14 11:28:00 +08:00
winlin	6fe36afcfa	when hls timestamp jump, reset it.	2015-07-14 11:00:58 +08:00
winlin	99574bb77b	ignore when no segments for there must no m3u8	2015-07-14 10:43:21 +08:00
winlin	40c264a316	always reset the max target duration for hls.	2015-07-14 10:31:42 +08:00
winlin	54bb42483b	change time jitter to off for hls and forward.	2015-07-14 10:03:15 +08:00
winlin	be342178c0	fix ingest flv tool, support non monotonically timestamp.	2015-07-13 22:09:01 +08:00
winlin	ef5ddd01e4	Update README.md	2015-07-13 12:08:53 +08:00
winlin	b3b6df365e	fix the stream caster build failed bug.	2015-07-10 13:50:35 +08:00
winlin	50feaacdde	refine code for http remux reload.	2015-07-10 13:45:21 +08:00
winlin	677567d9f2	Merge branch '2.0release' into develop	2015-07-10 11:50:45 +08:00
winlin	0aa053433c	fix #132: build failed when enable the info or verbose log.	2015-07-10 11:50:35 +08:00
zhengfl	2567a89599	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	2015-07-09 15:49:23 +08:00
zhengfl	2263f2a610	refine code: ... 优化 判断重复推流 及 推流流程	2015-07-09 15:45:55 +08:00
winlin	404bc565a1	refine the pithy print mechenism.	2015-07-09 15:39:02 +08:00
winlin	97b8c99682	Merge branch '2.0release' into develop	2015-07-09 13:52:52 +08:00
winlin	bed540bac9	fix #439: http remux support reload	2015-07-09 13:52:41 +08:00
winlin	da47f1648b	refine file mode to 644	2015-07-09 13:44:05 +08:00
zhengfl	f6a2cea716	refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。	2015-07-09 10:08:17 +08:00
winlin	3dadad2dbc	Merge branch '2.0release' into develop	2015-07-08 17:45:08 +08:00
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
winlin	210d0a67cb	Merge branch '2.0release' into develop	2015-07-08 17:42:47 +08:00
winlin	c6c90e2643	refine code, add comments for stat on_disconnect.	2015-07-08 17:42:35 +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
zhengfl	120033e0a2	fix #437 ... edge模式，重新从源站拉流时，导致forwarders异常	2015-07-08 11:47:34 +08:00
winlin	f39faa78bb	refine config default values of srs, prepare to move each default values to functions.	2015-07-06 11:11:59 +08:00
winlin	9c716d4791	Merge branch '2.0release' into develop	2015-07-06 10:32:47 +08:00
winlin	3b8daafc03	use local openssl header files to avoid warnings on osx.	2015-07-06 10:32:28 +08:00
winlin	c8fef99cb6	merge from 2.0release	2015-07-01 14:51:27 +08:00
winlin	438914c481	fix #433, fix the sps parse bug. 2.0.176	2015-07-01 14:50:45 +08:00
winlin	312366bba2	add srs_recvi_bytes for intranet bytes stat.	2015-06-19 14:38:05 +08:00
winlin	750399ace4	fix network device compare bug.	2015-06-19 13:51:40 +08:00
winlin	8cd68a1eb3	ignore any intranet bandwidth.	2015-06-19 11:59:41 +08:00
zhengfl	52110990c1	修正编码风格问题	2015-06-18 16:21:00 +08:00
zhengfl	b4ff9cfba1	fix bug ... 某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。	2015-06-17 23:09:17 +08:00
winlin	8951752086	Merge branch '2.0release' into develop	2015-06-17 16:47:08 +08:00
Jonathan Barratt	2e437a28b4	Update README.md ... Correct path in installation instructions since project repository renamed to srs from simple-rtmp-server	2015-06-17 16:46:39 +08:00
winlin	8102a22606	add comments for async call.	2015-06-17 16:42:43 +08:00
winlin	6f685e66b1	Merge branch '2.0release' into develop	2015-06-14 19:42:53 +08:00
winlin	3211282b0c	refine the http code.	2015-06-14 19:42:43 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
winlin	e743795f3d	Merge branch '2.0release' into develop	2015-06-14 08:43:53 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	c58b7231e2	Merge branch '2.0release' into develop	2015-06-13 17:23:53 +08:00
winlin	17c276113e	refine the hls dispose, when not cycle always dispose it.	2015-06-13 17:23:38 +08:00
winlin	ec90ae2082	refine the space of code.	2015-06-13 16:42:05 +08:00
winlin	2f44a29b76	Merge branch '2.0release' into develop	2015-06-13 16:05:26 +08:00