632 commits

Author	SHA1	Message	Date
winlin	c6a68234cb	RTC: Fix publish page	2020-07-26 15:52:36 +08:00
winlin	715c70b6e0	RTC: Fix log issue	2020-07-19 10:07:43 +08:00
winlin	62cadd244a	RTC: Disable merge_nalus by default	2020-07-03 09:23:02 +08:00
winlin	3510c74cd4	RTC: Support drop for specified PT	2020-06-29 10:59:39 +08:00
winlin	75fbcba71d	RTC: Always keep and use original sequence.	2020-06-28 11:40:49 +08:00
winlin	94ebcf6306	RTC: Support config the DTLS role and version	2020-06-27 11:13:53 +08:00
winlin	acb8793140	RTC: Change reuseport to 1	2020-06-23 18:31:27 +08:00
winlin	c30565b4c0	RTC: Support keep original seq	2020-06-16 16:41:04 +08:00
winlin	2c1bd6da3e	Merge SRS	2020-06-14 12:35:03 +08:00
kyxlx550	194dcf504b	add ps over rtp jitter buffer	2020-06-07 21:51:05 +08:00
kyxlx550	23ce929048	update gb28181 config wait_keyframe default on	2020-06-07 21:47:22 +08:00
winlin	5139816feb	Remove unused files	2020-06-03 18:14:18 +08:00
winlin	f86706e0a2	RTC: Add config for twcc	2020-06-02 14:38:14 +08:00
winlin	0be9340023	Update config file.	2020-05-26 17:01:01 +08:00
winlin	db43faa848	RTC: Refine blackhole for session	2020-05-26 13:49:27 +08:00
winlin	01f05f920f	RTC: Remove sendmmsg	2020-05-21 16:52:25 +08:00
winlin	9dfa0cc099	RTC: Disable padding	2020-05-21 16:52:25 +08:00
winlin	4f6b24ea12	RTC: Remove GSO for player, no premature optimization	2020-05-21 16:48:32 +08:00
忘篱	d2b0e73884	RTC: Revert not required modifications	2020-05-17 20:43:49 +08:00
忘篱	e9af081f7b	RTC: Revert not required modifications	2020-05-17 20:43:46 +08:00
jinxue.cgh	4895770214	tenfold: modify nack options	2020-05-17 20:43:04 +08:00
winlin	c31ffc40e4	Support filter RTC candidate by ip family, ipv4 by default.	2020-05-09 10:53:52 +08:00
winlin	8c4b6d3166	Support disable NACK in config	2020-05-04 20:42:30 +08:00
winlin	7692e589ed	For RTC publisher, support black-hole	2020-04-27 09:35:50 +08:00
winlin	dabad68f48	Merge branch 'feature/gb28181' into develop	2020-04-21 15:27:40 +08:00
winlin	c93cd86ce4	For #307, refine performance	2020-04-18 20:37:08 +08:00
winlin	08312ddc42	Support config the mw_sleep and mw_msgs	2020-04-18 10:04:45 +08:00
winlin	14e3ec2fe8	For #307, drop frame when VBR too high	2020-04-17 12:30:53 +08:00
winlin	21ede1f084	Enable perf stat by default	2020-04-17 07:57:52 +08:00
winlin	1a6e055f7f	Support config to disable stat to improve performance.	2020-04-16 18:37:37 +08:00
winlin	b91e07f475	For #307, change max padding to 127 for GSO.	2020-04-16 10:25:12 +08:00
winlin	ef48507e80	Support padding max to 127	2020-04-16 09:07:42 +08:00
winlin	bbdd2d7eed	For #307, support padding for GSO	2020-04-15 15:58:17 +08:00
winlin	b6a929f9cf	Enable GSO by default	2020-04-14 11:41:23 +08:00
winlin	feaf98eb69	For #307, remove dedicate GSO cache	2020-04-14 10:58:53 +08:00
winlin	8a71ce62db	For #307, allow dedicated cache for GSO.	2020-04-14 09:20:21 +08:00
winlin	3b7240b8e0	For #307, support linux GSO for RTC	2020-04-13 23:40:30 +08:00
winlin	96059e0d42	For #307, support merge multiple slices/NALUs to one NALU/RTP/FUA	2020-04-13 19:23:17 +08:00
winlin	4400896395	Refactor code for merge_nalus and gso	2020-04-13 16:50:24 +08:00
winlin	2b132d6d64	Refine RTC server log	2020-04-12 09:17:52 +08:00
winlin	78aad11eeb	For #307, enable REUSEPORT to increase UDP buffer	2020-04-12 08:55:43 +08:00
kyxlx550	917b87a1d6	add sip query catalog interval config	2020-04-11 19:56:46 +08:00
kyxlx550	0d593da998	trunk/conf/full.conf ... add sip query catalog interval config	2020-04-11 19:55:42 +08:00
winlin	49f88a3326	Merge pull request #1691 from xialixin/dev-28181 ... Dev 28181	2020-04-09 08:28:53 +08:00
xiaozhihong	85fcbad778	[1].Add 'stun_strict_check' in conf file ... [2].Try to pickup at least H.264 payload type	2020-04-08 23:24:59 +08:00
winlin	e6e8605304	For #307, support config RTC session timeout	2020-04-08 13:30:28 +08:00
winlin	6c5b51618c	For #307, support config to send plaintext RTP.	2020-04-07 16:05:31 +08:00
winlin	35a037cf05	Add api for tcmalloc	2020-04-07 14:24:14 +08:00
winlin	59b9fa9610	For #307, always 1 if os does not support sendmmsg	2020-04-06 19:42:37 +08:00
winlin	7cfd2879b0	For #307, config sendmmsg max	2020-04-06 00:24:14 +08:00
xialixin	8ac39cb22f	del print_sip_message config	2020-04-05 13:45:52 +08:00
xialixin	92d351ef35	fix 'output' format define; support 'host' auto get; time config use SRS internal format; support auto create stream channel on/off	2020-04-04 16:07:23 +08:00
xialixin	ac8acc0b22	fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset	2020-04-04 16:07:23 +08:00
winlin	573449f1b0	For #307, refine RTC latency from 600ms to 200ms. 4.0.20	2020-04-04 15:36:35 +08:00
winlin	c70a0eb07c	Config to use RSA or ECDSA	2020-04-03 15:03:09 +08:00
winlin	e19b927f92	Merge GB28181	2020-03-31 22:45:20 +08:00
winlin	6012ac4eb0	Refine code	2020-03-31 22:30:57 +08:00
winlin	33455867f9	Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181	2020-03-31 20:08:24 +08:00
winlin	6022ac5cdb	Add comments for RTC candidate.	2020-03-31 17:33:04 +08:00
winlin	ecf0f012b5	Add comments for RTC candidate.	2020-03-31 17:26:32 +08:00
xialixin	c99fb99ab6	refactor gb28181, supporting SIP server enable, multiplex, API interface	2020-03-31 00:39:10 +08:00
winlin	2da4e0a43e	For #1638, #307, config to discard aac for rtc	2020-03-22 08:28:51 +08:00
winlin	0cd67a997e	For #1638, #307, add comments for vhost rtc config	2020-03-21 22:52:59 +08:00
xiaozhihong	fa700dad64	1. Modify rtc.conf to support Bframe discard. ... 2. Rename srs_app_rtp.cpp to srs_app_rtc.cpp	2020-03-21 21:26:30 +08:00
winlin	de9a004ff7	Merge branch 'dev-28181' of https://github.com/xialixin/srs into feature/gb28281-2	2020-03-20 21:39:04 +08:00
xialixin	8b4f84e336	fix push.gb28181.conf, gb28181conn repeat call serve()	2020-03-20 10:38:38 +08:00
xialixin	cbe9c1dabc	Support gb28181 sip over udp, ps steam over rtp	2020-03-20 00:01:48 +08:00
winlin	a42cf3ae8d	For #1638, #307, refactor rtc config.	2020-03-14 18:05:58 +08:00
winlin	6f4584db53	Merge SRS4	2020-03-14 17:16:51 +08:00
winlin	51af2b4779	For #1638, #307, rtc conf support ENV.	2020-03-14 17:15:46 +08:00
winlin	a135eb2144	Merge SRS3	2020-03-14 14:39:11 +08:00
winlin	88336b1f5e	Remove KAFKA config, because it's removed from code	2020-03-14 14:38:26 +08:00
winlin	d21ef106a0	Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc	2020-03-13 21:18:09 +08:00
winlin	1382337cb4	Merge SRS3	2020-03-12 22:42:33 +08:00
winlin	9b663c070a	Fix #1635, support auto reaload config by inotify. 3.0.129	2020-03-12 18:14:23 +08:00
winlin	b33751e2c1	Merge SRS3	2020-03-12 12:18:15 +08:00
winlin	ed41ca867b	For #1594, detect and disable daemon for docker. 3.0.127	2020-03-12 10:11:41 +08:00
winlin	6a765ab849	Merge SRS3	2020-03-11 19:45:01 +08:00
winlin	c61c2a939f	For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125	2020-03-11 19:33:55 +08:00
HuyaJohn	b730458d51	add candidates ip list, add rtc_upload.html to test	2020-03-06 23:28:15 -08:00
runner365	7f4cc6221c	1,solve audio timestamp bugs;2,solve video dts increase bugs	2020-02-29 16:47:20 +08:00
runner365	ed1a3aa37c	Merge branch 'develop' into 3.0release.srt.dev	2020-02-26 17:46:44 +08:00
runner365	4bd37d43b4	solve dts==0 bugs; solve large aac 2930bytes timestamp bugs	2020-02-26 11:14: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
xiaozhihong	51abb0844e	rtp session manager, stun codding	2020-02-23 23:19: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
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	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	8b7fbac7d4	SRT supports detail config for DynamicConfig. 4.0.4	2020-02-13 12:17:09 +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
winlin	bdc7973596	Merge branch '3.0release' into develop	2020-02-05 14:18:07 +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	88c9c13707	Update readme for SRT	2020-01-26 14:17:42 +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	bbc7023f85	Merge SRS3	2020-01-25 15:05:52 +08:00
winlin	235c889e14	Update config	2020-01-24 15:35:14 +08:00
winlin	87ba204a42	Update doc for SRT url.	2020-01-23 18:25:44 +08:00
winlin	d88d422794	Update doc for SRT.	2020-01-23 16:49:05 +08:00
winlin	c7f6eef4ac	Refine config file, link to issue.	2020-01-23 11:51:35 +08:00
runner365	03ef01c635	update configure	2020-01-22 10:59:50 +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
runner365	7b9e3ecdc4	add ts demux	2020-01-17 19:43:54 +08:00
runner365	b53b75ea1e	srt pull/push server	2020-01-14 21:10:33 +08:00
runner365	aeee3011ef	add srt server file	2020-01-11 23:05:10 +08:00
winlin	8a28a11648	For #299, increase dash segment size for avsync issue. 3.0.89	2019-12-29 18:21:45 +08:00
winlin	d7078a72d4	For #1520, add TODO list for configing server itself in coworker.	2019-12-19 14:15:21 +08:00
winlin	acfeb8a66f	Fix #1520, #1223, bug for origin cluster 3+ servers. 3.0.74	2019-12-19 14:04:26 +08:00
winlin	cef7ec79b3	Detect whether flash enabled for srs-bwt.	2019-12-18 11:50:43 +08:00
winlin	6f453e7f46	For #547, #1506, default hls_dts_directly to on. 3.0.71	2019-12-12 16:51:34 +08:00
winlin	d908ee73db	Make the hls_dipose more specific	2019-12-10 16:48:35 +08:00
winlin	b4870a6d6f	Fix #1506, support directly turn FLV timestamp to TS DTS. 3.0.68	2019-12-05 20:47:23 +08:00
winlin	f6fc31db66	Add config files for go-oryx	2019-10-05 17:02:25 +08:00
winlin	d3b142a0d9	Fix #775, Support SO_REUSEPORT. 3.0.54	2019-10-03 16:10:22 +08:00
winlin	5df8f2f6c1	Refine get_pithy_print in time unit	2019-04-09 08:55:54 +08:00
winlin	8e55ef4b60	Refine code	2018-08-26 14:29:45 +08:00
winlin	1e2cca4712	For #1093, Refine HLS encryption wiki	2018-08-25 21:59:56 +08:00
Harlan	22c5af62cf	Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release ... # Conflicts: # trunk/src/kernel/srs_kernel_utility.hpp	2018-08-15 07:37:12 +08:00
Harlan	bf12a45274	add configuration instructions for hls encryption	2018-08-12 14:18:05 +08:00
winlin	455a060fa5	Merge 2.0	2018-08-05 10:52:37 +08:00
winlin	ee43fc92ae	For #1110, Refine conf	2018-08-05 10:47:01 +08:00
winlin	29b74c7220	For #1110, Support params in http callback. 3.0.36	2018-08-04 19:51:04 +08:00
winlin	85d3a5001c	For #1110, Support params in http callback. 2.0.251	2018-08-04 19:36:42 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +08:00
winlin	c70421e656	Fix #464, support origin cluster	2018-02-16 16:39:07 +08:00
winlin	92f2bcd878	For #464, support config origin cluster	2018-02-16 10:31:19 +08:00
winlin	d0fbf44d18	For #464, support config for origin cluster.	2018-02-14 21:52:40 +08:00
winlin	0e9e1792fe	For #299, write fMP4 for DASH.	2017-06-04 15:10:35 +08:00
winlin	8b7566a007	Refine code	2017-03-26 18:30:33 +08:00
winlin	8ab727f3c5	For #299, write MPD file.	2017-02-26 20:40:33 +08:00
winlin	d786d61685	Merge branch '2.0release' into develop	2017-02-25 11:21:56 +08:00
winlin	0059b1cf7a	For #783, use directly free to replace auto free	2017-02-25 11:18:54 +08:00
winlin	5e419c66f8	For #299, add dash files.	2017-02-11 21:14:28 +08:00
winlin	b0789c54e4	Update HLS wiki to v3	2017-02-11 14:28:40 +08:00
winlin	5fec59ace2	merge from srs2, fix #503	2017-02-09 14:33:56 +08:00
winlin	15570d93ce	change conf to console without daemon.	2017-02-09 14:17:36 +08:00
winlin	0a054cd6bd	for #738, remove the dvr plan append for it's no use	2017-02-06 20:22:07 +08:00
winlin	8c01f52372	for #738, refine the dvr segmenter.	2017-02-06 18:33:26 +08:00
winlin	8588a10775	Merge branch '2.0release' into develop	2017-01-29 17:15:43 +08:00
winlin	a37a14377a	fix the example dvr config file error	2017-01-29 17:15:17 +08:00
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	d29416a5f0	add conf sample for ingest rtsp	2017-01-06 10:47:05 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	516f33888c	refine config	2016-08-09 12:37:48 +08:00
winlin	f87646d489	fix typo of config.	2016-08-08 13:58:42 +08:00
winlin	892591f9a6	merge from @mbeacom	2016-04-22 10:18:13 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	29122b6e70	fix #502, transcoder support snapshot.	2015-10-20 14:52:34 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	2b9869ee52	update the wiki for dvr	2015-09-15 17:58:35 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	a7c4b786cf	merge from 2.0	2015-09-14 18:42:31 +08:00
winlin	511627abab	fix #474, config to donot parse width/height from sps. 2.0.189	2015-09-14 18:36:44 +08:00
winlin	7ae76b579e	refine the conf, use srs3 style	2015-09-11 08:21:06 +08:00
winlin	a62c82bd46	for #319, api raw update global.listen	2015-08-30 23:42:21 +08:00
winlin	364460f2ab	for #319, support raw update global.listen	2015-08-30 23:18:14 +08:00
winlin	f8d8c3ace4	use function to dumps the engine.	2015-08-30 23:08:27 +08:00
winlin	01878e5a9c	for #319, query vhost detail.	2015-08-30 22:23:47 +08:00
winlin	b1b76a4a80	for #319, allow multiple ingest and transcode.	2015-08-30 14:52:12 +08:00
winlin	d1336e0d80	refine conf	2015-08-30 10:52:05 +08:00
winlin	dc11013c01	for #319, render the detail of vhost	2015-08-30 10:17:39 +08:00
winlin	0109a74840	for #319, refine the config structure.	2015-08-30 08:34:52 +08:00
winlin	2b4fa2d73e	for #319, move the edge configs to cluster.	2015-08-30 08:30:04 +08:00
winlin	6bd05f9cfc	for #319, refine the config forward.	2015-08-30 07:59:25 +08:00
winlin	bc24c0407b	for #319, move smi and rsh to play	2015-08-30 07:36:06 +08:00
winlin	f7c893d907	for #319, move gop_cache and queue_length to play	2015-08-30 07:26:55 +08:00
winlin	06ae74dd3f	for #319, move mw_latency to play.	2015-08-30 07:05:57 +08:00
winlin	4eb1874955	for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency.	2015-08-30 06:49:20 +08:00
winlin	9c4340f789	for #319, move atc and atc_auto to play	2015-08-29 23:36:03 +08:00
winlin	d6b0aa3a5b	for #319, move time_jitter and mix_correct to play	2015-08-29 23:18:25 +08:00
winlin	738642073e	for #319, refine config, collect the mr and publish timeout	2015-08-29 22:41:50 +08:00
winlin	7ef3ff90c0	refine the config structure, compatible with SRS1/2	2015-08-29 18:40:18 +08:00
winlin	a79e19599c	for #319, support query the vhost info.	2015-08-29 16:12:30 +08:00
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	2015-08-28 23:51:23 +08:00
winlin	66ffcad635	for #319, always allow raw query.	2015-08-28 13:17:46 +08:00
winlin	f167616379	rename the config_query to query	2015-08-28 13:01:04 +08:00
winlin	2dcf3bc606	for #319, support rpc raw api to query the HTTP RAW API configs.	2015-08-28 12:28:18 +08:00
winlin	d921d59e57	for #319, support HTTP RAW API reload.	2015-08-27 18:11:50 +08:00