742 Commits (3d225e1bc7e9936620f23ecd13df19182d254524)

Author	SHA1	Message	Date
winlin	2cb8b7dd52	for bug #248, use simple buffer for hls.	10 years ago
winlin	315f981821	refine for bug #241, increase the small bytes for merged read.	10 years ago
winlin	5791ed59fd	for bug #241, refine the socket max buffer.	10 years ago
winlin	4785f882d4	for bug #241, refine the max buffer and kbps.	10 years ago
winlin	850946bb13	for bug #241, calc the small and sleep for merged read.	10 years ago
winlin	aee00877df	for bug #241, change buffer size when chunk size changed.	10 years ago
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	10 years ago
winlin	adf95d239e	refine code, move the ISrsBufferReader to srs_protocol_io	10 years ago
winlin	ea0e837cd6	move the srs_kernel_buffer to srs_protocol_buffer.	10 years ago
winlin	6cbf732e1a	for bug #237, thread donot sleep when timeout is 0.	10 years ago
winlin	c457364321	for bug #237, add name for thread. 2.0.47	10 years ago
winlin	787ab674e3	fix #244, conn thread use cond to wait for recv thread error. 2.0.47.	10 years ago
winlin	565f29ed6c	Revert "for bug #241, merge big chunks for publish, no use." ... This reverts commit 6b57597718.	10 years ago
winlin	6b57597718	for bug #241, merge big chunks for publish, no use.	10 years ago
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	10 years ago
winlin	24a6a723ee	for bug #237, never sleep when thread interval is 0.	10 years ago
winlin	6f963b50f3	refine code, publish recv thread sleep 697ms	10 years ago
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	10 years ago
winlin	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	10 years ago
winlin	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	10 years ago
winlin	29c6014192	refs #1670: fix the bug for bug #237, use us and ms timeout.	10 years ago
winlin	472b1742a2	for bug #237, use isolate thread to recv message. 2.0.41	10 years ago
winlin	0e7836868c	for bug #235, refine the queue recv thread.	10 years ago
winlin	0b631ee80d	for bug #235, pass timeout to recv thread.	10 years ago
winlin	31eb9bf1c1	for bug #237, extract a queue recv thread.	10 years ago
winlin	22524f390a	rename the recv thread to queue recv thread for bug #237.	10 years ago
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	10 years ago
winlin	b4057916b6	add qt project file. fix cmake file for clion.	10 years ago
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	10 years ago
winlin	e492fa5353	fix #212, support publish aac adts raw stream. 2.0.31.	10 years ago
winlin	3d97048c3a	fix bug #217, add reuse conn to play different player.	10 years ago
winlin	3e81e6e0f1	refine code for bug #217, use recv thread to set the timeout.	10 years ago
winlin	58136ec178	fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.	10 years ago
winlin	622218c4dd	for bug #217, use isolate thread to improve 17% performance.	10 years ago
winlin	5f48d4f566	refine comments for SrsMessageArray. 2.0.25	10 years ago
winlin	df35f75df1	refine response call, 2.0.24	10 years ago
winlin	749fac414b	refine code, donot response call when transaction id is zero.	10 years ago
winlin	9f60a6738a	add comments for listen	10 years ago
winlin	47ed9e33dd	refine code for bug #194, use send messages for all msg array.	10 years ago
winlin	f11272e3ce	add comments for bug #194, #196	10 years ago
winlin	8845bb7caf	for bug #194, refine code, remove the old duplicated code.	10 years ago
winlin	62719c2b12	for bug #200, fix the writev for librtmp, add comments.	10 years ago
winlin	0bc35e093c	for bug #200, deadloop when read/write 0 and ETIME. 2.0.16.	10 years ago
winlin	77cf885d8c	add comments for #161	10 years ago
winlin	4af2e78c59	refine code for bug #194, add comments to macros.	10 years ago
winlin	cc6aca9ad5	fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15.	10 years ago
winlin	d257360e96	add comments about bug #196	10 years ago
winlin	8acd143a7a	fix #194: refine the timeout recv, pulse to 500ms. 2.0.14.	10 years ago
winlin	a6f3478a74	for bug #194, remove the poll, it's no-use	10 years ago
winlin	bc1b5f4bbf	for bug #194, disable the srs fd poll.	10 years ago
winlin	4f21e92ae0	fix the message of config for max_connections.	10 years ago
winlin	21f16f3a83	for bug #194, use play fd poll to improve performance, it works.	10 years ago
winlin	164f632b62	for bug #194, add fds poll, just sleep to send without recv.	10 years ago
winlin	133cc62b51	for bug #194, use play fd poll, create the singleton poll	10 years ago
winlin	efc85ed6df	refine config, check the connections more precise	10 years ago
winlin	de5e2d0a40	Revert "Revert "for bug #194, refine the config"" ... This reverts commit b4c1d55311.	10 years ago
winlin	b4c1d55311	Revert "for bug #194, refine the config" ... This reverts commit 2a55ae4317.	10 years ago
winlin	e87eacd499	Revert "add srs pipe for bug #194" ... This reverts commit f9756ea14c.	10 years ago
winlin	73abb1a31d	Revert "for bug #194, add pipe to consumer." ... This reverts commit 1e601a6efc.	10 years ago
winlin	306f75b267	Revert "for bug#194, open pipe for each connection." ... This reverts commit ade81bb244.	10 years ago
winlin	ade81bb244	for bug#194, open pipe for each connection.	10 years ago
winlin	1e601a6efc	for bug #194, add pipe to consumer.	10 years ago
winlin	f9756ea14c	add srs pipe for bug #194	10 years ago
winlin	2a55ae4317	for bug #194, refine the config	10 years ago
winlin	36d12dd8ea	for bug #194, change server main cycle to 1s.	10 years ago
winlin	8cc9a11b81	for bug #194, set the server main cycle to 1s	10 years ago
winlin	46330dd196	fix #195: remove the confuse code st_usleep(0). 2.0.13.	10 years ago
winlin	3358570be6	refine for bug#66, implements the usage.	10 years ago
winlin	72ad6894ca	move the annexb decode utility to protocol.	10 years ago
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	11 years ago
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	11 years ago
winlin	57e8356221	fix #184, support AnnexB in RTMP body for HLS. 2.0.2	11 years ago
winlin	d24e2fd0cc	remove supports for OSX. 2.0.1.	11 years ago
winlin	f3002144fc	fix #180: crash for multiple edge publishing the same stream. 0.9.220.	11 years ago
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	11 years ago
winlin	bcd1b3d2d4	refine code, remove unused code of dvr.	11 years ago
winlin	20ebf68ea5	fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.	11 years ago
winlin	002facb85b	refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215	11 years ago
winlin	83f266b9e2	fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.	11 years ago
winlin	1d454cd5fb	add bug for http-mp4.	11 years ago
winlin	9dd0939327	fix the bug for gmc. 0.9.211	11 years ago
winlin	61728118ab	donot destroy the source and connections of gmc.	11 years ago
winlin	79938f3214	add comments for gmc.	11 years ago
zhengfl	c2ac11201b	amendment srs_verbose info in the get_peer_ip	11 years ago
winlin	901c9590e4	refine log, log important to file. 1.0.210	11 years ago
winlin	728b749384	fix #167, add openssl includes to utest. 0.9.209.	11 years ago
winlin	53011808fb	add sysctl vm.max_map_count for mmap.	11 years ago
winlin	d0c585af86	max connections is 32756, for st use mmap default. 0.9.209	11 years ago
winlin	839101a036	reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.	11 years ago
winlin	42a43c69cd	fix #150, forward should forward the sequence header when retry. 0.9.208.	11 years ago
winlin	4d5414faec	update log, add dsu(debug_srs_upnode), 0.9.204	11 years ago
winlin	e656a65b6c	for bug #162, add conf and connections limit.	11 years ago
winlin	ab965655aa	refine forwarder, add tracable debug info. 0.9.202	11 years ago
winlin	e9e0cd757c	fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.	11 years ago
winlin	c24e68dd70	refine the stat, use one ok. 1.0.200	11 years ago
winlin	6103b1c3ce	refine options, add --with-stat. 0.9.199	11 years ago
winlin	3111870316	for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198.	11 years ago
winlin	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	11 years ago
winlin	08bc34e0df	refine wiki, cluster to forward.	11 years ago
winlin	a9d28122f4	refine code, refine the handshake, refine the log of source_id	11 years ago
winlin	5b28355a0b	fix #147, support identify the srs edge. 0.9.190.	11 years ago
winlin	33bc8755ab	refine code, add comments for ossrs.net monitor.	11 years ago
winlin	67403bdbf1	fix #79, fix the reload remove edge assert bug. 0.9.189.	11 years ago
winlin	ade2376da0	fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.	11 years ago
winlin	6dd065bcc3	fix #85, fix the segment-dvr sequence header missing. 0.9.187.	11 years ago
winlin	5a95d594e7	fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.	11 years ago
winlin	d5ba529d32	fix #143, fix retrieve sys stat bug for all linux. 0.9.185.	11 years ago
winlin	7b24788445	for bug #143, build on centos5.	11 years ago
winlin	84450e1588	fix #138, fix http hooks bug, regression bug. 0.9.184.	11 years ago
winlin	721acc350a	fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183.	11 years ago
winlin	d5f03200a7	revert tcp stat. need more refine. 0.9.182	11 years ago
winlin	f7fdbe6848	update get connections thread to sleep 10ms per 1000 connectios. 0.9.181	11 years ago
winlin	15d4993cc3	slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180	11 years ago
winlin	6539ce69f4	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	11 years ago
winlin	f0ffdcc0ae	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	11 years ago
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	11 years ago
winlin	792a6f944f	refine utility of cpu, add comment for cpu percent	11 years ago
winlin	c16d3585a5	refine utility of cpu, add comment for cpu percent	11 years ago
winlin	b198d17ab9	Merge pull request #135 from T-bagwell/master ... Support porting srs on MacOS OSX system Platform	11 years ago
Steven Liu	b50ecd6dbe	Support porting srs on MacOS OSX system Platform ... Add the OSX platform cross complie options into srs	11 years ago
winlin	9c11001391	refine log for stats network and disk	11 years ago
winlin	6f700f3f40	rename network_device_index to network	11 years ago
winlin	f4ea48adcb	rename network_device_index to network	11 years ago
winlin	b8ae5c63fc	add disk io test command	11 years ago
winlin	42464cbe1f	add disk io test command	11 years ago
winlin	4f4b15f500	refine the disk iops stat, get cpu info.	11 years ago
winlin	ef7a02e643	refine the disk io busy, can >1	11 years ago
winlin	df8414af63	api connections add udp, add disk iops. 0.9.176	11 years ago
winlin	b334021836	add config item for the stat disk device name	11 years ago
winlin	7c1dd97513	refine system stat, use fgets and sscanf.	11 years ago
winlin	a7a009212b	refine the cpu stat, use fgets and sscanf.	11 years ago
winlin	f53bfcea54	add udp stat to nb_conn_sys as nb_conn_sys_udp	11 years ago
winlin	e76036f40b	refine config heartbeat, add new stats. 0.9.175	11 years ago
winlin	02f7c85710	add total system in and out KBps disk stat. 0.9.174	11 years ago
winlin	d2f125b6d6	refine the cpu usage calc, add total_delta.	11 years ago
winlin	d0bc0884d1	refine rtmp client, add comments for the dumps_packets()	11 years ago
winlin	a645b403c8	add comments for utility, the USER_HZ for /proc/stat	11 years ago
winlin	6d9d9ee3c5	updte forwarder comments	11 years ago
winlin	6ee9ea341a	refine code, rename SrsSocket to SrsStSocket	11 years ago
winlin	b19d2e8e2d	refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp	11 years ago
winlin	fbddfbc8a3	fix #134, not fix for the shrink to clear the queue.	11 years ago
winlin	b10d95205a	fix #134, not fix for the shrink to clear the queue.	11 years ago
winlin	30ebba0673	add config check utest	11 years ago
winlin	ebf9e560b1	refine the max connections, compare the system ulimit max open files, error when exeed limit	11 years ago
winlin	5f7ff37e64	fix the utest mock config bug	11 years ago
winlin	9f2da4e095	refine log, can be used when _srs_config is NULL.	11 years ago
winlin	7241fa8744	fix #126, srs_publiser add warnings. refine config utest.	11 years ago
winlin	b17c736f3f	fix #124, gop cache support disable video in publishing. 0.9.171.	11 years ago
winlin	50cd1d2360	refine the config	11 years ago
winlin	7865b0e935	refine config, check chunk size.	11 years ago
winlin	630bdf0c80	refine config, check the value of http api/stream.	11 years ago
winlin	7207c2f435	refine config, check all config item name.	11 years ago
winlin	1c27f3b913	refine config, warning when feature disabled.	11 years ago
winlin	91d2296836	fix #121, srs_info detail log compile failed. 0.9.168.	11 years ago
winlin	2e58fac5eb	fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167	11 years ago
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	11 years ago
winlin	d612597a8f	refine log of edge push/pull	11 years ago
winlin	77236920b6	add config utest, for default vhost	11 years ago
winlin	f1b1dc0c64	add utest for config full.conf, fix the chunk-size bug	11 years ago
winlin	0db2e6b8e9	fix the empty config error	11 years ago
winlin	75bfe2af78	refine the LF,CR	11 years ago
winlin	8cd9be4fce	add comments for LF,CR	11 years ago
winlin	c65a6b5d63	fix the conf_line bug of parse config directive.	11 years ago
winlin	86ad39f001	finish basic utest for config	11 years ago
winlin	8497b22d4a	complete the consts refine	11 years ago
winlin	1afa6ed607	refine consts.	11 years ago
winlin	2667815123	refine consts, move http consts to kernel consts	11 years ago
winlin	c46b3bd193	refie http consts.	11 years ago
winlin	573952e2fc	refine macros of HTTP	11 years ago
winlin	198a7f1e9d	refine the rtmp consts name	11 years ago
winlin	a9f7f1ecfe	refine the consts to kernel consts	11 years ago
winlin	baa20b2f31	refine the config consts	11 years ago
winlin	736ec48c71	move some consts to kernel consts	11 years ago
winlin	073d900674	add consts to kernel	11 years ago
winlin	f8423dfa90	fix #119: use iformat and oformat for ffmpeg transcode.	11 years ago
winlin	9bf7b722db	fix #119: use iformat and oformat for ffmpeg transcode.	11 years ago
winlin	2f0a72d7d1	refine config, add comments	11 years ago
winlin	a5f4323ea8	refine config, add comments	11 years ago
winlin	b4e2d70390	refine config comments, return the engines of transcode.	11 years ago
winlin	2293700728	refine config, remove the const string&	11 years ago
winlin	1accd8c790	refine config, add comments.	11 years ago
winlin	f572531eca	refine config, return the vhosts vector.	11 years ago
winlin	96e0e699dd	refine the get port, return a vector<string> contains ports.	11 years ago
winlin	1243d962b8	update comments of utility	11 years ago
winlin	b37aeff8d5	refine config, check name	11 years ago
winlin	25180c51b4	refine the config comments.	11 years ago
winlin	1e8981eb08	extracta parse_buffer for config	11 years ago
winlin	784d7499cf	refine config, add error line log	11 years ago
winlin	9f7d488fa4	refine config, add comments.	11 years ago
winlin	f6b084b679	remove the reload create function.	11 years ago
winlin	f4ffe0aaee	refine config, move file buffer to internal namespace	11 years ago
winlin	654c3c6d71	refine server, add comments	11 years ago
winlin	88dc1523d8	refine code, add comments for bandwidth; remove the bwtc configure script test item.	11 years ago
winlin	7945a42770	refine code, add the video tag comments.	11 years ago
winlin	26bfbaeb82	refine code.	11 years ago
winlin	465ff88b1f	refine hls avc/aac codec, move metadata to it.	11 years ago
winlin	e50968f404	refine the hls codec, add comments.	11 years ago
winlin	a4d3283cdd	refine hls codec sample info. 0.9.161	11 years ago
winlin	f020690ed7	add comments for the FLV/RTMP enums	11 years ago
winlin	5c4398f4a9	refine bandwidth check/test, flash publish test is ok.	11 years ago
winlin	9135aa117c	use librtmp to implemnts the bandwidth linux tool. 0.9.158	11 years ago
winlin	cc62d254f0	add librtmp bandwidth check/test client.	11 years ago
winlin	ccd99381e6	fix bug, when disable all, some code of HLS must be exported.	11 years ago
winlin	0322dbbfb2	big refine code, add author to bandwidth test/check.	11 years ago
winlin	b33a61a8da	finish refine bandwidth check/test server-side.	11 years ago
winlin	0fb51413f4	refine bandwidth test, use function ptr.	11 years ago
winlin	539b595604	refine the bandwidth server-side, use kbps limit and sample. 0.9.157	11 years ago
winlin	e220596675	refine bandwidth server-side, use sample and kbps limit	11 years ago
winlin	79e7e2d6cc	refine bandwidth server-side, use bandwidth sample and kbps limit service	11 years ago
winlin	3a1b3dd142	fix bandwidth bug, config item interval to float.	11 years ago
winlin	c319cc6a40	refine bandwidth test client, provides js and as library	11 years ago
winlin	b1dd0218be	refactor bandwidth test, refactor the interface of bandwidth server object.	11 years ago
winlin	88c94193a3	rename rtmp_stack to stack. remove the global templte function to member function.	11 years ago
winlin	9556790a5e	finish utest of protocol stack. 0.9.156	11 years ago
winlin	6a4b177475	refine shared ptr message, rename initialize to create	11 years ago
winlin	96e0273e99	refine hls, extract the flv/aac sample rates	11 years ago
winlin	dc7b952043	change HLS audio delay to 100ms. 0.9.153	11 years ago
winlin	f895523ac6	fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152	11 years ago
winlin	21a75924ad	fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152	11 years ago
winlin	aefff75d08	fix #103, support all aac sample rate, add detail codec logs.	11 years ago
winlin	f53abfa1d1	update comments for aac he or he-v2	11 years ago
winlin	b2303c5704	refine code, use macro for hls resample audio	11 years ago
winlin	921b7d239f	refine code, use macro for hls resample audio	11 years ago
winlin	63214d0f2b	fix #81: support all aac sample rate, for instance, 48000. to 0.9.150	11 years ago
winlin	5a41b1b538	finish kernel utest. to 0.9.149	11 years ago
winlin	95e73d0be1	remove the config log http api. 0.9.148	11 years ago
winlin	d219a7b67e	complete the normal kernel flv utest. 0.9.147	11 years ago
winlin	010eb09a30	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	11 years ago
winlin	8271bd657b	refine flv codec, rename fast encoder to flv vod stream decoder	11 years ago
winlin	032118581a	refine http/dvr/hls to use file reader/writer. 0.9.146	11 years ago
wenjiegit	d7454134c9	Update srs_app_hls.cpp ... for hls, srs should not allow player to cache m3u8 list. add #EXT-X-ALLOW-CACHE:NO to m3u8 file.	11 years ago
winlin	1a7735182f	refine the file stream, to file reader and writer. 0.9.142	11 years ago
winlin	492665e166	refine tcp client connect, extract to utility srs_socket_connect. 0.9.141	11 years ago
winlin	cb2967c967	refine forward, use utility to generate the tcUrl	11 years ago
winlin	aad42d7941	fix ubuntu14 build warnings	11 years ago
winlin	bfeb24c52b	update call response, add comments.	11 years ago
winlin	fea8755719	response the call message with null. 0.9.137	11 years ago
winlin	53ad510766	add comments for the connection remove	11 years ago
winlin	a3f9aa7e1e	fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136	11 years ago
winlin	efed34301c	add virtual destructor to SrsRefer	11 years ago
winlin	b357504b1d	fix #109: fix the system jump time, adjust system startup time. 0.9.135	11 years ago
winlin	0cd0761508	fix time jitter zero algorithm bug, reset when timestamp overflow.	11 years ago
winlin	1970e18ed6	fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133	11 years ago
winlin	f173345e15	support report summaries in heartbeat. 0.9.132	11 years ago
winlin	db253bc76b	fix fms token traverse bug, always update the token by the latest valid client.	11 years ago
winlin	1ae3e6c64c	performance refine, support 3k+ connections(270kbps). 0.9.130	11 years ago
winlin	41857edaee	support edge token traverse, fix #104. 0.9.129	11 years ago
winlin	10953c9743	support token auth in connect args. 0.9.128	11 years ago
winlin	094d82bd06	add connections count to api summaries. 0.9.127	11 years ago
winlin	6ee2ba049b	add srs bytes and kbps to api summaries. 0.9.126	11 years ago