1163 commits

Author	SHA1	Message	Date
winlin	6587c5b2f1	merge from srs2	2015-10-01 13:22:51 +08:00
winlin	7811b4f3f7	fix #497, response error when client not found to kickoff. 2.0.194	2015-10-01 13:20:13 +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	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	afd6428366	refine code of server.	2015-09-23 17:21:57 +08:00
winlin	9a9483e7d5	support without kafka	2015-09-22 17:46:07 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	d32632ee8a	rename SrsFastBuffer to SrsFastStream	2015-09-22 09:01:47 +08:00
winlin	4f3d2c8607	rename SrsSimpleBuffer to SrsSimpleStream	2015-09-22 08:59:52 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	ca3577e11b	rename temp to stream	2015-09-22 08:52:00 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	c5cd58761c	move the srs thread to st.	2015-09-19 13:46:55 +08:00
winlin	3042115385	refine json to_str to dumps.	2015-09-19 13:37:56 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	225e742657	add args3	2015-09-17 14:03:25 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	7b2b11e932	async call worker fast execute tasks.	2015-09-17 11:57:17 +08:00
winlin	087f7740b7	fix the build failed bug	2015-09-17 11:41:23 +08:00
winlin	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +08:00
winlin	e8a00de4a3	for #319, support enable or disable vhost.	2015-09-15 12:51:14 +08:00
winlin	631e76cd32	for #319, support update and delete the disabled vhost	2015-09-15 12:15:18 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	eb578b4a39	refine the thread, set to disposed when terminate normally	2015-09-14 17:17:38 +08:00
winlin	83a9ff9f5d	for #474, refine the hls publish, donot fetch from source when publish	2015-09-14 15:49:25 +08:00
winlin	44bcb4045f	for #474, decode the sequence header before hls.	2015-09-14 15:32:09 +08:00
winlin	07ef8160a3	clear the queue when edge republish.	2015-09-14 15:25:01 +08:00
winlin	704624c9ec	clear the queue when edge republish.	2015-09-14 15:19:49 +08:00
winlin	8be3c875af	donot release stream when busy	2015-09-14 15:17:59 +08:00
winlin	3da25f3aee	when thread terminated normally, set the tid to NULL.	2015-09-14 15:11:49 +08:00
winlin	a994191ddc	for #474, always release publish for source.	2015-09-14 15:10:34 +08:00
winlin	eb9aa47ab1	merge from 2.0	2015-09-14 13:48:27 +08:00
winlin	0d57ef9373	fix #458, http hooks use source thread cid. 2.0.188	2015-09-14 13:47:25 +08:00
winlin	3b483094bd	merge from 2.0	2015-09-14 12:24:57 +08:00