external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
8164 commits 13 branches 107 tags 375 MiB
Commit graph

620 commits

Author SHA1 Message Date
winlin
5a66d15e85 Support regression test in CI. 2021-03-04 14:18:52 +08:00
winlin
dd8f7ff09a Enable HTTP-FLV for conf/rtc.conf 2021-03-04 14:16:03 +08:00
winlin
d4b8a57cf7 Enable Object Cache and Zero Copy Nack by default. 4.0.77 2021-03-04 14:12:31 +08:00
winlin
f63441413d RTC: Support disable the NACK no-copy, enable copy by default 2021-03-02 19:34:56 +08:00
winlin
29b33e6303 RTC: Disable player perf stat, because it should be refined. 2021-03-02 19:33:29 +08:00
winlin
8d7a201742 RTC: Remove unused config 2021-03-02 19:33:12 +08:00
winlin
501104e728 Perf: Limit the size of object cache pool 2021-03-02 19:32:56 +08:00
winlin
3989f2d553 RTC: Refine the stat logs, limit the object cache pool 2021-03-02 19:32:52 +08:00
winlin
4d0863468a RTC: Cache the large buffer allocation 2021-03-02 19:32:40 +08:00
winlin
86f43d4f72 RTC: Support RTP packet cache manager 2021-03-02 19:32:32 +08:00
winlin
c20d8fb617 RTC: Support disable the NACK no-copy, enable copy by default 2021-02-28 18:51:27 +08:00
winlin
ab601ff386 RTC: Disable player perf stat, because it should be refined. 2021-02-27 12:54:06 +08:00
winlin
427e3e0d84 RTC: Remove unused config 2021-02-27 10:41:48 +08:00
winlin
a29d6cba68 Perf: Limit the size of object cache pool 2021-02-27 08:18:08 +08:00
winlin
7b3b7381e2 RTC: Refine the stat logs, limit the object cache pool 2021-02-27 07:41:51 +08:00
winlin
d5b210abc8 RTC: Cache the large buffer allocation 2021-02-26 19:46:52 +08:00
winlin
1833780655 RTC: Support RTP packet cache manager 2021-02-26 16:21:59 +08:00
xialixin@kanzhun.com
fdaee20b81 For #2200, Enable RTC and FLV for GB28181 2021-02-19 18:54:12 +08:00
winlin
548fcd627b Config: Update config files, daemon off, log to console 2021-02-19 18:54:00 +08:00
winlin
d8563398b2 Clock: Update stat. Insert timer to execute first 2021-02-19 18:53:02 +08:00
winlin
181c9f25ed Live: Support connect origin by HTTP-FLV/HTTPS-FLV 2021-02-19 18:16:05 +08:00
xialixin@kanzhun.com
4df6fa540f For #2200, Enable RTC and FLV for GB28181 2021-02-18 21:51:49 +08:00
winlin
adb6f723c7 Config: Update config files, daemon off, log to console 2021-02-18 11:39:25 +08:00
winlin
321f555e30 Clock: Update stat. Insert timer to execute first 2021-02-11 17:34:03 +08:00
winlin
1502560bcf Update conf 2020-12-13 13:29:30 +08:00
yinjiaoyuan
fe65c7bf84 For 2034, GB28181: Support transport over TCP 2020-11-15 22:50:59 +08:00
winlin
3cf3047f97 Add conf/rtc_live.conf 2020-11-14 18:56:49 +08:00
winlin
7521bc86ad For #1998, Update conf 2020-11-13 09:28:24 +08:00
winlin
5709ee1b63 For #1657, add https configs 2020-11-07 07:11:57 +08:00
winlin
30ba5a32ed For #1657, Support HTTPS Streaming 2020-11-06 17:22:23 +08:00
winlin
272ca9d0f6 For #1657, Support HTTPS API 2020-11-06 15:05:01 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
07ecc25071 Merge branch '3.0release' into 4.0release 2020-10-25 13:49:03 +08:00
winlin
7b68330651 Add hls.realtime.conf for low-latency HLS. 3.0.149 2020-10-25 11:44:02 +08:00
winlin
be1a1d99de Merge SRS3 2020-10-23 21:22:58 +08:00
winlin
f036460164 Update default srs.conf, enable HLS and HTTP-FLV 2020-10-23 21:00:29 +08:00
winlin
4ff8a055c5 Update conf to follow wiki 2020-10-23 20:54:36 +08:00
winlin
cc6b71e1ae Update conf to follow wiki 2020-10-23 20:50:56 +08:00
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