303 commits

Author	SHA1	Message	Date
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	2015-03-16 15:39:49 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	2015-02-03 16:01:07 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	2698e6dbae	for bug #293, http live streaming framework.	2015-01-18 18:39:53 +08:00
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	2015-01-09 09:00:08 +08:00
qiang.li	310e49e7f3	add client num in statistic with traverse every client	2015-01-08 21:58:10 +08:00
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	2015-01-08 15:52:44 +08:00
qiang.li	46d716612c	add client num for stream in statistic	2015-01-07 23:27:24 +08:00
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	2015-01-07 14:31:42 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	67adc8dc61	merge with security bug fix.	2015-01-05 12:09:15 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	61a648f1d2	refine for #259, chmod -x files.	2014-12-19 09:07:31 +08:00
zhengfl	1e34d2a5cd	client connection no disconnect	2014-10-02 19:45:04 +08:00
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	2014-12-16 09:26:22 +08:00
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	2014-12-13 12:48:49 +08:00
winlin	5529813fcb	for bug #257, support NULL msg in msgs to send.	2014-12-13 11:22:40 +08:00
winlin	dac9f9c45c	refine the log level.	2014-12-12 23:07:35 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	68ade0a267	add log info for rtmp conn. change the mw_latency to 100 for realtime.	2014-12-10 18:06:09 +08:00
winlin	bba6063492	for bug #251, the shared ptr message share the header. 2.0.64	2014-12-07 11:25:05 +08:00
winlin	d827928eeb	for bug #251, merge the performance refines.	2014-12-06 09:55:51 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	e80c8603d4	fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59	2014-12-05 20:55:19 +08:00
winlin	92ecdf088b	for bug #251, use macro to define the fast cache and cond wait. 2.0.58	2014-12-05 18:47:17 +08:00
winlin	9ee138746f	for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57	2014-12-05 16:44:11 +08:00
winlin	dde05c6315	for bug #251, refine the send use cond wait.	2014-12-05 14:38:43 +08:00
winlin	4c1d5c0d1e	refine the log for mw and mr. 2.0.55	2014-12-05 11:31:06 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	90992b31a3	for bug #194, add the send macro to performance.	2014-12-04 13:54:02 +08:00
winlin	850946bb13	for bug #241, calc the small and sleep for merged read.	2014-12-03 22:39:25 +08:00
winlin	787ab674e3	fix #244, conn thread use cond to wait for recv thread error. 2.0.47.	2014-12-03 12:08:29 +08:00
winlin	6f963b50f3	refine code, publish recv thread sleep 697ms	2014-12-02 18:19:01 +08:00
winlin	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	2014-12-02 15:41:54 +08:00
winlin	24815e4efe	refine code for bug #239	2014-12-02 15:33:22 +08:00
winlin	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	2014-12-02 15:21:08 +08:00
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	2014-12-02 14:38:54 +08:00
winlin	29c6014192	refs #1670: fix the bug for bug #237, use us and ms timeout.	2014-12-02 10:40:21 +08:00
winlin	472b1742a2	for bug #237, use isolate thread to recv message. 2.0.41	2014-12-01 23:38:51 +08:00
winlin	0b631ee80d	for bug #235, pass timeout to recv thread.	2014-12-01 22:45:45 +08:00
winlin	22524f390a	rename the recv thread to queue recv thread for bug #237.	2014-12-01 22:23:05 +08:00
winlin	3d97048c3a	fix bug #217, add reuse conn to play different player.	2014-11-22 19:15:40 +08:00
winlin	3e81e6e0f1	refine code for bug #217, use recv thread to set the timeout.	2014-11-22 18:08:45 +08:00
winlin	58136ec178	fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30.	2014-11-22 17:58:02 +08:00
winlin	622218c4dd	for bug #217, use isolate thread to improve 17% performance.	2014-11-22 15:53:05 +08:00
winlin	5f48d4f566	refine comments for SrsMessageArray. 2.0.25	2014-11-19 10:44:50 +08:00
winlin	df35f75df1	refine response call, 2.0.24	2014-11-18 17:55:38 +08:00
winlin	749fac414b	refine code, donot response call when transaction id is zero.	2014-11-18 17:30:40 +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	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	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	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	46330dd196	fix #195: remove the confuse code st_usleep(0). 2.0.13.	2014-11-11 13:40:09 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +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	ab965655aa	refine forwarder, add tracable debug info. 0.9.202	2014-08-19 11:54:33 +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	ade2376da0	fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.	2014-08-03 21:22:40 +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	6ee9ea341a	refine code, rename SrsSocket to SrsStSocket	2014-07-26 20:08:37 +08:00
winlin	b19d2e8e2d	refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp	2014-07-26 20:07:12 +08:00
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	2014-07-22 11:01:20 +08:00
winlin	573952e2fc	refine macros of HTTP	2014-07-20 13:33:21 +08:00
winlin	198a7f1e9d	refine the rtmp consts name	2014-07-20 13:25:25 +08:00
winlin	a9f7f1ecfe	refine the consts to kernel consts	2014-07-20 13:23:45 +08:00
winlin	736ec48c71	move some consts to kernel consts	2014-07-20 13:11:53 +08:00
winlin	654c3c6d71	refine server, add comments	2014-07-16 11:23:49 +08:00
winlin	539b595604	refine the bandwidth server-side, use kbps limit and sample. 0.9.157	2014-07-13 10:59:26 +08:00
winlin	79e7e2d6cc	refine bandwidth server-side, use bandwidth sample and kbps limit service	2014-07-13 10:33:18 +08:00
winlin	b1dd0218be	refactor bandwidth test, refactor the interface of bandwidth server object.	2014-07-12 15:55:39 +08:00
winlin	88c94193a3	rename rtmp_stack to stack. remove the global templte function to member function.	2014-07-12 08:47:47 +08:00
winlin	492665e166	refine tcp client connect, extract to utility srs_socket_connect. 0.9.141	2014-06-29 14:39:56 +08:00
winlin	bfeb24c52b	update call response, add comments.	2014-06-28 21:34:21 +08:00
winlin	fea8755719	response the call message with null. 0.9.137	2014-06-28 16:43:57 +08:00
winlin	1ae3e6c64c	performance refine, support 3k+ connections(270kbps). 0.9.130	2014-06-22 20:01:25 +08:00
winlin	41857edaee	support edge token traverse, fix #104. 0.9.129	2014-06-21 12:39:04 +08:00
winlin	10953c9743	support token auth in connect args. 0.9.128	2014-06-21 11:41:00 +08:00
winlin	6ee2ba049b	add srs bytes and kbps to api summaries. 0.9.126	2014-06-19 15:28:05 +08:00
winlin	7166b666c8	refine http log.	2014-05-30 09:20:51 +08:00
winlin	5273509554	refine log, to 0.9.123	2014-05-29 14:16:34 +08:00
winlin	978e985519	fix #87: add source id for full trackable log. 0.9.120	2014-05-27 19:18:31 +08:00
winlin	8d99ef27cf	fix #84: unpublish source when edge stop, clear gop cache	2014-05-27 17:59:59 +08:00
winlin	7920348e5f	extract get_local_ip and get_peer_ip to app utility	2014-05-27 16:45:02 +08:00
winlin	b13bd70c86	http streaming support flv start index.	2014-05-26 13:57:08 +08:00
winlin	2c059d3a80	fix bug #72, also need stream_id for send_and_free_message. 0.9.101	2014-05-17 17:53:27 +08:00
winlin	4b8d3fe05f	refine log, add overflow log	2014-05-16 13:31:59 +08:00
winlin	b175821b62	refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97	2014-05-14 13:56:12 +08:00
winlin	3ebda13802	refine the ptr array free, 0.9.96	2014-05-14 09:58:42 +08:00
winlin	dc66c525fd	refine autofree, only free object, never free arrays	2014-05-14 09:41:41 +08:00
winlin	9ba786d1aa	fix bug of mem leak, free the left msgs if send error	2014-05-13 14:32:50 +08:00
winlin	befde6acf7	fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95	2014-05-13 14:24:39 +08:00
winlin	9006194cd7	refine framework to calc the kbps	2014-05-12 17:27:50 +08:00
winlin	8388da6325	add miss files. fix bug #60: support aggregate message	2014-05-08 14:33:25 +08:00
winlin	f8e8c81e50	refine log, simplify it. to 0.9.90	2014-05-04 16:29:57 +08:00
winlin	a4410a4fa9	update pithy-print to 10s. refine log	2014-05-04 10:45:13 +08:00
winlin	96a5c7b1ab	fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89	2014-05-03 22:59:21 +08:00
winlin	80ddddf823	refine RTMP protocol completed, to 0.9.81	2014-04-29 14:44:07 +08:00
winlin	be4c182d11	refine RTMP protocol stack.	2014-04-29 14:18:10 +08:00
winlin	ebf6203c3b	refine rtmp protocol stack, refer to go.rtmp	2014-04-29 13:39:16 +08:00
winlin	cb2959ae7d	fix bug #53, never use msg when sent it	2014-04-29 09:32:30 +08:00
winlin	c681098949	fix bug of edge, one fd for one thread	2014-04-28 17:20:35 +08:00
winlin	bc7648724d	use directly send publish edge mode.	2014-04-27 14:57:28 +08:00
winlin	16319d73fd	implements basic edge(play and publish), with bug	2014-04-27 12:28:45 +08:00
winlin	79c9c6dcb7	implements the proxy for edge publish mode	2014-04-27 11:11:15 +08:00
winlin	ec96072472	add publish edge framework	2014-04-27 09:29:37 +08:00
winlin	2bcaeccc51	edge support play and ingest origin stream. change to 0.9.77	2014-04-26 21:41:18 +08:00
winlin	b0951d36d3	refine source, rename req to _req	2014-04-26 17:16:18 +08:00
winlin	a63a3812e3	add srs app edge	2014-04-25 16:35:03 +08:00
winlin	d6948d613f	add author byteman for h264 to flv.	2014-04-25 15:27:50 +08:00
winlin	733ca2475d	call http api when dvr got keyframe	2014-04-22 17:32:45 +08:00
winlin	6f19a83114	dvr support plan and default session plan	2014-04-17 16:57:04 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	ce64dafc3c	use stream time for live duration. change to 0.9.64	2014-04-14 10:55:46 +08:00
winlin	2c6b6c6846	fix bug #47: use stream time to stop for duration of rtmpdump	2014-04-14 10:51:31 +08:00
winlin	9a036958d7	fix bug #45, support duration for live. change to 0.9.62	2014-04-13 21:37:26 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	70e73bc281	add comments for bug #39	2014-04-08 13:56:45 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +08:00
winlin	eea2310b07	refine consts	2014-04-07 09:07:12 +08:00
winlin	4e3fe36ae2	refine http server pages. change to 0.9.51	2014-04-05 13:14:59 +08:00
winlin	b71eb0d49a	support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44	2014-04-03 15:53:56 +08:00
winlin	e70609cea3	refine code, extract http hooks.	2014-04-01 18:40:24 +08:00
winlin	6913efe127	implements the http api/stream framework	2014-03-27 13:25:08 +08:00
winlin	ab3c6c92a0	rename srs-client to srs-rtmp-conn	2014-03-27 12:27:47 +08:00
winlin	aa89f9f51e	change to 0.9.37, for http api/stream	2014-03-27 12:14:04 +08:00

Renamed from trunk/src/app/srs_app_client.cpp (Browse further)