563 commits

Author	SHA1	Message	Date
winlin	9f60a6738a	add comments for listen	2014-11-17 10:27:05 +08:00
winlin	47ed9e33dd	refine code for bug #194, use send messages for all msg array.	2014-11-14 11:24:49 +08:00
winlin	f11272e3ce	add comments for bug #194, #196	2014-11-13 17:29:56 +08:00
winlin	8845bb7caf	for bug #194, refine code, remove the old duplicated code.	2014-11-13 16:56:41 +08:00
winlin	eba1740ed5	hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6.	2014-11-13 14:48:21 +08:00
winlin	62719c2b12	for bug #200, fix the writev for librtmp, add comments.	2014-11-13 14:38:23 +08:00
winlin	0bc35e093c	for bug #200, deadloop when read/write 0 and ETIME. 2.0.16.	2014-11-13 14:30:56 +08:00
winlin	77cf885d8c	add comments for #161	2014-11-13 13:49:50 +08:00
winlin	4af2e78c59	refine code for bug #194, add comments to macros.	2014-11-13 12:45:54 +08:00
winlin	cc6aca9ad5	fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15.	2014-11-13 12:25:56 +08:00
winlin	d257360e96	add comments about bug #196	2014-11-12 13:46:21 +08:00
winlin	8acd143a7a	fix #194: refine the timeout recv, pulse to 500ms. 2.0.14.	2014-11-12 12:59:53 +08:00
winlin	a6f3478a74	for bug #194, remove the poll, it's no-use	2014-11-12 10:26:48 +08:00
winlin	bc1b5f4bbf	for bug #194, disable the srs fd poll.	2014-11-12 10:05:42 +08:00
winlin	4f21e92ae0	fix the message of config for max_connections.	2014-11-11 18:49:27 +08:00
winlin	21f16f3a83	for bug #194, use play fd poll to improve performance, it works.	2014-11-11 18:46:35 +08:00
winlin	164f632b62	for bug #194, add fds poll, just sleep to send without recv.	2014-11-11 18:35:46 +08:00
winlin	133cc62b51	for bug #194, use play fd poll, create the singleton poll	2014-11-11 17:54:02 +08:00
winlin	efc85ed6df	refine config, check the connections more precise	2014-11-11 17:19:56 +08:00
winlin	de5e2d0a40	Revert "Revert "for bug #194, refine the config"" ... This reverts commit b4c1d55311.	2014-11-11 17:12:45 +08:00
winlin	b4c1d55311	Revert "for bug #194, refine the config" ... This reverts commit 2a55ae4317.	2014-11-11 17:05:36 +08:00
winlin	e87eacd499	Revert "add srs pipe for bug #194" ... This reverts commit f9756ea14c.	2014-11-11 17:05:25 +08:00
winlin	73abb1a31d	Revert "for bug #194, add pipe to consumer." ... This reverts commit 1e601a6efc.	2014-11-11 17:04:56 +08:00
winlin	306f75b267	Revert "for bug#194, open pipe for each connection." ... This reverts commit ade81bb244.	2014-11-11 17:04:32 +08:00
winlin	ade81bb244	for bug#194, open pipe for each connection.	2014-11-11 16:41:39 +08:00
winlin	1e601a6efc	for bug #194, add pipe to consumer.	2014-11-11 16:27:35 +08:00
winlin	f9756ea14c	add srs pipe for bug #194	2014-11-11 16:09:44 +08:00
winlin	2a55ae4317	for bug #194, refine the config	2014-11-11 15:38:21 +08:00
winlin	36d12dd8ea	for bug #194, change server main cycle to 1s.	2014-11-11 14:41:48 +08:00
winlin	8cc9a11b81	for bug #194, set the server main cycle to 1s	2014-11-11 14:38:54 +08:00
winlin	46330dd196	fix #195: remove the confuse code st_usleep(0). 2.0.13.	2014-11-11 13:40:09 +08:00
winlin	3358570be6	refine for bug#66, implements the usage.	2014-11-08 10:44:00 +08:00
winlin	72ad6894ca	move the annexb decode utility to protocol.	2014-11-07 23:07:31 +08:00
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:06 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:58:53 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +08:00
winlin	57e8356221	fix #184, support AnnexB in RTMP body for HLS. 2.0.2	2014-10-19 19:42:27 +08:00
winlin	bd158ec838	hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1.	2014-10-19 11:33:56 +08:00
winlin	d24e2fd0cc	remove supports for OSX. 2.0.1.	2014-10-18 13:58:23 +08:00
winlin	2ed794ad52	refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224	2014-10-09 10:41:24 +08:00
winlin	9789335d0b	fix #151, always reap ts whatever audio or video packet. 0.9.223.	2014-10-08 15:15:57 +08:00
winlin	13b092704d	refine code for bug #151, refine the source functions, add comments.	2014-10-08 14:28:09 +08:00
winlin	b830b995e6	fix bug #162, requires epoll. 0.9.222	2014-10-08 13:27:48 +08:00
winlin	f3002144fc	fix #180: crash for multiple edge publishing the same stream. 0.9.220.	2014-09-30 11:21:46 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	bcd1b3d2d4	refine code, remove unused code of dvr.	2014-09-27 13:02:16 +08:00
winlin	20ebf68ea5	fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.	2014-09-26 17:47:43 +08:00
winlin	002facb85b	refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215	2014-09-26 16:34:13 +08:00
winlin	83f266b9e2	fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.	2014-09-25 10:59:29 +08:00
winlin	1d454cd5fb	add bug for http-mp4.	2014-09-16 15:56:46 +08:00
winlin	9dd0939327	fix the bug for gmc. 0.9.211	2014-09-10 14:59:20 +08:00
winlin	61728118ab	donot destroy the source and connections of gmc.	2014-09-10 14:58:19 +08:00
winlin	79938f3214	add comments for gmc.	2014-09-10 10:19:48 +08:00
zhengfl	c2ac11201b	amendment srs_verbose info in the get_peer_ip	2014-08-28 04:18:06 +08:00
winlin	901c9590e4	refine log, log important to file. 1.0.210	2014-08-29 15:07:04 +08:00
winlin	728b749384	fix #167, add openssl includes to utest. 0.9.209.	2014-08-28 13:32:13 +08:00
winlin	53011808fb	add sysctl vm.max_map_count for mmap.	2014-08-27 13:47:56 +08:00
winlin	d0c585af86	max connections is 32756, for st use mmap default. 0.9.209	2014-08-27 13:31:39 +08:00
winlin	839101a036	reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.	2014-08-27 12:28:05 +08:00
winlin	42a43c69cd	fix #150, forward should forward the sequence header when retry. 0.9.208.	2014-08-24 22:34:38 +08:00
winlin	4d5414faec	update log, add dsu(debug_srs_upnode), 0.9.204	2014-08-19 16:32:52 +08:00
winlin	e656a65b6c	for bug #162, add conf and connections limit.	2014-08-19 15:52:59 +08:00
winlin	ab965655aa	refine forwarder, add tracable debug info. 0.9.202	2014-08-19 11:54:33 +08:00
winlin	e9e0cd757c	fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.	2014-08-19 10:59:59 +08:00
winlin	c24e68dd70	refine the stat, use one ok. 1.0.200	2014-08-18 14:39:42 +08:00
winlin	6103b1c3ce	refine options, add --with-stat. 0.9.199	2014-08-17 22:11:43 +08:00
winlin	3111870316	for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198.	2014-08-17 20:38:51 +08:00
winlin	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	2014-08-16 19:59:14 +08:00
winlin	08bc34e0df	refine wiki, cluster to forward.	2014-08-14 16:33:26 +08:00
winlin	a9d28122f4	refine code, refine the handshake, refine the log of source_id	2014-08-06 13:57:55 +08:00
winlin	5b28355a0b	fix #147, support identify the srs edge. 0.9.190.	2014-08-06 09:57:30 +08:00
winlin	33bc8755ab	refine code, add comments for ossrs.net monitor.	2014-08-04 10:50:28 +08:00
winlin	67403bdbf1	fix #79, fix the reload remove edge assert bug. 0.9.189.	2014-08-03 21:50:48 +08:00
winlin	ade2376da0	fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.	2014-08-03 21:22:40 +08:00
winlin	6dd065bcc3	fix #85, fix the segment-dvr sequence header missing. 0.9.187.	2014-08-03 20:27:57 +08:00
winlin	5a95d594e7	fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.	2014-08-03 13:06:37 +08:00
winlin	d5ba529d32	fix #143, fix retrieve sys stat bug for all linux. 0.9.185.	2014-08-03 10:42:01 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	84450e1588	fix #138, fix http hooks bug, regression bug. 0.9.184.	2014-08-02 19:24:49 +08:00
winlin	721acc350a	fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183.	2014-08-02 09:54:21 +08:00
winlin	d5f03200a7	revert tcp stat. need more refine. 0.9.182	2014-08-01 23:08:52 +08:00
winlin	f7fdbe6848	update get connections thread to sleep 10ms per 1000 connectios. 0.9.181	2014-08-01 22:52:40 +08:00
winlin	15d4993cc3	slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180	2014-08-01 22:43:12 +08:00
winlin	6539ce69f4	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:39:39 +08:00
winlin	f0ffdcc0ae	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:37:34 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	792a6f944f	refine utility of cpu, add comment for cpu percent	2014-07-28 13:51:54 +08:00
winlin	c16d3585a5	refine utility of cpu, add comment for cpu percent	2014-07-28 13:41:27 +08:00
winlin	b198d17ab9	Merge pull request #135 from T-bagwell/master ... Support porting srs on MacOS OSX system Platform	2014-07-27 21:07:37 +08:00
Steven Liu	b50ecd6dbe	Support porting srs on MacOS OSX system Platform ... Add the OSX platform cross complie options into srs	2014-07-27 19:32:12 +08:00
winlin	9c11001391	refine log for stats network and disk	2014-07-27 19:03:56 +08:00
winlin	6f700f3f40	rename network_device_index to network	2014-07-27 18:40:32 +08:00
winlin	f4ea48adcb	rename network_device_index to network	2014-07-27 18:39:20 +08:00
winlin	b8ae5c63fc	add disk io test command	2014-07-27 18:05:54 +08:00
winlin	42464cbe1f	add disk io test command	2014-07-27 17:59:19 +08:00
winlin	4f4b15f500	refine the disk iops stat, get cpu info.	2014-07-27 17:46:31 +08:00
winlin	ef7a02e643	refine the disk io busy, can >1	2014-07-27 17:23:07 +08:00
winlin	df8414af63	api connections add udp, add disk iops. 0.9.176	2014-07-27 17:16:04 +08:00
winlin	b334021836	add config item for the stat disk device name	2014-07-27 16:52:00 +08:00