1997 Commits (0ff49fd299f3acad12a907410500c02fbb46cbf5)

Author	SHA1	Message	Date
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	10 years ago
winlin	6c833902f9	merge http api from tufang. 2.0.92	10 years ago
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	10 years ago
qiang.li	46d716612c	add client num for stream in statistic	10 years ago
winlin	44f5efda21	refine the print info.	10 years ago
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	10 years ago
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	10 years ago
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	10 years ago
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	10 years ago
winlin	89a3cf9efe	refine code, failed when specified complex but no ssl for srslibrtmp	10 years ago
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	10 years ago
qiang.li	08e9f6ef42	add play client num in statistic	10 years ago
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	10 years ago
winlin	ae63af6a4a	refine code, implements the stat.:	10 years ago
winlin	97bea51499	refine the api, response the error code and data.	10 years ago
winlin	cc796a433a	refine the statistic arch.	10 years ago
winlin	40ed2249e8	refine code to use the one coding style.	10 years ago
winlin	4bb17f0c81	replace the TAB with 4spaces	10 years ago
winlin	344ff24f66	add srs_app_statistic to upp project.	10 years ago
winlin	67adc8dc61	merge with security bug fix.	10 years ago
qiang.li	a4a93613d0	add statistic for stream	10 years ago
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	10 years ago
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	10 years ago
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	10 years ago
winlin	7f60d472e6	remove the change vhost forward.	10 years ago
winlin	45724bfaec	update conf for transcode.	10 years ago
winlin	0b9bbdbe74	Merge branch '1.0release' into develop	10 years ago
winlin	f9a33fbeee	fix the compile failed for utest at 32bits cpus	10 years ago
qiang.li	8d534d3470	get stream info use http api #227	10 years ago
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	10 years ago
winlin	f89941254a	refine code of security deny check	10 years ago
winlin	18b15b9099	refine comments of security deny check	10 years ago
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	10 years ago
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	10 years ago
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	10 years ago
winlin	07b207b7e3	remove test code for api-server.	10 years ago
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	10 years ago
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	10 years ago
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	10 years ago
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	10 years ago
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	10 years ago
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	10 years ago
winlin	569596c10d	update copyright, from 2013 to 2015	10 years ago
winlin	1824e18bd2	fix the comment bug.	10 years ago
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	10 years ago
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	10 years ago
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	10 years ago
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	10 years ago
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	10 years ago
winlin	5e9ff71740	refine the log verbose	10 years ago
winlin	2d229b09be	refine rtmp protocol stack comments	10 years ago
winlin	5a229e89bf	refine the rtmp protocol stack comments, the stream id in little-endian.	10 years ago
winlin	9e35664510	refine the simple handshake comment.	10 years ago
winlin	8757473a7a	Merge branch '1.0release' into develop	10 years ago
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	10 years ago
winlin	8ea6da2607	Merge branch '1.0release' into develop	10 years ago
winlin	dfd4eeca45	hotfix 1.0release, git checkout develop when commit	10 years ago
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	10 years ago
winlin	b8de3bd3b4	convert the core to unix format.	10 years ago
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	10 years ago
winlin	9788570ba5	fix bug for ubuntu14 to build.	10 years ago
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	10 years ago
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	10 years ago
winlin	b77e1de1d1	fix bug of utest	10 years ago
winlin	81e70e7bdb	for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.	10 years ago
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	10 years ago
winlin	7737042795	fix #264, remove the test code. 1.0.11	10 years ago
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	10 years ago
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	10 years ago
winlin	61a648f1d2	refine for #259, chmod -x files.	10 years ago
winlin	24815e4efe	refine code for bug #239	10 years ago
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	10 years ago
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	10 years ago
winlin	0c132e9781	update the log position.	10 years ago
winlin	127b96b255	add git2unix and git commit script.	10 years ago
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	10 years ago
winlin	575e50b6e2	hotfix to add comments on 1.0release	10 years ago
winlin	be53b10ed3	refine log position	10 years ago
winlin	d91a9dfa9d	udpate the srs_bwt.	10 years ago
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago
winlin	d672fae255	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8	10 years ago
winlin	44962c9142	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago
winlin	c1e9aed0ac	all wiki translated to English. 1.0.7	10 years ago
winlin	eba1740ed5	hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6.	10 years ago
winlin	f2f259d050	use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5.	10 years ago
winlin	2175102ea2	remove the sync script for mirror, which maybe updated.	10 years ago
winlin	3c31e6db05	for bug #186, read the args when discovery it. 1.0.4	10 years ago
winlin	e3e18b9915	for bug #186, read the args when discovery it. 1.0.4	10 years ago
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	10 years ago
winlin	aa98ca60b9	fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3.	10 years ago
winlin	77d14ff752	update readme, rename wiki/xxx to wiki/v1_xxx	10 years ago
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	10 years ago
winlin	bd158ec838	hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1.	10 years ago
winlin	2be014e4f5	remove the dead code for bug #180	10 years ago
winlin	fca500fae6	update package for pi, check the lsb_release.	10 years ago
winlin	024611cc08	update package for pi, check the lsb_release.	10 years ago
winlin	dddec3484e	update to 1.0beta, 1.0.0	10 years ago
winlin	effcd89f66	refine script.	10 years ago
winlin	6468b9e92b	refine script, to disable iptables and selinux. 0.9.225	10 years ago
winlin	5e8f8ad3b9	add add hosts and wiki.	10 years ago
winlin	3fcbb60b1c	add add hosts and wiki.	10 years ago
winlin	bea53dca97	refine the run script for centos7	10 years ago
winlin	a9cceee943	refine the run script for centos7	10 years ago
winlin	2ed794ad52	refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224	10 years ago
winlin	9789335d0b	fix #151, always reap ts whatever audio or video packet. 0.9.223.	10 years ago
winlin	13b092704d	refine code for bug #151, refine the source functions, add comments.	10 years ago
winlin	3f9a53de0e	refine cmake list, only for clion.	10 years ago
winlin	b830b995e6	fix bug #162, requires epoll. 0.9.222	10 years ago
zhengfl	2317f0e767	refine	10 years ago
zhengfl	bafdd83122	last	10 years ago
zhengfl	1e34d2a5cd	client connection no disconnect	10 years ago
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	10 years ago
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	10 years ago
winlin	5529813fcb	for bug #257, support NULL msg in msgs to send.	10 years ago
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	10 years ago
winlin	dac9f9c45c	refine the log level.	10 years ago
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	10 years ago
winlin	68ade0a267	add log info for rtmp conn. change the mw_latency to 100 for realtime.	10 years ago
winlin	6bdd0af728	for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69	10 years ago
winlin	7150a99f41	for bug #251, remove the mic(message iovs cache), no use.	10 years ago
winlin	a3de1c71fc	reset the mw_latency to 350.	10 years ago
winlin	1311b6fe65	fix #251, support 10k clients. 2.0.67	10 years ago
winlin	55d98fceed	for bug #251, add min msgs for queue cond wait.	10 years ago
winlin	438ee30ac1	for bug #251, refine the queue fast vector. 2.0.66	10 years ago
winlin	5a2b8afead	for bug #251, add queue fast vector. 2.0.66	10 years ago
winlin	8f72f79504	for bug #251, add queue fast cache. 2.0.65	10 years ago
winlin	1bbdae6632	refine code.	10 years ago
winlin	bba6063492	for bug #251, the shared ptr message share the header. 2.0.64	10 years ago
winlin	330819fb74	for bug #251, refine the mic algorithm. 2.0.63	10 years ago
winlin	d53fd7f570	for bug #251, support mic(message iovs cache). 2.0.61	10 years ago
winlin	32d537b96b	for bug #251, refine code before mic.	10 years ago
winlin	d827928eeb	for bug #251, merge the performance refines.	10 years ago
winlin	a6599f2250	remove the qt modify file.	10 years ago
winlin	9892b92258	Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61" ... It hurt performance, should never use it. This reverts commit d073adde58.	10 years ago
winlin	d073adde58	for bug #251, somhc(session-oriented message-header cache). 2.0.61	10 years ago
winlin	de993b6465	for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer.	10 years ago
winlin	d3a103184a	refine protocol sdk send msg, the chunk header generate.	10 years ago
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	10 years ago
winlin	528ae1e9b1	refine source and queue dump msgs.	10 years ago
winlin	e80c8603d4	fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59	10 years ago
winlin	92ecdf088b	for bug #251, use macro to define the fast cache and cond wait. 2.0.58	10 years ago
winlin	cd317859db	add mw sleep time and msgs/iovs table.	10 years ago
winlin	9ee138746f	for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57	10 years ago
winlin	dde05c6315	for bug #251, refine the send use cond wait.	10 years ago
winlin	4c1d5c0d1e	refine the log for mw and mr. 2.0.55	10 years ago
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	10 years ago
winlin	4d1c162ebd	fix utest failed bug.	10 years ago
winlin	4c6cf959c1	refine fast buffer, check available bytes to read.	10 years ago
winlin	98647d6e67	limit the user-space buffer size to 128KB, 128MB for 1k publishers.	10 years ago
winlin	76af04c55d	refine the recv buffer for mr.	10 years ago
winlin	09101b8d5e	remove the increase timeout for read, for there is no small timeout.	10 years ago
winlin	279b4ff4c9	refine macros	10 years ago
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	10 years ago
winlin	72fa33d9fb	update performance to 4k, when mr_sleep to 2000ms. 2.0.52	10 years ago
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	10 years ago
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	10 years ago
winlin	57f844b636	for bug #249, simplify the macro, 0 to disable chunk stream cache.	10 years ago
winlin	159ef3823c	for bug#241, simplify the buffer, donot realloc it.	10 years ago
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	10 years ago
winlin	d026861e23	for bug #241, simplify the buffer, donot reset when chunk size change.	10 years ago
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	10 years ago
winlin	f57801eb46	fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51	10 years ago
winlin	90992b31a3	for bug #194, add the send macro to performance.	10 years ago
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	10 years ago
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	10 years ago
winlin	8423974e3b	for bug #248, rename SrsBuffer to SrsFastBuffer.	10 years ago
winlin	0ea8cd9e84	for bug #248, use simple buffer for http.	10 years ago
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	d1d6023c70	for bug #241, limit the buffer for input chunk size.	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	2fdf994350	for bug #241, use heap to alloc the socket 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	b28dc7364e	refine the srs-librtmp, add hijack get the object.	10 years ago
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	10 years ago
winlin	9387d09f5f	refine the macros for windows of srs-librtmp	10 years ago
winlin	15ae4745f4	add macro to disable log.	10 years ago
winlin	07d55010fe	remove the free bytes api of srs-librtmp. use system default is ok.	10 years ago
winlin	f6032ffe6b	always use system log and context. allow hijack the human print macro.	10 years ago
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	10 years ago
winlin	29c6014192	refs #1670: fix the bug for bug #237, use us and ms timeout.	10 years ago
winlin	af83e18d7e	update the README for 1.5k publishers. 2.0.41	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	1847c5fef7	ignore the actual length of share key. 2.0.40	10 years ago
winlin	d171a26758	disable gop cache when not h.264. fix some warning.	10 years ago
winlin	c5dd334645	fix the warning of ts_info	10 years ago
winlin	47b4b694be	add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.	10 years ago
winlin	3e521d317d	update upp dir to srs.	10 years ago
winlin	b4057916b6	add qt project file. fix cmake file for clion.	10 years ago
winlin	efb73c5487	fix #235, refine handshake, replace union with template method. 2.0.38.	10 years ago
winlin	abb0fce3d8	fix bug for utest of message array, it does not free messages now.	10 years ago
winlin	23f4aa5737	for bug #235, fix bug of utest.	10 years ago
winlin	e167c97786	for bug #235, fix the return code bug.	10 years ago
winlin	818000dd18	for bug #235, use constructor and destructor for block and digest.	10 years ago
winlin	b32d3fb6aa	remove the read and write with SrsStream.	10 years ago
winlin	6d49cddc9d	for bug #235, refine code order of c1s1 and c2s2	10 years ago
winlin	646d6f6673	for bug #235, refine schema0 and schema1, extract dup code.	10 years ago
winlin	4b9875e279	for bug #235, use strategy to implements the schema0 and schema1.	10 years ago
winlin	5d883e2e29	for bug #235, move functions of block and digest to struct.	10 years ago
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	10 years ago
winlin	0d98dc88bf	Merge branch '1.0release'	10 years ago
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	10 years ago
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	10 years ago
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	10 years ago
winlin	bb85a0c856	for bug #229, remove the windows vs2010 build files for srs-librtmp build failed on windows.	10 years ago
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	10 years ago
winlin	904a06cadf	Merge branch '1.0release'	10 years ago
winlin	62b861718f	Revert "remove vs2010 files from master" ... This reverts commit f8a2c22f3a.	10 years ago
winlin	f8a2c22f3a	remove vs2010 files from master	10 years ago
winlin	4c0c3a9ada	refine merged code for allspace.	10 years ago
winlin	468941833c	change srs version to 2.0.33	10 years ago
winlin	18c308248e	refine code by winlin, for merged from allspace.	10 years ago
winlin	1855c9429c	merge from allspace, to srs-librtmp, for vs2010	10 years ago
winlin	bb54194c26	checkout master	10 years ago
winlin	1ce79980b1	checkout master	10 years ago
winlin	c49981ed6f	refine script	10 years ago
winlin	b825ea62f9	refine comments	10 years ago
winlin	8766ab5de2	add git2unix script	10 years ago
winlin	e76c53dae8	sleep when git commit failed.	10 years ago
winlin	ff73088091	fix bug of git commit	10 years ago
winlin	93ee15a552	udpate github commit to git commit	10 years ago
winlin	55461e866f	sync tags with csdn and oschina	10 years ago
winlin	131f598ab5	use multiple remote to commit and sync with csdn+oschina.	10 years ago
winlin	6a5f405ba0	add github script	10 years ago
winlin	e11fa383ca	udpate the srs_bwt.	10 years ago
winlin	02778dba4c	udpate the srs_bwt.	10 years ago
winlin	a2af051840	udpate the srs_bwt.	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