2435 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	8862ec1988	merge from srs2	2015-10-01 13:05:25 +08:00
winlin	a3c229472e	fix #495, decrease the srs-librtmp size. 2.0.193	2015-10-01 13:04:28 +08:00
winlin	070ada1d6e	Merge branch '2.0release' into develop	2015-10-01 12:30:55 +08:00
winlin	65e4bf2e77	fix compile failed bug.	2015-10-01 12:30:38 +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	396bb43672	Merge branch '2.0release' into develop	2015-09-23 15:46:58 +08:00
winlin	8b1198562a	show cpu info.	2015-09-23 15:46:51 +08:00
winlin	4e88262512	merge from srs2 to check cpus.	2015-09-23 15:11:33 +08:00
winlin	cfe2082353	fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192	2015-09-23 15:09:59 +08:00
winlin	6990508e58	for #485, srs for respberrypi and cubieboard. 2.0.191	2015-09-23 11:05:56 +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	ab1e62a886	create the metadata request message	2015-09-22 14:33:17 +08:00
winlin	ca3b89aa7d	add kafka array, use c++ template.	2015-09-22 14:09:24 +08:00
winlin	2d5cc7a3e4	add structures for kafka	2015-09-22 12:38:07 +08:00
winlin	83f40697e2	refine the hpp macro defines.	2015-09-22 09:15:51 +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	1310c0f577	rename srs_protocol_buffer to srs_protocol_stream	2015-09-22 09:02:37 +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	dadfe101b4	rename SrsBitStream to SrsBitBuffer	2015-09-22 08:59:21 +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	f33d736442	rename kernel stream to buffer	2015-09-22 08:50:14 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	495f575ac3	rename kernel buffer to temp	2015-09-22 08:43:56 +08:00
winlin	ac2b03a3ed	rename srs_kernel_buffer to temp	2015-09-22 08:42:54 +08:00
winlin	1de2bb0801	add kafka protocol files.	2015-09-21 17:12:28 +08:00
winlin	b5996567e8	refine the role of srs, to cluster.	2015-09-21 12:09:09 +08:00
winlin	d8a64aaab5	fix #484, hotfix the openssl build script 2.0.190	2015-09-21 12:01:48 +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