3988 commits

Author	SHA1	Message	Date
runner365	4fdf242e99	change two thread to one thread	2020-02-11 20:37:42 +08:00
winlin	d2a071f041	Add TODO for incompatible APIs of librtmp	2020-02-11 19:32:46 +08:00
Alex.CR	3847807534	solve srt repush bugs (#1596) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs	2020-02-09 11:50:58 +08:00
runner365	1c6203bda2	solve repush srt bugs	2020-02-09 11:09:48 +08:00
runner365	1941f55475	if there isn't srt connect, it needn't epoll wait	2020-02-05 21:21:12 +08:00
winlin	bdc7973596	Merge branch '3.0release' into develop	2020-02-05 14:18:07 +08:00
winlin	fc769550db	Fix #665, fix HTTP-FLV reloading bug. 3.0.116	2020-02-05 14:17:30 +08:00
winlin	f6fa889393	For #1592, default ff_log_level to info	2020-02-05 13:20:37 +08:00
winlin	c6d914bc13	Fix #1592, fix terminal echo off by redirect process stdin. 3.0.115	2020-02-05 13:04:00 +08:00
winlin	c50c51889a	For #1592, support ff_log_level and default to warning	2020-02-05 12:32:15 +08:00
winlin	2fa151726b	For #1592, rename ff_log_dir.	2020-02-05 12:15:44 +08:00
winlin	823b4fa56f	Merge branch '3.0release' into develop	2020-02-04 19:34:09 +08:00
winlin	a99cee2819	For #1186, refactor security check. 3.0.114	2020-02-04 19:33:11 +08:00
winlin	b9d45ba7d9	For #1186, refactor security check. 3.0.114	2020-02-04 19:21:15 +08:00
winlin	c51c378869	For #1186, refactor security check. 3.0.114	2020-02-04 19:07:54 +08:00
winlin	3023dc7b40	Update project code. 4.0.3	2020-02-04 17:11:22 +08:00
winlin	55fa62e41f	Update version4	2020-02-04 17:06:10 +08:00
winlin	59439cf8b5	Merge branch '3.0release' into develop	2020-02-04 17:05:19 +08:00
winlin	c01806d5c4	Refine version3	2020-02-04 17:04:03 +08:00
winlin	4f39303f37	Fix #939, response right A/V flag in FLV header. 3.0.113	2020-02-04 17:02:02 +08:00
winlin	68efca4fa9	For #939, always enable fast FLV streaming.	2020-02-04 16:39:01 +08:00
winlin	a2a6ca8258	For #939, always enable fast FLV streaming.	2020-02-04 16:13:48 +08:00
winlin	fb555b4d8f	Merge branch '3.0release' into develop	2020-01-29 20:31:05 +08:00
winlin	c9a2e19b2f	Support isolate version file. 3.0.112	2020-01-29 20:30:58 +08:00
winlin	77114c7df0	Merge SRS3	2020-01-29 20:30:06 +08:00
winlin	41f3925abc	Add version file for srs3	2020-01-29 20:28:37 +08:00
winlin	23ece94064	Fix #1206, dispose ingester while server quiting. 3.0.111	2020-01-29 20:22:28 +08:00
winlin	a6f88805f3	Remove test code	2020-01-29 14:42:18 +08:00
winlin	f18cc89860	Update version	2020-01-28 21:50:08 +08:00
winlin	31db28b70d	Update version	2020-01-28 21:48:53 +08:00
winlin	c90f441655	Update version	2020-01-28 21:47:04 +08:00
winlin	7c3b3608c0	Update version	2020-01-28 21:46:19 +08:00
winlin	feca34ee59	Update version	2020-01-28 21:46:05 +08:00
winlin	ec69b0786c	Update version	2020-01-28 21:45:37 +08:00
winlin	6a514732b5	Update version	2020-01-28 21:45:05 +08:00
winlin	afc0faf738	Use multiple revisions. 3.0.111	2020-01-28 21:42:48 +08:00
winlin	deaa0f0f15	Update version	2020-01-28 21:41:58 +08:00
winlin	0fc026ef6b	Update version	2020-01-28 21:38:28 +08:00
winlin	6ed6ce58e4	Merge SRS3	2020-01-28 21:37:37 +08:00
winlin	adf7ef4511	Fix #1230, racing condition in source fetch or create. 3.0.110	2020-01-28 21:35:06 +08:00
winlin	b605edb9b3	Merge 3.0	2020-01-27 19:52:41 +08:00
winlin	5d365bade8	Fix #1303, do not dispatch previous meta when not publishing. 3.0.109	2020-01-27 19:46:08 +08:00
winlin	d9bbd97d72	Allow use libsrt.so for SRT is MPL license.	2020-01-26 17:41:05 +08:00
winlin	07f4bc65c3	Merge branch '3.0release' into develop	2020-01-26 17:33:29 +08:00
winlin	01870cce56	Allow use libst.so for ST is MPL license.	2020-01-26 17:33:10 +08:00
winlin	d5c1546237	Update doc for SRT	2020-01-26 14:37:59 +08:00
winlin	88c9c13707	Update readme for SRT	2020-01-26 14:17:42 +08:00
winlin	a7631a2850	Update doc	2020-01-26 12:24:02 +08:00
winlin	fd3e4f406a	Update doc	2020-01-26 11:39:02 +08:00
winlin	ec3b442a42	Update doc	2020-01-26 11:29:29 +08:00
winlin	c9f3706425	Move doc	2020-01-26 11:14:18 +08:00
winlin	2775a391e0	Fix #878, remove deprecated #EXT-X-ALLOW-CACHE for HLS. 3.0.108	2020-01-25 20:03:22 +08:00
winlin	74154cdfd9	Fix #703, drop video data util sps/pps. 3.0.107	2020-01-25 18:05:18 +08:00
winlin	a17c1e5f65	Merge SRT from runner365	2020-01-25 17:24:25 +08:00
runner365	8d277c6e8b	solve merge problem	2020-01-25 16:24:04 +08:00
runner365	dece458a90	solve rtmp client timeout bugs in srt2rtmp	2020-01-25 16:15:27 +08:00
winlin	bbc7023f85	Merge SRS3	2020-01-25 15:05:52 +08:00
winlin	978d5e993b	Fix #1108, reap DVR tmp file when unpublish. 3.0.106	2020-01-25 15:04:34 +08:00
winlin	5d0833fcc3	Add author runner365	2020-01-24 18:41:09 +08:00
winlin	fddfbdde5f	Fix #1147, support SRT(Secure Reliable Transport). 4.0.1	2020-01-24 16:16:16 +08:00
winlin	b7855d133d	Merge remote-tracking branch 'runner365/3.0release.srt.dev' into srt	2020-01-24 16:11:01 +08:00
winlin	5f174552f3	Merge SRT	2020-01-24 16:10:40 +08:00
winlin	235c889e14	Update config	2020-01-24 15:35:14 +08:00
winlin	e3169a080b	Refactor SRT build, use libsrt.a static library	2020-01-24 07:06:30 +08:00
winlin	307a4315f1	Fix bug, should return error when wrapped	2020-01-23 21:33:59 +08:00
winlin	7c9b31815f	Refactor code, add stop for hybrid server to do cleanup.	2020-01-23 21:16:34 +08:00
winlin	db5788b205	Update README for SRT	2020-01-23 20:47:32 +08:00
winlin	2363d258de	Refactor hybrid server model	2020-01-23 20:42:50 +08:00
winlin	33c6bf1f8f	Refactor SRT, using reverse dependency, SRT depends on APP.	2020-01-23 19:40:40 +08:00
winlin	87ba204a42	Update doc for SRT url.	2020-01-23 18:25:44 +08:00
winlin	1959d1d920	Extract hybrid server for SRT	2020-01-23 18:21:11 +08:00
winlin	225c830971	Refine main run process	2020-01-23 17:44:36 +08:00
runner365	06e7a20b5f	update streamid decode	2020-01-23 17:19:06 +08:00
winlin	d88d422794	Update doc for SRT.	2020-01-23 16:49:05 +08:00
runner365	d7437834d4	update is_streamid_valid	2020-01-23 16:12:22 +08:00
winlin	bc26df4893	Remove noused debug function srs_trace_data	2020-01-23 14:44:30 +08:00
winlin	aacf519169	Revert log for forwarder in source	2020-01-23 14:42:06 +08:00
winlin	a7b8695cb0	Refactor code, include without path	2020-01-23 14:33:11 +08:00
winlin	f143757429	Use macro to disable SRT in code	2020-01-23 14:23:09 +08:00
winlin	fb29096505	For SRT, allow/default disable it by --without-srt	2020-01-23 14:22:22 +08:00
winlin	fb5928f927	Fix build failed for SRT with modules.	2020-01-23 13:24:47 +08:00
winlin	2de8d788f6	Revert configure changes(srs_ingest_hls,utest) in previous commit	2020-01-23 12:32:15 +08:00
winlin	106113c5f0	For previous revert, pick some code for LibSRTRoot	2020-01-23 12:15:02 +08:00
winlin	a27c4f7095	Revert "remove modules for srt compile" ... This reverts commit d4c08c44d8.	2020-01-23 12:09:54 +08:00
winlin	c7f6eef4ac	Refine config file, link to issue.	2020-01-23 11:51:35 +08:00
winlin	65e8835fb5	Ignore .vscode in git.	2020-01-23 09:24:41 +08:00
winlin	d28e82962d	Ignore .vscode in git.	2020-01-23 09:17:01 +08:00
runner365	03ef01c635	update configure	2020-01-22 10:59:50 +08:00
runner365	d4c08c44d8	remove modules for srt compile	2020-01-21 20:31:33 +08:00
runner365	746d188e6f	update srt.conf	2020-01-21 19:23:38 +08:00
runner365	5c5fd805c5	add srt mpegts to rtmp	2020-01-21 19:20:09 +08:00
winlin	6107db91f5	Release 3.0 alpha9, 3.0a9, 3.0.105	2020-01-21 16:14:15 +08:00
winlin	c3bf0cbe1b	For #1547, check options for crossbuild.	2020-01-21 15:47:19 +08:00
winlin	ba61fe8bc5	Fix #1221, remove complex configure options. 3.0.104	2020-01-21 15:22:55 +08:00
winlin	0df108740a	Fix #1547, support crossbuild for ARM/MIPS.	2020-01-21 13:59:43 +08:00
winlin	6af8e38017	For #1547, support setting cc/cxx/ar tools. 3.0.103	2020-01-21 10:28:25 +08:00
winlin	a6fe4e80d3	For #1547, remove the SRS_OSX macro in code	2020-01-20 11:25:39 +08:00
winlin	024433f327	For #1547, refine configure, remove some macros	2020-01-20 10:44:46 +08:00
winlin	1bf90a6e21	Ignore noreply user.	2020-01-19 18:25:29 +08:00
l	86d04a70ed	Fix #1580, fix cid range problem. 3.0.102	2020-01-19 18:21:28 +08:00