47 commits

Author	SHA1	Message	Date
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +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	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +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	f6e655396c	for #485, support cross build for arm	2015-09-23 11:54:53 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +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	d32632ee8a	rename SrsFastBuffer to SrsFastStream	2015-09-22 09:01:47 +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	1de2bb0801	add kafka protocol files.	2015-09-21 17:12:28 +08:00
winlin	c34b0c86e1	fix #367, support nginx-rtmp exec. 3.0.1	2015-08-25 22:29:00 +08:00
winlin	0e1861b084	for #367: extract the process from ffmpeg to exec programs.	2015-08-24 21:51:05 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	8b3bd5b4b9	add srs memory watcher.	2015-06-07 15:13:41 +08:00
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	2015-05-23 10:04:28 +08:00
winlin	68d835021e	refine code, move the kbps to protocol	2015-05-23 09:58:00 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	0f7cafe50b	order the xcode project	2015-05-15 14:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	2015-04-20 16:25:48 +08:00
winlin	eb54ec25c9	fix compile errors.	2015-04-03 11:30:59 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	2015-03-16 15:35:01 +08:00
winlin	5c6ef6ded6	fix warning for xcode.	2015-03-14 13:09:34 +08:00
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	2015-03-12 11:15:15 +08:00
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	2015-03-12 07:26:30 +08:00
winlin	3732554844	remove the xcode state.	2015-03-11 14:56:03 +08:00
winlin	1ad0c847ce	fix http parse bug	2015-03-11 14:55:46 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00