86 commits

Author	SHA1	Message	Date
winlin	ffef3905af	merge from srs2.	2015-12-11 11:35:56 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +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	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +08:00
winlin	1c7d5f1852	Merge branch '2.0release' into develop	2015-09-24 17:55:33 +08:00
winlin	353e3260b8	remove duplicated code	2015-09-24 17:55:27 +08:00
winlin	9ead08725d	use kernel utility int2str and float2str	2015-09-24 17:54:58 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	c4feb8f6ed	for #319, raw api support update all globals.	2015-09-09 23:32:02 +08:00
winlin	c8466c36bd	for #319, raw api support update the global RTMP chunk_size.	2015-09-01 21:27:04 +08:00
winlin	04bea781ca	use amf0 encode for json encode.	2015-08-28 15:11:11 +08:00
winlin	fe4cdceb15	always wait for process to terminated when SIGKILL.	2015-08-26 23:02:54 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +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
winlin	96f8f1f502	fix build bug.	2015-05-30 21:20:07 +08:00
winlin	0a87b567f6	fix the build failed bug.	2015-05-30 21:14:10 +08:00
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	2015-05-30 11:25:33 +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	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	2015-05-22 17:16:33 +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	e458305f81	add utc time format.	2015-04-03 16:42:32 +08:00
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	2015-03-30 12:44:04 +08:00
winlin	e818f36316	fix #360, fix build bug for centos7.	2015-03-25 20:38:51 +08:00
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	2015-03-21 15:38:22 +08:00
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	2015-03-21 15:22:45 +08:00
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	2015-03-18 22:30:17 +08:00
winlin	8bf60895a9	refine the kbps of server.	2015-03-08 12:55:40 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	b4057916b6	add qt project file. fix cmake file for clion.	2014-11-30 16:06:37 +08:00
winlin	72ad6894ca	move the annexb decode utility to protocol.	2014-11-07 23:07:31 +08:00
winlin	57e8356221	fix #184, support AnnexB in RTMP body for HLS. 2.0.2	2014-10-19 19:42:27 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	002facb85b	refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215	2014-09-26 16:34:13 +08:00
zhengfl	c2ac11201b	amendment srs_verbose info in the get_peer_ip	2014-08-28 04:18:06 +08:00
winlin	c24e68dd70	refine the stat, use one ok. 1.0.200	2014-08-18 14:39:42 +08:00
winlin	08bc34e0df	refine wiki, cluster to forward.	2014-08-14 16:33:26 +08:00
winlin	d5ba529d32	fix #143, fix retrieve sys stat bug for all linux. 0.9.185.	2014-08-03 10:42:01 +08:00