4153 commits

Author	SHA1	Message	Date
winlin	dcb0553cc8	For #1612, fix crash bug for RTSP. 4.0.12	2020-03-07 22:35:11 +08:00
winlin	12a74326e8	Merge pull request #1612 from xialixin/develop ... Fix disconnect RTSP connection has assertion, resulting in program exit	2020-03-07 22:31:34 +08:00
winlin	5f9ded73ce	Merge pull request #1625 from wasphin/feature/remove-unused-ip ... Remove unused ip variable	2020-03-07 22:28:56 +08:00
winlin	41acf9ca8e	For #1631, support sei_filter for SRT. 4.0.11	2020-03-07 22:25:19 +08:00
runner365	a2839aacdf	add h264 sei filter	2020-03-07 16:15:36 +08:00
HuyaJohn	b730458d51	add candidates ip list, add rtc_upload.html to test	2020-03-06 23:28:15 -08:00
runner365	4242985b36	update only support h264+aac	2020-03-07 15:15:14 +08:00
xiaozhihong	a36ed6954f	add rtc.html temp	2020-03-06 23:59:59 +08:00
xiaozhihong	936ba7583e	modify depend.sh	2020-03-06 23:40:20 +08:00
xiaozhihong	9d5495c0c2	"stun and dtls done"	2020-03-06 23:01:48 +08:00
Xiaofeng Wang	b525fc65aa	Remove unused ip variable ... * "inet addr" is not compatible with rhel/centos 7+; * ifconfig has been replaced by ip-utils in newer distro;	2020-03-03 21:10:43 +08:00
xiaozhihong	30d8b2209f	parse sdp	2020-03-02 22:47:40 +08:00
runner365	40a09958c4	add checking for pes_parse	2020-03-01 19:42:32 +08:00
winlin	1b9a705e4b	For #1621, support mix_correct for aggregate aac packets. 4.0.10	2020-03-01 10:17:03 +08:00
winlin	f917cc1e0c	For SRT, perfer mix_correct to true as default.	2020-03-01 10:09:44 +08:00
runner365	7f4cc6221c	1,solve audio timestamp bugs;2,solve video dts increase bugs	2020-02-29 16:47:20 +08:00
xiaozhihong	62563bdd81	rtc framework	2020-02-28 23:18:39 +08:00
runner365	ed1a3aa37c	Merge branch 'develop' into 3.0release.srt.dev	2020-02-26 17:46:44 +08:00
winlin	ea305790df	For #1579, refactor log for gracefully quit.	2020-02-26 16:38:06 +08:00
runner365	4bd37d43b4	solve dts==0 bugs; solve large aac 2930bytes timestamp bugs	2020-02-26 11:14:05 +08:00
winlin	bbdbcf173c	For #1615, refactor the version and API for SRT.	2020-02-26 09:06:53 +08:00
winlin	04d0620dde	For #1615, fix build failed and srt api issue	2020-02-25 13:45:05 +08:00
winlin	90afd06c85	For #1615, support default app(live) for vmix SRT. 4.0.9	2020-02-25 13:22:44 +08:00
winlin	771f07ee07	Merge branch 'develop' into 4.0release	2020-02-25 09:55:19 +08:00
winlin	1e998678f7	Merge pull request #1615 from runner365/3.0release.srt.dev ... update streamid decode for get more encoder such as VMIX	2020-02-25 09:54:33 +08:00
runner365	0dd72e0e5b	Merge branch '3.0release.srt.dev' into 3.0release	2020-02-24 12:56:01 +08:00
runner365	bbfa552140	update streamid decode for get more encoder such as VMIX	2020-02-24 12:55:17 +08:00
xiaozhihong	51abb0844e	rtp session manager, stun codding	2020-02-23 23:19:40 +08:00
winlin	67d78dff0e	For #1598, support SLB health checking by TCP. 4.0.8	2020-02-21 23:56:40 +08:00
winlin	ef2b123325	Merge branch '3.0release' into 4.0release	2020-02-21 23:52:04 +08:00
winlin	20b9d6ab02	For #1598, support SLB health checking by TCP. 3.0.123	2020-02-21 23:51:40 +08:00
xiaozhihong	bc22ebe949	add rtc http request and response, exchange sdp.	2020-02-21 23:50:22 +08:00
winlin	4a69499f2c	Fix bug for librtmp client ipv4/ipv6 socket. 3.0.122	2020-02-21 23:11:09 +08:00
winlin	1d01ef499d	For #1579, support rolling update of k8s. 4.0.7	2020-02-20 01:06:33 +08:00
winlin	ad3cfbfd2c	For #1579, support start/final wait for gracefully quit. 4.0.6	2020-02-18 23:39:40 +08:00
winlin	388ad61cdc	Merge branch '3.0release' into 4.0release	2020-02-18 23:38:52 +08:00
winlin	dc0f804452	For #1579, support start/final wait for gracefully quit. 3.0.121	2020-02-18 23:37:11 +08:00
winlin	d87f58a611	For #1579, support gracefully quit and force to. 4.0.5	2020-02-18 22:16:28 +08:00
winlin	0c48c42f36	Merge branch '3.0release' into 4.0release	2020-02-18 22:15:29 +08:00
winlin	58b40478b6	For #1579, support force gracefully quit. 3.0.120	2020-02-18 22:15:12 +08:00
winlin	eefd74e0e4	Merge branch '3.0release' into develop	2020-02-18 20:25:07 +08:00
winlin	3c597545b1	For #1579, support gracefully quit. 3.0.119	2020-02-18 19:59:47 +08:00
winlin	e6c329293c	Refine log	2020-02-18 15:07:15 +08:00
winlin	f4c7b882c5	For #1579, define signals for fast/grace quit and upgrade	2020-02-18 09:53:40 +08:00
夏立新	d6e11706ec	Fix disconnect RTSP connection has assertion, resulting in program exit	2020-02-17 18:46:05 +08:00
夏立新	df3ec15cd1	Fix checking the completion of one frame data in RTSP RTP stream	2020-02-17 18:08:16 +08:00
winlin	5be69d290f	For #1601, flush async on_dvr/on_hls events before stop. 3.0.118	2020-02-17 11:53:04 +08:00
winlin	4e7e9809f3	Fix bash script bug for macOS, eventhough we don't support it.	2020-02-16 22:35:40 +08:00
winlin	0723b36f0e	Merge branch '3.0release' into develop	2020-02-16 13:31:54 +08:00
winlin	131acf5bb0	For #1595, migrating streaming from ossrs.net to r.ossrs.net. 3.0.117	2020-02-14 23:04:01 +08:00
winlin	4276bea463	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 22:00:58 +08:00
winlin	23324cde31	Migrating streaming service from ossrs.net to r.ossrs.net	2020-02-14 21:57:02 +08:00
Alex.CR	ce4123f250	rtmp tcp listen port bugs in srt2rtmp (#1602) ... * update srt2rtmp about rtmp listen tcp port * update srt2rtmp about rtmp listen tcp port	2020-02-13 17:02:54 +08:00
runner365	94741c1676	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:58:35 +08:00
runner365	76204fa2ba	Merge remote-tracking branch 'srs/develop' into 3.0release	2020-02-13 16:52:47 +08:00
runner365	8e40f9cf22	update srt2rtmp about rtmp listen tcp port	2020-02-13 16:52:26 +08:00
winlin	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +08:00
Alex.CR	9dad53691e	solve latency parameter error (#1600) ... * solve latency parameter error	2020-02-13 10:54:24 +08:00
runner365	d8419bd4dd	solve latency parameter error	2020-02-13 09:58:14 +08:00
Alex.CR	5f7d23f123	add srt parameter configure (#1599) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks * add srt parameter configure	2020-02-12 21:03:26 +08:00
runner365	24f286684e	add srt parameter configure	2020-02-12 20:02:55 +08:00
Alex.CR	c2012379af	change srt epoll thread to one thread (#1597) ... * if there isn't srt connect, it needn't epoll wait * solve repush srt bugs * change two thread to one thread * mpegts discard header is not 0x47 * add srt_epoll_clear_usocks	2020-02-12 10:23:39 +08:00
runner365	6f4c124f58	solve merge confict	2020-02-12 10:19:30 +08:00
runner365	1a1d0e9267	add srt_epoll_clear_usocks	2020-02-12 09:54:07 +08:00
runner365	548c918efb	mpegts discard header is not 0x47	2020-02-11 21:36:36 +08:00
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
winlin	9ac8585cf9	Fix codec check	2020-01-19 13:16:49 +08:00
winlin	3900179685	For #307, #1070, define FLV CodecID for AV1 and Opus. 3.0.101	2020-01-19 11:22:35 +08:00
runner365	7b9e3ecdc4	add ts demux	2020-01-17 19:43:54 +08:00
winlin	9dbd049e79	For #1568, extract SrsSourceManager from SrsSource.	2020-01-16 17:56:55 +08:00
winlin	0e750ab3eb	For #1575, use RTMP redirect as tcUrl and redirect2 as RTMP URL. 3.0.100	2020-01-16 14:28:05 +08:00
winlin	7240fe3040	For #1509, decrease the fast vector init size from 64KB to 64B. 3.0.99	2020-01-15 21:26:02 +08:00
winlin	857c783efc	For #1509, release coroutine when source is idle. 3.0.98	2020-01-15 19:51:33 +08:00
runner365	1481928b53	reject repeated srt pusher connection	2020-01-15 10:30:20 +08:00
runner365	b53b75ea1e	srt pull/push server	2020-01-14 21:10:33 +08:00
winlin	816aa91a7f	Fix utest bug, init fd	2020-01-13 14:48:49 +08:00
runner365	aeee3011ef	add srt server file	2020-01-11 23:05:10 +08:00
winlin	98df29c6fb	For #1042, improve test coverage for service. 3.0.97	2020-01-10 11:36:38 +08:00
winlin	6c1067d56a	Merge from 2.0	2020-01-09 10:20:49 +08:00
winlin	dd46a4f700	Fix #1554, support logrotate copytruncate. 2.0.272	2020-01-09 10:03:17 +08:00
winlin	c08b6f1961	Merge 2.0, support logrotate copytruncate. 3.0.96	2020-01-08 18:05:42 +08:00
winlin	731e87876e	Fix #1554, support logrotate copytruncate. 2.0.271	2020-01-08 17:57:04 +08:00
Michael.Ma	459488bcf8	fix logrotate empty file hole issue (#1561) ... * fix logrotate empty file hole issue refer to https://github.com/ossrs/srs/issues/1554	2020-01-08 17:54:06 +08:00
winlin	36bfbb902b	Refien utest for log heaer generating.	2020-01-08 14:32:24 +08:00
winlin	80bac7d982	Improve test coverage for rtmp client service.	2020-01-08 14:26:38 +08:00
winlin	cc11f36940	Improve test coverage for log service.	2020-01-08 14:24:41 +08:00
winlin	2cc021b2d7	Improve test coverage for http client service.	2020-01-08 14:00:27 +08:00
winlin	06c1d4d7f9	Fix some warnings for compiler	2020-01-05 22:37:25 +08:00
winlin	69e2d94e50	Fix some warnings for compiler	2020-01-05 22:30:57 +08:00
winlin	10464a5fbe	Always use string instance to avoid crash risk. 3.0.95	2020-01-05 22:17:15 +08:00
winlin	b794c9e4ec	For #460, fix ipv6 hostport parsing bug. 3.0.94	2020-01-05 22:16:21 +08:00
winlin	76d92792b7	For #460, fix ipv6 intranet address filter bug. 3.0.93	2020-01-05 21:25:51 +08:00
winlin	bc6c61e546	Fix #1543, use getpeername to retrieve client ip. 3.0.92	2020-01-05 20:06:25 +08:00
winlin	498f3c5df9	Improve test coverage for service TCP/UDP.	2020-01-05 18:44:07 +08:00
winlin	42ee6570a7	Improve test coverage for service TCP/UDP.	2020-01-05 18:43:23 +08:00
winlin	02c1bd0946	Improve test coverage for service TCP/UDP.	2020-01-05 18:42:37 +08:00
winlin	265b70863c	Improve test coverage for service TCP/UDP.	2020-01-05 18:37:20 +08:00
winlin	9bd8b363b3	Improve test coverage for http service.	2020-01-05 17:02:57 +08:00
winlin	6d0ac35db9	Merge 2.0release #1551	2020-01-05 14:43:46 +08:00
winlin	b5f4b96060	Merge #1551, fix memory leak in RTSP stack. 2.0.270	2020-01-05 14:41:31 +08:00
alphonsetai	763c06976a	fix memory leak	2020-01-05 14:38:08 +08:00