1742 commits

Author	SHA1	Message	Date
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	2014-12-04 18:35:50 +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	57f844b636	for bug #249, simplify the macro, 0 to disable chunk stream cache.	2014-12-04 15:49:24 +08:00
winlin	159ef3823c	for bug#241, simplify the buffer, donot realloc it.	2014-12-04 15:45:25 +08:00
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	2014-12-04 15:43:37 +08:00
winlin	d026861e23	for bug #241, simplify the buffer, donot reset when chunk size change.	2014-12-04 15:35:39 +08:00
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	2014-12-04 15:33:17 +08:00
winlin	f57801eb46	fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51	2014-12-04 14:58:40 +08:00
winlin	90992b31a3	for bug #194, add the send macro to performance.	2014-12-04 13:54:02 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	2014-12-04 13:05:13 +08:00
winlin	8423974e3b	for bug #248, rename SrsBuffer to SrsFastBuffer.	2014-12-04 11:32:32 +08:00
winlin	0ea8cd9e84	for bug #248, use simple buffer for http.	2014-12-04 11:29:47 +08:00
winlin	2cb8b7dd52	for bug #248, use simple buffer for hls.	2014-12-04 11:27:07 +08:00
winlin	315f981821	refine for bug #241, increase the small bytes for merged read.	2014-12-04 09:10:57 +08:00
winlin	d1d6023c70	for bug #241, limit the buffer for input chunk size.	2014-12-03 23:11:13 +08:00
winlin	5791ed59fd	for bug #241, refine the socket max buffer.	2014-12-03 23:05:42 +08:00
winlin	4785f882d4	for bug #241, refine the max buffer and kbps.	2014-12-03 22:51:19 +08:00
winlin	850946bb13	for bug #241, calc the small and sleep for merged read.	2014-12-03 22:39:25 +08:00
winlin	aee00877df	for bug #241, change buffer size when chunk size changed.	2014-12-03 21:46:47 +08:00
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	2014-12-03 19:27:27 +08:00
winlin	adf95d239e	refine code, move the ISrsBufferReader to srs_protocol_io	2014-12-03 19:09:59 +08:00
winlin	ea0e837cd6	move the srs_kernel_buffer to srs_protocol_buffer.	2014-12-03 18:56:09 +08:00
winlin	2fdf994350	for bug #241, use heap to alloc the socket buffer.	2014-12-03 14:27:36 +08:00
winlin	6cbf732e1a	for bug #237, thread donot sleep when timeout is 0.	2014-12-03 14:25:02 +08:00
winlin	c457364321	for bug #237, add name for thread. 2.0.47	2014-12-03 14:05:15 +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	565f29ed6c	Revert "for bug #241, merge big chunks for publish, no use." ... This reverts commit 6b57597718.	2014-12-02 22:26:20 +08:00
winlin	6b57597718	for bug #241, merge big chunks for publish, no use.	2014-12-02 22:26:04 +08:00
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	2014-12-02 19:28:36 +08:00
winlin	24a6a723ee	for bug #237, never sleep when thread interval is 0.	2014-12-02 19:22:06 +08:00
winlin	6f963b50f3	refine code, publish recv thread sleep 697ms	2014-12-02 18:19:01 +08:00
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	2014-12-02 17:16:20 +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	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	2014-12-02 15:21:08 +08:00
winlin	b28dc7364e	refine the srs-librtmp, add hijack get the object.	2014-12-02 14:02:28 +08:00
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	2014-12-02 13:41:41 +08:00
winlin	9387d09f5f	refine the macros for windows of srs-librtmp	2014-12-02 13:38:30 +08:00
winlin	15ae4745f4	add macro to disable log.	2014-12-02 13:21:26 +08:00
winlin	07d55010fe	remove the free bytes api of srs-librtmp. use system default is ok.	2014-12-02 13:03:25 +08:00
winlin	f6032ffe6b	always use system log and context. allow hijack the human print macro.	2014-12-02 12:51:07 +08:00
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	2014-12-02 12:19:17 +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	af83e18d7e	update the README for 1.5k publishers. 2.0.41	2014-12-02 07:27:20 +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	0e7836868c	for bug #235, refine the queue recv thread.	2014-12-01 22:53:03 +08:00
winlin	0b631ee80d	for bug #235, pass timeout to recv thread.	2014-12-01 22:45:45 +08:00
winlin	31eb9bf1c1	for bug #237, extract a queue recv thread.	2014-12-01 22:39:22 +08:00
winlin	22524f390a	rename the recv thread to queue recv thread for bug #237.	2014-12-01 22:23:05 +08:00
winlin	1847c5fef7	ignore the actual length of share key. 2.0.40	2014-12-01 22:09:09 +08:00
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	2014-12-01 21:34:35 +08:00
winlin	c5dd334645	fix the warning of ts_info	2014-12-01 20:54:19 +08:00
winlin	47b4b694be	add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.	2014-12-01 10:58:17 +08:00
winlin	3e521d317d	update upp dir to srs.	2014-11-30 16:54:57 +08:00
winlin	b4057916b6	add qt project file. fix cmake file for clion.	2014-11-30 16:06:37 +08:00
winlin	efb73c5487	fix #235, refine handshake, replace union with template method. 2.0.38.	2014-11-29 18:41:14 +08:00
winlin	abb0fce3d8	fix bug for utest of message array, it does not free messages now.	2014-11-29 18:36:40 +08:00
winlin	23f4aa5737	for bug #235, fix bug of utest.	2014-11-29 18:33:43 +08:00
winlin	e167c97786	for bug #235, fix the return code bug.	2014-11-29 18:16:15 +08:00
winlin	818000dd18	for bug #235, use constructor and destructor for block and digest.	2014-11-29 18:10:33 +08:00
winlin	b32d3fb6aa	remove the read and write with SrsStream.	2014-11-29 17:58:40 +08:00
winlin	6d49cddc9d	for bug #235, refine code order of c1s1 and c2s2	2014-11-29 17:05:54 +08:00
winlin	646d6f6673	for bug #235, refine schema0 and schema1, extract dup code.	2014-11-29 17:04:24 +08:00
winlin	4b9875e279	for bug #235, use strategy to implements the schema0 and schema1.	2014-11-29 16:17:07 +08:00
winlin	5d883e2e29	for bug #235, move functions of block and digest to struct.	2014-11-29 13:08:43 +08:00
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00
winlin	0d98dc88bf	Merge branch '1.0release'	2014-11-28 11:09:33 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	2014-11-27 18:50:54 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	bb85a0c856	for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows.	2014-11-27 18:31:25 +08:00
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	2014-11-27 18:20:13 +08:00
winlin	904a06cadf	Merge branch '1.0release'	2014-11-27 17:47:23 +08:00
winlin	62b861718f	Revert "remove vs2010 files from master" ... This reverts commit f8a2c22f3a.	2014-11-27 17:02:30 +08:00
winlin	f8a2c22f3a	remove vs2010 files from master	2014-11-27 16:16:04 +08:00
winlin	4c0c3a9ada	refine merged code for allspace.	2014-11-27 15:29:24 +08:00
winlin	468941833c	change srs version to 2.0.33	2014-11-27 15:23:16 +08:00
winlin	18c308248e	refine code by winlin, for merged from allspace.	2014-11-27 15:22:39 +08:00
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	2014-11-27 14:46:05 +08:00
winlin	bb54194c26	checkout master	2014-11-27 12:53:21 +08:00
winlin	1ce79980b1	checkout master	2014-11-27 12:52:47 +08:00
winlin	c49981ed6f	refine script	2014-11-27 12:51:33 +08:00
winlin	b825ea62f9	refine comments	2014-11-27 12:50:04 +08:00
winlin	8766ab5de2	add git2unix script	2014-11-27 12:45:34 +08:00
winlin	e76c53dae8	sleep when git commit failed.	2014-11-27 08:03:21 +08:00
winlin	ff73088091	fix bug of git commit	2014-11-27 08:02:17 +08:00
winlin	93ee15a552	udpate github commit to git commit	2014-11-27 08:00:11 +08:00
winlin	55461e866f	sync tags with csdn and oschina	2014-11-27 07:52:12 +08:00
winlin	131f598ab5	use multiple remote to commit and sync with csdn+oschina.	2014-11-27 07:47:39 +08:00
winlin	6a5f405ba0	add github script	2014-11-27 07:02:54 +08:00
winlin	e11fa383ca	udpate the srs_bwt.	2014-11-25 11:09:28 +08:00
winlin	02778dba4c	udpate the srs_bwt.	2014-11-25 11:05:45 +08:00
winlin	a2af051840	udpate the srs_bwt.	2014-11-25 10:59:38 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00
winlin	e492fa5353	fix #212, support publish aac adts raw stream. 2.0.31.	2014-11-24 16:28:52 +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	d3c770d252	refine librtmp, add audio video detail.	2014-11-21 17:09:52 +08:00
winlin	d80b580c2f	refine librtmp, remove the _get_ for some attribute get.	2014-11-21 16:08:29 +08:00
winlin	bb7a19636a	fix the bandwidth file name bug.	2014-11-21 14:30:01 +08:00
winlin	2a9bec3d89	adjust the api, move audio and h264 after rtmp	2014-11-21 14:26:47 +08:00
winlin	aa69f6197a	srs-librtmp add rtmp prefix for rtmp apis. 2.0.29	2014-11-21 14:18:50 +08:00
winlin	180106ce70	refine librtmp, move the utils and human to end section.	2014-11-21 14:11:53 +08:00
winlin	10bc5399ec	refine librtmp api, add prefix utils for utilities.	2014-11-21 14:09:17 +08:00
winlin	b3bb2cdf2b	refine code, rename the human functions to prefixed with srs_human_	2014-11-21 14:03:30 +08:00
winlin	30e7c38a48	refine code, add human readable section	2014-11-21 13:56:09 +08:00
winlin	d9474d7600	refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28.	2014-11-21 13:48:57 +08:00
winlin	a058eeeb20	fix #212, support publish audio raw frames. 2.0.27	2014-11-20 13:36:14 +08:00
winlin	d6072b16c0	support compile srs-librtmp on windows. 2.0.26	2014-11-19 16:16:04 +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	fbcb63f775	v2.0, 2014-11-18, all wiki translated to English. 2.0.23.	2014-11-18 13:40:58 +08:00
winlin	9f60a6738a	add comments for listen	2014-11-17 10:27:05 +08:00
winlin	0c39a704c2	update build srs librtmp single	2014-11-16 11:29:50 +08:00
winlin	2c601a0069	fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22.	2014-11-15 16:53:24 +08:00
winlin	b4269c8d67	refine name of srslibrtmp, raw_stream to h264_raw_stream	2014-11-15 16:31:42 +08:00
winlin	278ff845d3	fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21.	2014-11-15 16:30:37 +08:00
winlin	ecfbcd68d8	refine srslibrtmp, rename flv_bool to srs_flv_bool	2014-11-15 16:07:33 +08:00
winlin	3292136f70	update research, flv ingester, support atc time flv.	2014-11-15 15:27:19 +08:00
winlin	30d48905b3	refine git sync script, checkout master	2014-11-15 14:34:23 +08:00
winlin	bb5e99f562	fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20.	2014-11-15 14:29:25 +08:00
winlin	7ebca6cb5b	refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19	2014-11-15 13:20:58 +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	38a683192a	fix typo	2014-11-13 17:04:13 +08:00
winlin	f2f02b06d5	for bug #194, refine code, to 2.0.17	2014-11-13 16:56:59 +08:00
winlin	8845bb7caf	for bug #194, refine code, remove the old duplicated code.	2014-11-13 16:56:41 +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	7cf855f242	for bug #199, refine the header generate	2014-11-12 18:41:24 +08:00
winlin	953159258c	refine code, rename the c0c3 header cache and iov cache.	2014-11-12 18:19:09 +08:00
winlin	ab93506b01	for bug #199, refine the api of send message.	2014-11-12 17:59:32 +08:00
winlin	55580ca900	add comments about bug #197	2014-11-12 13:47:04 +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