1319 commits

Author	SHA1	Message	Date
winlin	266397acee	merge from srs2	2016-01-13 12:46:23 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	f971538cf3	refine http, support no host.	2016-01-12 11:53:52 +08:00
winlin	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	041040b846	ignore ingester when vhost disabled.	2016-01-11 13:11:14 +08:00
winlin	eac5440559	merge from srs2 #558 #559	2016-01-09 16:06:22 +08:00
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	2016-01-09 16:00:58 +08:00
tufang14	56bffb6646	Update srs_app_thread.cpp	2016-01-09 15:54:23 +08:00
flowerwrong	d42a58faf4	Keep blank of line	2016-01-09 15:10:24 +08:00
tufang14	233ff11172	srs reusable thread need join	2016-01-09 14:58:40 +08:00
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	2016-01-08 15:10:25 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	2015-12-28 18:13:40 +08:00
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	2015-12-28 18:02:20 +08:00
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	2015-12-28 17:15:44 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	11e11005ac	specifies the try default vhost	2015-12-24 19:14:23 +08:00
winlin	d267b8fa19	fix bug for create connection with ip.	2015-12-24 17:38:49 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	e124aeb614	Merge branch '2.0release' into develop	2015-12-15 16:25:27 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	2015-12-15 12:46:47 +08:00
winlin	26d328e7f2	fix bug for api, level should be string.	2015-12-14 18:43:20 +08:00
winlin	ffef3905af	merge from srs2.	2015-12-11 11:35:56 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	1e4c8f8bf3	fast stop server.	2015-12-11 10:30:13 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +08:00
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	2015-12-07 11:35:05 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +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	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	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +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	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	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	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	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	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	33a015329d	add function to convert kafka array to vector	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	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
winlin	adb8f243bf	use simple rtmp client for raw connect app	2015-10-23 14:42:02 +08:00
winlin	24b3899972	use SrsTcpClient instead raw socket.	2015-10-23 14:42:02 +08:00
winlin	a9bb6061c3	use tcp client for raw connect.	2015-10-23 14:42:02 +08:00
winlin	20fcfb3eee	fix bug, use system utility	2015-10-23 14:42:02 +08:00
winlin	69cc01b696	use system utilities	2015-10-23 14:42:02 +08:00
winlin	908365a61a	use string for const char*	2015-10-23 14:42:02 +08:00