2599 Commits (2a01540433ebd4f65968cf4d7c4ab644c8563ffa)

Author	SHA1	Message	Date
winlin	1f1776a0d8	fix the export project bug. wakeup connection when dispose server.	10 years ago
winlin	bf9166dbec	Merge branch '2.0release' into develop	10 years ago
winlin	969ed7b0ae	refine build summary.	10 years ago
winlin	66837ffa6e	fix the thread stop bug, must wait when not joinable.	10 years ago
winlin	d317528af9	refine the signal manager.	10 years ago
winlin	7996b3b789	add warning for gmp, use gmc to detect memory leak.	10 years ago
winlin	f347099fd1	for memory leak detect, move the payload create to message.	10 years ago
winlin	863dddde09	fix typo of code.	10 years ago
winlin	19e1f610a3	merge from bravo, parse the http reponse in json of bravo system.	10 years ago
winlin	00d1fdded0	Merge branch '2.0release' into develop	10 years ago
winlin	574cf6a094	use libfdk_aac for srs2.	10 years ago
winlin	00a25ee5c5	cleanup connections when terminate server.	10 years ago
winlin	d7e5df2578	cleanup connections when terminate server.	10 years ago
winlin	573495a19f	refine the memory watcher.	10 years ago
winlin	bb4db61192	add srs memory watcher.	10 years ago
winlin	811ef4bcf6	dispose the gop cache	10 years ago
winlin	600e8e10d0	Merge branch '2.0release' into develop	10 years ago
winlin	beb0431746	detect the monotonically increase and warn to use mix_correct	10 years ago
winlin	57f01185f5	Merge branch '2.0release' into develop	10 years ago
winlin	2d9f258eaf	refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio.	10 years ago
winlin	17d6016bf6	Merge branch '2.0release' into develop	10 years ago
winlin	ec24533955	use smaller value for publish timeout.	10 years ago
winlin	a6dd8fb3a1	fix #421, when mix correct on, must check the type of dequeue msg.	10 years ago
winlin	5d75e32e1d	Merge branch '2.0release' into develop	10 years ago
winlin	a1dd734318	fix #421, drop video for unkown RTMP header.	10 years ago
winlin	679b4317d8	fix the build failed bug.	10 years ago
winlin	0fbfad4172	fix gop cache, drop video only when video and not h.264	10 years ago
winlin	2a1db36750	refine the pithy print of ingesters.	10 years ago
winlin	d10d57716a	Merge branch '2.0release' into develop	10 years ago
winlin	e4c27a51b8	fix the hls bug	10 years ago
winlin	4400b12515	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	10 years ago
winlin	5dd81d182c	Merge branch '2.0release' into develop	10 years ago
winlin	af9efe9213	disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls.	10 years ago
winlin	982a937e84	Merge branch '2.0release' into develop	10 years ago
winlin	4e42b9c628	copy the request for hls.	10 years ago
winlin	091b480ac9	Merge branch '2.0release' into develop	10 years ago
winlin	679583dad6	refine comments of ffmpeg.	10 years ago
winlin	c1172c9940	Merge branch '2.0release' into develop	10 years ago
winlin	03d951c0fb	fix the audio or video pid generate bug.	10 years ago
winlin	c3c4cb2f2a	Merge branch '2.0release' into develop	10 years ago
winlin	96f8f1f502	fix build bug.	10 years ago
winlin	09750082e5	Merge branch '2.0release' into develop	10 years ago
winlin	0a87b567f6	fix the build failed bug.	10 years ago
winlin	9dce971d57	merge from srs2	10 years ago
winlin	223ae194b1	fix #209, cleanup hls when stop and timeout. 2.0.173.	10 years ago
winlin	4a80a5a71e	for #209, support cleanup when srs stop.	10 years ago
winlin	860d68e6e7	for #374, use fast stop for ingesters to stop many FFMPEG.	10 years ago
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	10 years ago
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	10 years ago
winlin	db57a519a9	for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly.	10 years ago
winlin	597993d414	support pure video hls.	10 years ago
winlin	5caafadd45	fix #409: support pure video hls. 2.0.172.	10 years ago
winlin	27a1fee6b9	Merge branch '2.0release' into develop	10 years ago
winlin	af4eec90ac	for srs-dolphin, support HTTP and RTMP.	10 years ago
winlin	b44987fac7	Merge branch '2.0release' into develop	10 years ago
winlin	394e070b2e	support dolphin	10 years ago
winlin	e5461d2df9	refine code	10 years ago
winlin	60775485c4	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	385ee893f5	update readme	10 years ago
zhengfl	4864e796d6	fix #408:Queue丢视频时，不应该丢弃SequenceHeader	10 years ago
winlin	7e04975b8d	fix the test configure script	10 years ago
winlin	1150cde829	fix the verbose build failed.	10 years ago
winlin	ca01bd407b	fix the bug of test configure script.	10 years ago
winlin	fec8422d6b	fix bug of configure.	10 years ago
winlin	eb488e3bde	fix the test configure script bug	10 years ago
winlin	02c4741d64	add usage and make jobs support for configure test script	10 years ago
winlin	c1b9541b5c	support disable all	10 years ago
winlin	9ab579c6e8	refine the configure test script.	10 years ago
winlin	409c1e4823	Merge branch '2.0release' into develop	10 years ago
winlin	2e1ca3c751	fix the build failed bug.	10 years ago
winlin	cd162c2848	merge from 2.0	10 years ago
winlin	d12fc7fcc5	fix #405, improve the HTTP FLV performance to 6k. 2.0.171	10 years ago
winlin	4df19ba99a	for #405, improve the http flv to 3k. 2.0.170	10 years ago
winlin	8a9dbaefb7	use cache for flv tag header.	10 years ago
winlin	960341b9b2	for #405, improve the HTT FLV to 3k. 2.0.169	10 years ago
winlin	b53e9814b3	Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release	10 years ago
winlin	fc995473eb	for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168	10 years ago
winlin	2661e3c419	Merge branch '2.0release' into develop	10 years ago
winlin	cf9ee04611	fix the utest build failed bug.	10 years ago
winlin	f540ce307b	merge from 2.0	10 years ago
winlin	069ee0afc3	fix #404, register handler then start http thread. 2.0.167.	10 years ago
winlin	a45cf38d44	auto detect the sed command for osx.	10 years ago
winlin	f510a3d6fb	add /api/v1/versions for http server for go-sharp to detect.	10 years ago
winlin	58b336451d	Merge branch '2.0release' into develop	10 years ago
winlin	94efe3f727	update wiki	10 years ago
winlin	5840bc1053	add flv cluster confs.	10 years ago
winlin	7571d70f16	fix the build failed bug.	10 years ago
winlin	2f66c8dd09	Merge branch '2.0release' into develop	10 years ago
winlin	93a1d097dc	update jwplayer to support play HTTP flv.	10 years ago
winlin	829b3a392b	merge from 2.0	10 years ago
winlin	e96150b7db	update readme	10 years ago
winlin	6b28dec8ec	merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166	10 years ago
winlin	5908096fc3	refine the thread, protocol, kbps code. 2.0.166	10 years ago
winlin	af172d9593	refine script, use PROTOCOL as RTMP.	10 years ago
winlin	68d835021e	refine code, move the kbps to protocol	10 years ago
winlin	478873fdec	Merge branch '2.0release' into develop	10 years ago
winlin	cfc0877ec9	refine the thread, add all callback.	10 years ago
winlin	e5f449ce36	refine the thread to three category.	10 years ago
winlin	2f0ef87d6d	refine code, rename the sync call to common class.	10 years ago
winlin	0bb90145ba	fix #391, copy request for async call.	10 years ago
winlin	6bfb743aa0	remove the unused app http file	10 years ago
winlin	f0ae66a081	merge the app http to conn.	10 years ago
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	10 years ago
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	10 years ago
winlin	d645411392	refine the kbps comments, add one usage.	10 years ago
winlin	7243cdbff6	merge from 2.0release.	10 years ago
winlin	6ca46e84bc	fix #397, the USER_HZ maybe not 100. 2.0.165	10 years ago
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	10 years ago
winlin	46a81372e7	fix #398, set recv timeout for http connection.	10 years ago
winlin	6f8c076b30	add comments for srs thread, add never quit thread.	10 years ago
winlin	948d200ce1	fix #400, parse when got entire http header, by feilong. 2.0.164.	10 years ago
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	10 years ago
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	10 years ago
winlin	0f7cafe50b	order the xcode project	10 years ago
winlin	f6d2fd991b	merge from 2.0.162	10 years ago
winlin	c617d2aaa5	support push flv stream over HTTP POST to SRS.	10 years ago
winlin	39f5f80b6c	Merge branch '2.0release' into develop	10 years ago
winlin	77ee2400df	fix the unicode to ascii	10 years ago
winlin	1fd69beea5	Merge branch '2.0release' into develop	10 years ago
winlin	7fc1cda392	add stream status to api.	10 years ago
winlin	7ce9398b41	Merge branch '2.0release' into develop	10 years ago
winlin	ac13817aae	update donation	10 years ago
winlin	2d61a8cfaf	Merge branch '2.0release' into develop	10 years ago
winlin	f6252c7f72	enable hls for push flv.	10 years ago
winlin	644454a4f5	Merge branch '2.0release' into develop	10 years ago
winlin	ffdabf32ed	add push flv conf	10 years ago
winlin	f13c4d3a0f	Merge branch '2.0release' into develop	10 years ago
winlin	e221d002a2	fix the flv caster bug, when nread is 0, disconnect it.	10 years ago
winlin	e516c7f7a5	Merge branch '2.0release' into develop	10 years ago
winlin	ad32048c1c	fix the http flv stream caster.	10 years ago
winlin	cba6675560	refine the http message, set the connection if required.	10 years ago
winlin	ba6c3132e3	refine code, use decoder to parse flv stream	10 years ago
winlin	411f5a1d2a	Merge branch '2.0release' into develop	10 years ago
winlin	ea1e015a4e	fix the http read chunked encoding bug.	10 years ago
winlin	da00b67c76	Merge branch '2.0release' into develop	10 years ago
winlin	a95fd6d140	read the http flv stream.	10 years ago
winlin	022b6aa561	refine the http remux for http flv stream.	10 years ago
winlin	f0c24eeacc	add stream caster for post flv over http.	10 years ago
winlin	91e285b0cd	Merge branch '2.0release' into develop	10 years ago
winlin	4b372d8d16	change primary to the primary branch.	10 years ago
winlin	94681702e1	Merge branch '2.0release' into develop	10 years ago
winlin	e63b8eda51	migarate to srs org.	10 years ago
winlin	42ddb76544	Merge branch '2.0release' into develop	10 years ago
winlin	8603dba697	migarate to srs org.	10 years ago
winlin	17b15deee6	Merge branch '2.0release' into develop	10 years ago
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	10 years ago
winlin	53e92a17f5	Merge branch '2.0release' into develop	10 years ago
winlin	115daa3cc1	migarate from winlinvip to srs org	10 years ago
winlin	5559fb9842	Merge branch '2.0release' into develop	10 years ago
winlin	b3bd007f0d	update git commit	10 years ago
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	10 years ago
tufang14	b6d650cdb4	m3u8 mount bug	10 years ago
winlin	dbcd7d883b	add script check_hls_backup.sh to research hls.	10 years ago
winlin	e50996270e	fix the config parse error.	10 years ago
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	10 years ago
winlin	7b157b0678	refine hls ingester, quit when error.	10 years ago
winlin	aabe84046c	refine hls ingester, quit when error.	10 years ago
winlin	114f4447bb	Merge branch '2.0release' into develop	10 years ago
winlin	4e5ddb51e7	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	10 years ago
winlin	c514a4ceeb	use atc for ingest hls aac time.	10 years ago
winlin	3e0ba172a3	Merge branch '2.0release' into develop	10 years ago
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	10 years ago
winlin	7d5f1c2be8	Merge branch '2.0release' into develop	10 years ago
winlin	ba6736839b	support hls ingest, fix the bugs.	10 years ago
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	10 years ago
winlin	23b978c0bb	merge from github	10 years ago
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	10 years ago
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	10 years ago
J	aca02b6d6b	for #384,refine code for empty body request.	10 years ago
J	8adbdc39e3	for #384,refine code for empty body request.	10 years ago
J	a71db53661	for #384,refine code for empty body request.	10 years ago
J	56f75cbbe9	fix #384	10 years ago
winlin	6726a88f47	merge from 2.0release	10 years ago
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	10 years ago
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	10 years ago
winlin	542aab4557	fix the hls notify bug, pass the query to get path.	10 years ago
winlin	70c1d3cc7e	Merge branch '2.0release' into develop	10 years ago
winlin	02a2cb7e1a	for #381, refine the hls notify, report one by one.	10 years ago
winlin	a4216cc582	add todo for ts parse.	10 years ago
winlin	40eab7fc88	for #381, refine the deviation for hls.	10 years ago
winlin	0c939e7114	merge from 2.0.160:	10 years ago
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	10 years ago
winlin	9759b78da8	Merge branch '2.0release' into develop	10 years ago
winlin	0000c945ea	refine the proxy api server.	10 years ago
winlin	fe1886aa08	add proxy for hls	10 years ago
winlin	e5b8e0da01	fix async call and hls_nb_notify bug.	10 years ago
winlin	5d37e47783	support config the hls_nb_notify.	10 years ago
winlin	0a7cea063c	refine http read, support c style api	10 years ago
winlin	5c00ce8a96	refine hls on_hls_notify, read a little of ts.	10 years ago
winlin	1f93fb3399	refine hls notify, support timeout.	10 years ago
winlin	d8988da0ea	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	310157ab77	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	e6d6bdfe57	refine the hls_on_notify, only read a chunk.	10 years ago
winlin	17c1423f4a	Merge branch '2.0release' into develop	10 years ago
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	10 years ago
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	10 years ago
winlin	425e69e0cd	Merge branch '2.0release' into develop	10 years ago
winlin	23b310971e	guess again when annexb change to ibmf.	10 years ago
winlin	71e1602458	merge from 2.0.159	10 years ago
winlin	bd77f995bf	ignore the unknown flv tag.	10 years ago
winlin	546be09219	fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.	10 years ago
winlin	29ac4c724b	change default log tank to file.	10 years ago
winlin	cfed8e81c5	merge from 2.0.158	10 years ago
winlin	e56d7add44	fix bug of config to parse the default value. 2.0.158	10 years ago
winlin	aef97db77a	refine the config code.	10 years ago
winlin	931370e9f6	Merge branch '2.0release' into develop	10 years ago
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	10 years ago
winlin	e958305d09	Merge branch '2.0release' into develop	10 years ago
winlin	6e2d756e1b	fix the bug of h.264 bit stream demux.	10 years ago
winlin	bd7db5aed6	only ignore the aud message.	10 years ago
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	10 years ago
winlin	4329366c08	for #304, do not add deviation for absolute overflow.	10 years ago
winlin	4f9df4f1a0	merge from 2.0.157, reap ts on the IDR.	10 years ago
winlin	77c29da26b	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	10 years ago
winlin	70c59da1bf	enhanced avc decode, parse the sps get width+height. 2.0.156.	10 years ago
winlin	7e1749e029	refine the comments.	10 years ago
winlin	e458305f81	add utc time format.	10 years ago
winlin	90cd16aae4	Merge branch '2.0release' into develop	10 years ago
winlin	56cd373015	support hls callback with duration.	10 years ago
winlin	64b065e450	for hls callback, add duration of ts.	10 years ago
winlin	c4466a8c0c	fix crash bug for hls cleanup.	10 years ago
winlin	eb54ec25c9	fix compile errors.	10 years ago
winlin	cb148e43ee	merge from 2.0.155	10 years ago
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	10 years ago
winlin	d95e5a3f47	Merge branch '2.0release' into develop	10 years ago
winlin	4d98cbb965	add hls config in api.	10 years ago
winlin	fe5783e7a4	merge 2.0.154	10 years ago
winlin	8401d9ac06	fix #366, config hls to disable cleanup of ts. 2.0.154.	10 years ago
winlin	2d3d628865	merge from 2.0.153	10 years ago
winlin	717d088376	support server cycle handler. 2.0.153.	10 years ago
winlin	e75b7e89d6	merge from 2.0.152	10 years ago
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	10 years ago
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	10 years ago
winlin	97442c56b6	enhance hls in floor mode.	10 years ago
winlin	76c1957260	enhance hls, increase piece one by one.	10 years ago
winlin	ef28865991	merge from 2.0.151	10 years ago
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	10 years ago
winlin	9be7fbba7d	user smaller deviation to avoid dup ts.	10 years ago
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	10 years ago
winlin	40f186ba82	Merge branch '2.0release' into develop	10 years ago
winlin	cd682ae4be	update donations. fix hls path bug.	10 years ago
winlin	abbed8f66c	merge from 2.0release	10 years ago
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	10 years ago
winlin	922adaf59f	Merge branch '2.0release' into develop	10 years ago
winlin	85afb6ea6f	add donation. fix bug of adts.	10 years ago
winlin	01ee456649	fix the ts parse bug, should never complete message when PES packet length is 0.	10 years ago
winlin	75ca70c619	Merge branch '2.0release' into develop	10 years ago
tufang14	0faaa61be7	seg fault ... seg fault	10 years ago
winlin	a5c5befad1	for parse video ts.	10 years ago
winlin	896983c1dc	refine the aac codec enum name	10 years ago
winlin	1401f2e0ab	ignore when sps/pps consumed all frame.	10 years ago
winlin	12d5431f3b	Merge branch '2.0release' into develop	10 years ago
winlin	b319e9ff9c	ignore when sps/pps consumed all frame.	10 years ago
winlin	c250e3e651	Merg branch '2.0release' into develop	10 years ago
winlin	e818f36316	fix #360, fix build bug for centos7.	10 years ago
winlin	713cedfbb4	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	d16ae193f6	Merge branch '2.0release' into develop	10 years ago
winlin	fcab17741c	fix #222, the dvr path rule changed.	10 years ago
winlin	df3f24403e	Merge branch '2.0release' into develop	10 years ago
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	09ce6651eb	Merge branch '2.0release' into develop	10 years ago
winlin	1cb2992808	refine build for modules, add defines.	10 years ago
winlin	0a7b179e14	Merge branch '2.0release' into develop	10 years ago
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	10 years ago
winlin	e7e17cf15d	fix osx bug.	10 years ago
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	10 years ago
winlin	e45c62003a	Merge branch '2.0release' into develop	10 years ago
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	10 years ago
winlin	7065db192c	for #354, remove the double underscore of macro.	10 years ago
winlin	45d9018051	Merge branch '2.0release' into develop	10 years ago
winlin	c6817cc422	for #354, remove the double underscore of macro.	10 years ago
winlin	3ca906d560	Merge branch '2.0release' into develop	10 years ago
winlin	014993ad1e	remove the sudo of log.	10 years ago
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	10 years ago
winlin	b1142d83fc	Merge branch '2.0release' into develop	10 years ago
winlin	0319e85f99	support config the audio overflow ratio.	10 years ago
winlin	b7138ba9c5	merge from 2.0	10 years ago
tufang14	e319da3329	小瑕疵 ... 小瑕疵	10 years ago
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	10 years ago
winlin	4a50bf1894	Merge branch '2.0release' into develop	10 years ago
winlin	fbd722bf76	refine the fast buffer to more readable.	10 years ago
winlin	d25eb0aaa2	merge from 2.0	10 years ago
winlin	f36e4a443d	refine the fast buffer. 2.0.144	10 years ago
winlin	6a98758435	revert the changes for SRS2.	10 years ago
winlin	df2644c850	merge from 2.0release	10 years ago
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	10 years ago
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	10 years ago
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	10 years ago
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	a28c051c2c	osx support build nginx and ffmpeg	10 years ago
winlin	f3e5431d0f	check what a fuck os for some fresh.	10 years ago
tufang14	1cc3384a19	seg fault ... seg fault	10 years ago
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	10 years ago