2844 commits

Author	SHA1	Message	Date
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +08:00
winlin	fabcc91a0e	refine codes.	2015-12-07 18:22:55 +08:00
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	2015-12-07 11:35:05 +08:00
winlin	fba1122835	private the srs_vhost_resolve	2015-12-07 10:15:08 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +08:00
winlin	eec2c34b5c	refine publisher.	2015-12-01 10:42:13 +08:00
winlin	cfe230438a	revert test code	2015-11-30 19:07:52 +08:00
winlin	6191e0af90	s1 compute key.	2015-11-30 19:05:25 +08:00
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +08:00
winlin	c77cefb6fa	refine the position of log script	2015-11-11 17:49:46 +08:00
winlin	44b26271bf	Merge branch '2.0release' into develop	2015-11-11 17:12:34 +08:00
winlin	c4c63f7825	fix build failed bug for osx.	2015-11-11 17:06:12 +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	6c7a51d310	Merge branch '2.0release' into develop	2015-11-10 12:16:08 +08:00
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	2015-11-10 12:16:01 +08:00
winlin	d2ccc4f661	Merge branch '2.0release' into develop	2015-11-10 12:15:00 +08:00
winlin	8c04b17d08	use /usr/local/bin for osx.	2015-11-10 12:03:52 +08:00
winlin	7db7d43aea	Merge branch '2.0release' into develop	2015-11-09 15:25:55 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	aca9fe805c	Merge branch '2.0release' into develop	2015-11-09 14:51:47 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	75be18133d	fix build failed for utest.	2015-11-06 10:26:18 +08:00
winlin	6df4d1f05a	merge from srs2.	2015-11-05 15:12:49 +08:00
winlin	98e25def6c	fix utest build failed for osx.	2015-11-05 15:11:59 +08:00
winlin	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	2015-11-05 14:37:21 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	4b5eb5ea2d	fix the parse rtmp url bug for ingest.	2015-11-02 13:37:44 +08:00
winlin	ec225b2108	quit child process when fork failed.	2015-11-02 11:46:33 +08:00
winlin	9d7826c681	quit child process when fork failed.	2015-11-02 11:44:22 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	604486b0a3	for #515, use srs_freepa to free array.	2015-11-02 11:11:49 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	cef1ae5a8e	fix the config bug.	2015-10-28 12:55:16 +08:00
winlin	9ebb77d711	fix the warnings	2015-10-28 11:58:49 +08:00
winlin	e9e202dbf1	merge srs2	2015-10-28 11:51:32 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	8c96472cea	merge srs2	2015-10-28 11:03:15 +08:00
winlin	50a7b9c1ff	for ExoPlayer, add av tag in flv header. 2.0.197	2015-10-28 11:01:20 +08:00
winlin	59f5c5d6a5	Merge branch '2.0release' into develop	2015-10-27 18:21:04 +08:00
winlin	3b0bf1e10b	for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.	2015-10-27 18:20:57 +08:00
winlin	390f58e186	fix compile failed.	2015-10-27 17:57:58 +08:00
winlin	a416e891b4	fix compile failed.	2015-10-27 17:54:07 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	fe27e76492	support schema	2015-10-26 18:34:55 +08:00
winlin	a501f5bd7a	update htbt script	2015-10-26 14:54:41 +08:00
winlin	dd2945add1	update htbt script	2015-10-26 14:53:54 +08:00
winlin	6f6d495a19	update htbt script	2015-10-26 14:50:16 +08:00
winlin	3933819686	add htbt script	2015-10-26 14:18:19 +08:00
winlin	0a8cb8a391	add heartbeat script	2015-10-26 14:17:24 +08:00
winlin	11979229e6	Merge branch '2.0release' into develop	2015-10-26 13:34:44 +08:00
winlin	e08beba89e	fix the sed command for arm	2015-10-26 13:34:28 +08:00
winlin	45385241bb	fix the sed command for arm	2015-10-26 13:29:59 +08:00
winlin	b8f2ba4f0d	complete kafka	2015-10-23 14:42:05 +08:00
winlin	cbe4252b4d	refine code.	2015-10-23 14:42:04 +08:00
winlin	d2ca51ac50	notify kafka when client close	2015-10-23 14:42:04 +08:00
winlin	71451878c9	refine kafka, simplify code.	2015-10-23 14:42:04 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +08:00
winlin	76cd3f8749	kafka convert json to producer message.	2015-10-23 14:42:04 +08:00
winlin	8e344f1c26	add producer api messages.	2015-10-23 14:42:04 +08:00
winlin	7a0aaf5900	kafka refine code	2015-10-23 14:42:04 +08:00
winlin	f9f5b56951	kakfa erase messages when wrote.	2015-10-23 14:42:04 +08:00
winlin	22fa9a0f1f	kafka use temp transport to fetch metadata.	2015-10-23 14:42:04 +08:00
winlin	531b658f8e	retry when metadata empty	2015-10-23 14:42:04 +08:00
winlin	61486a82aa	kafka use topic and partition cache	2015-10-23 14:42:04 +08:00
winlin	7013993c7a	kafka send the accept message.	2015-10-23 14:42:04 +08:00
winlin	de41c1c9d2	kafka refine comments.	2015-10-23 14:42:04 +08:00
winlin	31a77a83ed	convert metadata to partitions	2015-10-23 14:42:04 +08:00
winlin	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	d013374871	rename ISrsCodec size to nb_bytes.	2015-10-23 14:42:03 +08:00
winlin	33a015329d	add function to convert kafka array to vector	2015-10-23 14:42:03 +08:00
winlin	84b3981d47	refs #1670: support decode the metadata response.	2015-10-23 14:42:03 +08:00
winlin	7106934c3a	kafka producer use async interface to request metadata.	2015-10-23 14:42:03 +08:00
winlin	a108fa8d01	kafka recv and decode message.	2015-10-23 14:42:03 +08:00
winlin	493d282255	kafka refine array, to decode and create object.	2015-10-23 14:42:03 +08:00
winlin	c4862878d1	kafka rename message set to raw message set.	2015-10-23 14:42:03 +08:00
winlin	6e5ed11a00	for kafka, support correlation id cache.	2015-10-23 14:42:03 +08:00
winlin	2e67eb8786	refine comments for kafka messages.	2015-10-23 14:42:03 +08:00
winlin	3c64e4b957	kafka encode and send packet.	2015-10-23 14:42:03 +08:00
winlin	9117e1e918	extract ISrsCodec for code and decode object.	2015-10-23 14:42:03 +08:00
winlin	45755fd1e7	refine code for kakfa request/response, string/bytes.	2015-10-23 14:42:03 +08:00
winlin	8a4ec49064	add graph comments for size of request and response.	2015-10-23 14:42:03 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	a9fdb630d9	refine code, replace all rtmp connect by simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	a08d8f83d6	refine mpegts code, use simple rtmp client	2015-10-23 14:42:02 +08:00
winlin	ad9b377d96	refine forwarder code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	0f4cb8ee00	refine code, remove the rtmp recv/send macro, use one macro.	2015-10-23 14:42:02 +08:00
winlin	12e013142d	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	bc27481886	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	e4c852945f	refine code, support override vhost	2015-10-23 14:42:02 +08:00
winlin	a9ad7b211b	refine simple rtmp client for post flv stream.	2015-10-23 14:42:02 +08:00