external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 06:54:22 +00:00
Code Issues Releases Wiki Activity
6082 commits 14 branches 107 tags 376 MiB
Commit graph

2281 commits

Author SHA1 Message Date
winlin
7574dbefb1 For #307, support sendmmsg, GSO and reuseport. 4.0.23 2020-04-14 14:02:54 +08:00
winlin
fdc0c44b7e For #307, for realtime, change wait messages from 0 to 2 2020-04-14 13:55:55 +08:00
winlin
03a03e4174 Refine stat for GSO 2020-04-14 13:47:23 +08:00
winlin
5b406d68d6 Refine pithy print 2020-04-14 13:34:24 +08:00
winlin
39853160d1 Refactor default config 2020-04-14 11:49:59 +08:00
winlin
b6a929f9cf Enable GSO by default 2020-04-14 11:41:23 +08:00
winlin
24eb61156f Refine logs for GSO 2020-04-14 11:39:22 +08:00
winlin
8ba3d78e86 Refine logs for GSO 2020-04-14 11:30:21 +08:00
winlin
2cd580f500 For #307, disable GSO < linux 4.18.0 2020-04-14 11:26:45 +08:00
winlin
feaf98eb69 For #307, remove dedicate GSO cache 2020-04-14 10:58:53 +08:00
winlin
23c68a922c Refine GSO for RTC 2020-04-14 10:05:55 +08:00
winlin
8a71ce62db For #307, allow dedicated cache for GSO. 2020-04-14 09:20:21 +08:00
winlin
89a247d9bc Remove unused code 2020-04-13 23:57:03 +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
5d23bb6a8a Refactor code for merge_nalus 2020-04-13 17:11:46 +08:00
winlin
4400896395 Refactor code for merge_nalus and gso 2020-04-13 16:50:24 +08:00
winlin
048301d9eb Refactor RTP sender 2020-04-13 15:37:32 +08:00
winlin
756826756a Refactor RTP encrypt 2020-04-13 15:24:41 +08:00
xiaozhihong
54a887a3d9 solve merge conflict 2020-04-13 14:43:12 +08:00
xiaozhihong
8687c50dc4 merge 2020-04-13 14:29:19 +08:00
winlin
fa21df7bb8 Refactor RTC package RTP packets. 2020-04-13 13:58:34 +08:00
winlin
216b3bf414 Create isolate pithy printer for each RTC FD 2020-04-13 09:32:48 +08:00
winlin
087559813f For #307, use UDP sender binding to FD for RTC 2020-04-13 09:13:12 +08:00
winlin
863d6b4f15 Refactor pithy print for RTC 2020-04-12 23:11:53 +08:00
winlin
59dc771dd5 Refactor pithy print for RTC 2020-04-12 23:05:07 +08:00
winlin
73a9155686 Refine logs 2020-04-12 18:34:42 +08:00
winlin
82579e4b0c For #370, use round-trip to send on all fds 2020-04-12 17:19:49 +08:00
winlin
37e2f8896c Refactor pithy print logs 2020-04-12 16:31:32 +08:00
winlin
d5b3cf9af7 Refactor pithy print logs 2020-04-12 16:10:08 +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
winlin
a7f2bde8e2 Refine UDP socketopt logs 2020-04-12 08:42:12 +08:00
winlin
edad6ac93d Fix memory leak. Refine RTC SEND pithy print message 2020-04-12 08:25:57 +08:00
winlin
5e66a0d342 Send SPS/PPS before IDR 2020-04-12 01:13:31 +08:00
winlin
79d46fa2e1 Fix build failed bug 2020-04-12 01:08:21 +08:00
winlin
32efc71ba9 Fix the STAP NRI flag 2020-04-12 01:05:32 +08:00
winlin
ca027ca5cb For #307, zero copy for RTP FUA packet 2020-04-12 01:01:39 +08:00
winlin
aa81b47c9a For #307, zero copy for RTP STAP packet 2020-04-11 23:57:04 +08:00
winlin
4b2404c203 For #307, zero copy for RTP audio packet 2020-04-11 22:54:44 +08:00
winlin
bf62244908 Free RTP packet for RTC 2020-04-11 21:46:34 +08:00
winlin
a2fdf0d3c7 For #307, package video rtp packets when send message 2020-04-11 21:03:37 +08:00
kyxlx550
7826c743e4 support access to NVR, gb28181 system sub domain 2020-04-11 20:37:07 +08:00
kyxlx550
28bde1d448 fix rtmp send timeout, first key frame wait 2020-04-11 20:36:28 +08:00
kyxlx550
f74a398c1b add sip query session api 2020-04-11 20:19:54 +08:00
kyxlx550
0d593da998 trunk/conf/full.conf 
add sip query catalog interval config
 2020-04-11 19:55:42 +08:00
winlin
8121f9ab4e Refactor variable name 2020-04-11 18:39:46 +08:00
winlin
c6fb5e6fdd Refactor code, rename variable 2020-04-11 18:01:38 +08:00
winlin
3cccef327c For #307, package opus when send it. 2020-04-11 17:52:14 +08:00
winlin
1f2db4d746 For #307, refactor aac to opus code 2020-04-11 17:09:55 +08:00
winlin
6ed2a4b6cb For #307, refine audio transcode buffer 2020-04-11 16:33:47 +08:00
winlin
5b9cb7dc3f For #307, refactor code, parse B-frame by sample. 2020-04-11 15:11:42 +08:00
winlin
719c0ae85b For #307, refactor SPS/PPS only before IDR, not each FUA 2020-04-11 13:10:27 +08:00
winlin
a695afb368 Refactor code to rename rtp_shared_pkt to packet 2020-04-11 09:56:58 +08:00
winlin
1ecd8bee40 Refactor bframe discard strategy 2020-04-11 09:11:34 +08:00
winlin
fca81f02f5 Refactor code, add comment when string.assign(xx, 0) 2020-04-11 09:00:50 +08:00
winlin
162055f6d0 Refactor variable name 2020-04-10 19:21:47 +08:00
winlin
d6a5651a30 For #307, support reload rtc_server section 2020-04-10 18:14:33 +08:00
winlin
928d863e50 Refactor code, use pithy print for RTC send. 2020-04-10 17:42:54 +08:00
winlin
94afe6c56e Refactor the print message 2020-04-10 15:44:46 +08:00
winlin
c54d5be93c For #307, refine RTP packet cache. 2020-04-09 19:38:50 +08:00
xiaozhihong
c81bc36712 add rtc stun/dtls log 2020-04-09 14:34:48 +08:00
winlin
1e83749485 For #307, use RTC server to sendmmsg 2020-04-09 09:56:13 +08:00
winlin
cf48a5594d Refactor code for #1691 2020-04-09 08:37:28 +08:00
winlin
49f88a3326
Merge pull request #1691 from xialixin/dev-28181 
Dev 28181
 2020-04-09 08:28:53 +08:00
winlin
d9a5572531 Refine TAB to spaces. 2020-04-09 08:20:55 +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
xiaozhihong
55f264b704 Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-08 20:40:23 +08:00
winlin
99614ac585 Support set RTC stun timeout 2020-04-08 15:22:13 +08:00
xiaozhihong
ca7060c005 Add SrsRtpHeader. 2020-04-08 14:45:26 +08:00
winlin
e6e8605304 For #307, support config RTC session timeout 2020-04-08 13:30:28 +08:00
winlin
11bcd0cb27 Merge branch 'develop' into feature/rtc 2020-04-07 20:19:06 +08:00
winlin
61c7443c4b Merge from SRS3 2020-04-07 20:18:31 +08:00
winlin
32d5b75d8c For #307, fix some memory leaking 2020-04-07 19:47:04 +08:00
winlin
a8cc3a3430 For #307, fix some memory leaking 2020-04-07 19:07:11 +08:00
winlin
e22d1dffc1 Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-04-07 17:30:06 +08:00
winlin
6c5b51618c For #307, support config to send plaintext RTP. 2020-04-07 16:05:31 +08:00
winlin
00810e6d1d Refine api for tcmalloc 2020-04-07 14:43:18 +08:00
winlin
35a037cf05 Add api for tcmalloc 2020-04-07 14:24:14 +08:00
winlin
574ae58adc For #307, support mock server eip by API 2020-04-07 11:36:26 +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
winlin
40c95b04ca Merge remote-tracking branch 'winlin/feature/perf_stat' into feature/rtc 2020-04-05 23:01:21 +08:00
winlin
133e3ce075 For #307, use sendmmsg in rtc server 2020-04-05 16:53:08 +08:00
xialixin
d2b8b937d6 fix generate ssrc, rtmp muxer cycle sleep, ps steam parase etc.. 2020-04-05 13:53:14 +08:00
xialixin
c70ed1cd74 add sip session status check 2020-04-05 13:49:47 +08:00
xialixin
8ac39cb22f del print_sip_message config 2020-04-05 13:45:52 +08:00
winlin
55a4052d90 For #307, support sendmmsg to improve RTC performance 2020-04-04 22:43:44 +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
5e4fdfd1d4 fix after RTMP is closed, empty PPS and SPS. sip client sockaddr set 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
xiaozhihong
22fe799649 Add annotation about rtp packet. Remove no need verbose log. 2020-04-03 16:35:47 +08:00
winlin
0ff3ce7464 Merge remote-tracking branch 'john/rtc' into feature/rtc 2020-04-03 15:17:13 +08:00
winlin
9e7e80f5f5 Add TODO comment for Cert 2020-04-03 15:08:52 +08:00
winlin
8c42ad622b Config to use RSA or ECDSA 2020-04-03 15:05:04 +08:00
winlin
c70a0eb07c Config to use RSA or ECDSA 2020-04-03 15:03:09 +08:00
winlin
862c211acd Support openssl 1.0 and 1.1, RSA and ECDSA 2020-04-03 13:43:13 +08:00
xiaozhihong
3cf03393c0 format a=candidate line 2020-04-02 21:31:22 +08:00
xiaozhihong
d6adb5cd8d process USE-CANDIDATE/ICE-CONTROLLING/ICE-CONTROLLED atrribute in STUN 2020-04-02 21:31:06 +08:00
winlin
8de89f3f37 Add TODO for SRTP-GCM for RTC 2020-04-02 12:28:47 +08:00
winlin
51bae42560 For RTC, verify peer and accept all certificate. 2020-04-02 11:41:57 +08:00
xiaozhihong
bfd8971db8 fix compile warning. 2020-04-01 14:56:31 +08:00
xiaozhihong
4f671b1de2 Merge remote-tracking branch 'upstream/feature/rtc' into rtc 2020-04-01 14:39:05 +08:00
xiaozhihong
14421a7f0b add annotation about some sdp line 2020-04-01 14:38:00 +08:00
xiaozhihong
f4067bcb4d fix nack bug 2020-04-01 14:37:14 +08:00
winlin
608f3d0fae For #1500, support push stream by GB28181. 4.0.18 2020-03-31 23:06:07 +08:00
winlin
d81cde695d Refactor code 2020-03-31 22:48:38 +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
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +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
74ad7143e7 Change authro to Bepartofyou for RTC codec 2020-03-31 18:05:32 +08:00
winlin
45db63249d Update author to John for RTC 2020-03-31 18:03:04 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
winlin
03289012fd Refactor code for RTC 2020-03-30 21:21:31 +08:00
xiaozhihong
9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 2020-03-30 15:16:44 +08:00
xiaozhihong
49da2099c1 sdp exchange. 2020-03-30 15:16:29 +08:00
winlin
57604a9c65 For #1672, fix dvr close file failed bug. 3.0.140 2020-03-30 10:44:11 +08:00
xfalcon
cd1513d6a3
fix fs not close,when dvr error (#1672) 2020-03-30 10:37:16 +08:00
winlin
dae7af8444 For #307, rtc support osx 2020-03-28 20:52:42 +08:00
winlin
04c3370458 Merge branch 'develop' into feature/rtc 2020-03-28 18:06:40 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
90a39ec46d Add api to stat mw iovec 2020-03-27 13:37:39 +08:00
winlin
0d060a1cec For #1659, #307, support aliyun slb UDP health check 2020-03-24 12:12:41 +08:00
bepartofyou
923209b070 Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 2020-03-22 20:16:24 +08:00
bepartofyou
766da5188b Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio 2020-03-22 19:55:29 +08:00
bepartofyou
4a17259471 err wrap change to new 2020-03-22 19:36:11 +08:00
winlin
c00ffa530b Merge branch 'feature/codec' into feature/rtc 2020-03-22 18:42:49 +08:00
winlin
602a478e1b For #1659, #307, add switch to disable rtc 2020-03-22 18:17:05 +08:00
xiaozhihong
734e848741 Update RtcSession peer address when changed. 2020-03-22 16:54:31 +08:00
winlin
2da4e0a43e For #1638, #307, config to discard aac for rtc 2020-03-22 08:28:51 +08:00
winlin
e1fe2d1c1d For #1638, #307, add comments for audio codec 2020-03-22 07:18:25 +08:00
七曦
f09dda85fc Exception handle 2020-03-21 23:27:28 +08:00
winlin
2757ec7973 Merge from bepartofyou 2020-03-21 23:09:57 +08:00
winlin
0cd67a997e For #1638, #307, add comments for vhost rtc config 2020-03-21 22:52:59 +08:00
winlin
be746da21c Merge branch '3.0release' into 4.0release 2020-03-21 22:42:17 +08:00
winlin
0dd6c31487 Fix #1629, fix kickoff FLV client bug. 3.0.137 2020-03-21 22:41:25 +08:00
七曦
a0a4337214 make webrtc audio work 2020-03-21 21:50:06 +08:00
xiaozhihong
7315b1a26d Fix config read "bframe" discad bug. 2020-03-21 21:40:26 +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
68ad006b73 Remove empty line. 2020-03-21 19:03:17 +08:00
winlin
3f6a2871b0 For #1638, #307, show error information when api failed. 2020-03-21 19:00:47 +08:00
winlin
d2036455ac Refactor api, follow https://github.com/rtcdn/rtcdn-draft 2020-03-21 18:33:36 +08:00
winlin
61b8ae8c30 Refactor api, follow https://github.com/rtcdn/rtcdn-draft 2020-03-21 18:30:53 +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
8eef439c90 For #1638, #307, use hourglass for timer. 2020-03-19 12:58:04 +08:00
HuyaJohn
94e4f4539d merge feature/rtc, fix conflict 2020-03-18 16:34:15 -07:00
HuyaJohn
d1d16d490e Detect B frame in avc stream. Fix compiler error with verbose 2020-03-18 16:27:31 -07:00
winlin
0b6e9257f9 For #1638, #307, remove unused code for rtc 2020-03-18 18:35:02 +08:00
winlin
018577e685 For #1638, #307, fix error new bug for rtc 2020-03-18 18:12:37 +08:00
winlin
c210c0b2f5 For #1638, #307, refactor rtc player. 2020-03-18 10:03:20 +08:00
xiaozhihong
e2233027b8 fix h264 rtp packet error 2020-03-18 08:45:20 +08:00
winlin
fc84f1e545 Refactor source cid with pid 2020-03-17 18:43:11 +08:00
winlin
28c1c57854 For #1638, #307, should set err in return value. 2020-03-17 18:33:05 +08:00
winlin
0ff8a3761b For #1638, #307, should check error by fetch_or_create source 2020-03-17 18:24:28 +08:00
winlin
ed2996141c For #1638, #307, refine api and udp for rtc. 2020-03-17 18:11:03 +08:00
winlin
2c4dc0fb3d For #1638, #307, extract rtc server to hybrid manager. 2020-03-17 17:56:37 +08:00
winlin
4318d989a6 For #1638, #307, switch to RTC session context cid for cleanup 2020-03-17 12:41:50 +08:00
winlin
25fec76ea9 For #1638, #307, switch to RTC session context cid for reusing UDP ports 2020-03-17 12:33:08 +08:00
winlin
29b9203428 For #1638, #307, use short-term http connection for rtc to use new cid. 2020-03-17 12:10:42 +08:00
winlin
6118ca382a For #1638, #307, http api success with message, timeout as such 2020-03-17 11:40:05 +08:00
winlin
b5dd502103 For #1638, #307, fix build warnings 2020-03-17 09:16:52 +08:00
HuyaJohn
e8b2bb5d28 process err, do error check, add some error code 2020-03-16 07:35:24 -07:00
winlin
c2a667cc35 For #1638, #307, add comments for api and enum 2020-03-16 22:01:09 +08:00
winlin
2f0b150588 For #1638, #307, accept srs_string_dumps_hex to app utility. 2020-03-16 18:05:42 +08:00
winlin
e905fce847 For #1638, #307, add comments in RTMP/RTP message for RTC. 2020-03-16 17:39:06 +08:00
winlin
60c8b37f05 For #1638, #307, merge john, add NACK suport, remove debug code, verbose log 2020-03-14 22:51:35 +08:00
xiaozhihong
2b56f9ee59 add NACK suport, remove debug code, verbose log 2020-03-14 22:11:01 +08:00
winlin
12e99f1897 For #1638, #307, use webrtc adapter.js for demo. 2020-03-14 21:14:17 +08:00
winlin
a42cf3ae8d For #1638, #307, refactor rtc config. 2020-03-14 18:05:58 +08:00
winlin
51af2b4779 For #1638, #307, rtc conf support ENV. 2020-03-14 17:15:46 +08:00
xiaozhihong
6c88f58079 remove debug code, fix rtc.html 2020-03-13 22:50:34 +08:00
winlin
d21ef106a0 Merge branch 'rtc' of https://github.com/xiaozhihong/srs into xiaozhihong-rtc 2020-03-13 21:18:09 +08:00
xiaozhihong
027d34bbd3 add rtp shared packet 2020-03-13 20:34:40 +08:00
xiaozhihong
6decdc7838 adjust code style, fix some bug, add rtc session timeout 2020-03-13 00:24:56 +08:00
winlin
1382337cb4 Merge SRS3 2020-03-12 22:42:33 +08:00
winlin
856ed5a971 For #1635, inotify watch ConfigMap for reload. 3.0.134 2020-03-12 22:26:34 +08:00
winlin
bb509d23e2 For #1635, inotify watch ConfigMap for reload. 3.0.133 2020-03-12 22:08:23 +08:00
winlin
88368ed18d For #1635, inotify watch ConfigMap for reload. 3.0.132 2020-03-12 21:58:29 +08:00
winlin
940798a9c7 For #1635, inotify watch ConfigMap for reload. 3.0.131 2020-03-12 21:45:10 +08:00
winlin
5e60c8f9cc For #1635, inotify watch ConfigMap for reload. 3.0.130 2020-03-12 19:37:31 +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
4b395f6e16 Fix #1630, disable cache for stream changing, and drop dup header. 3.0.128 2020-03-12 11:55:37 +08:00
winlin
ed41ca867b For #1594, detect and disable daemon for docker. 3.0.127 2020-03-12 10:11:41 +08:00
winlin
c1e07d6a96 For #1634, always check status in thread loop. 3.0.126 2020-03-12 08:59:13 +08:00
winlin
6a765ab849 Merge SRS3 2020-03-11 19:45:01 +08:00
winlin
6c55fd3e4b For #1634, refactor output with datetime for ingest/encoder/exec. 3.0.125 2020-03-11 19:42:42 +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
da72caf8b9 h264 packet done, chrome play well 2020-03-11 04:21:44 -07:00
winlin
c78595c1fa For #1634, refactor encoder output, support timestamp variables. 2020-03-11 19:19:17 +08:00
winlin
66b194cd63 For #1634, refactor encoder process management. 2020-03-11 19:08:36 +08:00
winlin
927c0c8e39 For #1634, fix quit by accident SIGTERM while killing FFMPEG. 3.0.124 2020-03-11 19:04:52 +08:00
xiaozhihong
e831f3254a some code 2020-03-11 00:04:12 +08:00
HuyaJohn
ff0e03800d h264 rtp debuging 2020-03-10 04:47:49 -07:00
xiaozhihong
e2675109fb fix rtp h264 packet bug 2020-03-10 00:45:40 +08:00
HuyaJohn
3ae510b843 rtp dispatch done, but video can not play in chrome 2020-03-09 04:46:27 -07:00
xiaozhihong
2f462775a0 rtp support 2020-03-09 00:40:30 +08:00
HuyaJohn
2e68c375e3 start coding flv->rtp 2020-03-08 04:20:46 -07:00
xiaozhihong
c62901a3ac make code easy, wrap udp remux socket 2020-03-08 00:30:31 +08:00
winlin
5586c2a128 For #1612, refactor return value for RTSP initialize. 2020-03-07 22:42:23 +08:00
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
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
xiaozhihong
9d5495c0c2 "stun and dtls done" 2020-03-06 23:01:48 +08:00
xiaozhihong
30d8b2209f parse sdp 2020-03-02 22:47:40 +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
winlin
ea305790df For #1579, refactor log for gracefully quit. 2020-02-26 16:38:06 +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
xiaozhihong
bc22ebe949 add rtc http request and response, exchange sdp. 2020-02-21 23:50:22 +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
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
Alex.CR
9dad53691e
solve latency parameter error (#1600) 
* solve latency parameter error
 2020-02-13 10:54:24 +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
fc769550db Fix #665, fix HTTP-FLV reloading bug. 3.0.116 2020-02-05 14:17:30 +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
c51c378869 For #1186, refactor security check. 3.0.114 2020-02-04 19:07:54 +08:00
winlin
59439cf8b5 Merge branch '3.0release' into develop 2020-02-04 17:05:19 +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
77114c7df0 Merge SRS3 2020-01-29 20:30:06 +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
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
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
74154cdfd9 Fix #703, drop video data util sps/pps. 3.0.107 2020-01-25 18:05:18 +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
5f174552f3 Merge SRT 2020-01-24 16:10:40 +08:00
winlin
7c9b31815f Refactor code, add stop for hybrid server to do cleanup. 2020-01-23 21:16:34 +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
1959d1d920 Extract hybrid server for SRT 2020-01-23 18:21:11 +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
runner365
5c5fd805c5 add srt mpegts to rtmp 2020-01-21 19:20:09 +08:00
winlin
a6fe4e80d3 For #1547, remove the SRS_OSX macro in code 2020-01-20 11:25:39 +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
aeee3011ef add srt server file 2020-01-11 23:05:10 +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
10464a5fbe Always use string instance to avoid crash risk. 3.0.95 2020-01-05 22:17:15 +08:00
winlin
bc6c61e546 Fix #1543, use getpeername to retrieve client ip. 3.0.92 2020-01-05 20:06:25 +08:00
winlin
45aa325722 Improve test coverage for config. 2020-01-01 21:01:14 +08:00
winlin
0fd0114ee6 Improve test coverage for config. 2020-01-01 17:14:59 +08:00
winlin
7136c7c9b8 Improve test coverage for config. 2020-01-01 14:21:24 +08:00
winlin
de87b64f59 Improve test coverage for config. 2020-01-01 14:12:36 +08:00
winlin
a71d93188b Improve test coverage for config. 2020-01-01 13:41:19 +08:00
winlin
d783a12f89 Happy 2020 2019-12-30 10:10:35 +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
d11a7b2e00 For #299, fix some bugs in dash, it works now. 3.0.88 2019-12-27 20:47:33 +08:00
winlin
b9d720c927 For #1105, http server support mp4 range. 2019-12-26 18:33:52 +08:00
winlin
7584c47aaf Fix #1105, dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86 2019-12-26 18:05:17 +08:00
winlin
2115d5d22a For #1488, add test and improve coverage for parsing client ip. 2019-12-26 12:07:52 +08:00
winlin
316cab794a For #1488, pass client ip to http callback.3.0.85 2019-12-26 11:42:19 +08:00
winlin
d367730883 For #1488, support parsing original ip from header for proxy 2019-12-26 11:33:26 +08:00
winlin
09b65aff96 For #1488, pass client ip to http callback. 2.0.269 2019-12-26 10:37:16 +08:00
winlin
a11461905b Remove FFMPEG and NGINX, please use srs-docker instead . 3.0.82 2019-12-25 18:29:07 +08:00
winlin
e6e4bd7fb4 Remove useless warning log for reloading. 2019-12-24 19:26:22 +08:00
winlin
7eccc9da26 For #1508, support chunk length and content in multiple parts. 2019-12-24 14:58:35 +08:00
winlin
4382ced3bf For #1508, Refactor srs_is_digital, support all zeros. 2019-12-20 14:49:25 +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
dc1afc142f Fix HTTP CORS bug when sending response for OPTIONS. 3.0.72 2019-12-17 20:52:10 +08:00
winlin
191b07668d Refactor HTTP stream to disconnect client when unpublish 2019-12-17 16:54:06 +08:00
winlin
1e83da7812 Refactor HTTP recv request timeout to 15s. 2019-12-17 16:37:00 +08:00
winlin
2df1dcb05a Fix HTTP-FLV and VOD-FLV conflicting bug. 2019-12-17 16:01:04 +08:00
winlin
d9842b0371 Refactor HttpResponseWriter.write, default to single text mode. 2019-12-17 15:14:59 +08:00
winlin
8cdb7cc727 Add test for vod stream handler 2019-12-17 14:33:47 +08:00
winlin
ca2b68f428 Refactor header of HTTP message by using SrsHttpHeader. 2019-12-16 16:00:02 +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
78da67e8d1 For #1229, fix the security risk in logger. 3.0.69 2019-12-11 11:56:00 +08:00
winlin
ad70589347 For #1229, fix the security risk in HDS. 3.0.69 2019-12-11 11:31:32 +08:00
winlin
1c227f4f8a Refine logger for hls_dts_directly 2019-12-10 15:59:15 +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
31f341e205 For #1506, refine the AAC samples guess algorithm. 2019-12-05 20:16:23 +08:00
winlin
52c6c7c45d For #1506, ignore video when codec is unknown. 2019-12-05 19:21:43 +08:00
winlin
5a3fd1e68a Release v3.0-a2, 3.0.67 2019-12-01 19:24:17 +08:00
winlin
517974d451 Refine redirect flow for origin cluster 2019-11-30 19:06:41 +08:00
winlin
e5285ecabf Fix #1501, use request ip for origin cluster. 3.0.66 2019-11-30 18:50:24 +08:00
winlin
4cd03a7c06 Refine debug info for edge. 3.0.64 2019-11-30 17:31:27 +08:00
winlin
e045b0a619 We prefer ipv4, only use ipv6 if ipv4 is disabled. 3.0.59 2019-10-07 10:34:55 +08:00
winlin
88df9a2497 Support go-oryx rtmplb with proxy protocol. 3.0.56 2019-10-04 19:03:34 +08:00
winlin
130c545f9a Refine origin cluster log 2019-10-04 06:51:15 +08:00
winlin
1a65927b1b Remvoe HSTRS warning. 2019-10-03 13:18:28 +08:00
winlin
5d17bb8bb0 Remove KAFKA. 3.0.53 2019-10-03 12:45:38 +08:00
winlin
5d8fb01b45 Fix #1352, fix typo of daemon. 2019-05-07 07:46:20 +08:00
winlin
ffe391aa49 Fix HLS no PMT/PAT bug. 2019-05-07 07:40:19 +08:00
winlin
c71b867b4f Refine comments. 2019-05-06 07:43:05 +08:00
winlin
3d57c1c9bc Refine ST service. 2019-05-05 08:45:11 +08:00
winlin
202a584aab Refine ST service. 2019-05-05 08:17:48 +08:00
winlin
a4160308f5 Refine comments. 2019-05-05 07:55:55 +08:00
winlin
b02527dec0 Refine usage. 2019-04-30 09:15:06 +08:00
winlin
2de3045b25 Remove noisy informations. 2019-04-30 08:53:51 +08:00
winlin
6dbe79ad02 Remove noisy informations. 2019-04-30 08:43:12 +08:00
winlin
ad3749a4d5 Remove noisy informations. 2019-04-30 08:38:57 +08:00
winlin
0564cdedec Refine typo in comments. 2019-04-30 08:31:36 +08:00
winlin
6b2c71d385 Refine typo in files. 3.0.51 2019-04-30 08:30:13 +08:00
winlin
45009785fb Refine typo in app. 2019-04-30 08:24:52 +08:00
winlin
aac8a13f42 Refine typo in app. 2019-04-28 09:08:05 +08:00
winlin
e436cc5665 Refine SrsBasicRtmpClient in time unit. 2019-04-22 08:03:12 +08:00
winlin
c6dcc76fea Refine SrsRequest.duration in time unit. 2019-04-19 08:48:44 +08:00
winlin
73e71d26ea Refine SrsGopCache::start_time in time unit. 2019-04-19 08:04:09 +08:00
winlin
1626942d29 Fix SrsHlsMuxer::segment_close bug, reopen segment when close failed. 2019-04-18 09:28:08 +08:00
winlin
d306ee7506 Refine ms in time unit 2019-04-18 08:50:43 +08:00
winlin
5af572ab50 Refine SrsRtmpConn.duration in time unit. 2019-04-18 08:46:42 +08:00
winlin
f6f49c68da Refine SrsRecvThread timeout in time unit 2019-04-18 08:42:43 +08:00
winlin
6b587c5e0f Refine SrsUdpPacketRecvCycleInterval in time unit. 2019-04-18 08:17:37 +08:00
winlin
283c4c7449 Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit. 2019-04-18 08:15:55 +08:00
winlin
522cbf1df8 Refine SrsHourGlass in time unit. 2019-04-18 08:11:16 +08:00
winlin
f5a1f9b774 Refine SrsFragment.start_dts in time unit 2019-04-18 08:01:17 +08:00
winlin
288bed6e26 Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:58:37 +08:00
winlin
33c66b64c5 Refine name TMMS to TIMEOUT 2019-04-18 07:47:35 +08:00
winlin
5505eceeac Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:43:51 +08:00
winlin
feb34ed225 Refine SrsStSocket in time unit 2019-04-17 09:21:38 +08:00
winlin
d3dc45f357 Refine set_recv_timeout in time unit 2019-04-17 08:31:53 +08:00
winlin
f4bee37e76 Refine set_send_timeout in time unit 2019-04-17 08:18:37 +08:00
winlin
a1398892d0 Refine const timeouts in time unit 2019-04-17 08:08:31 +08:00
winlin
61afca7160 Refine SrsTcpClient timeout in time unit 2019-04-17 07:56:28 +08:00
winlin
e9770933a6 Refine dash controller publish or unpublish 2019-04-17 07:34:01 +08:00
winlin
6380e8f1c0 Fix HLS segment close bug 2019-04-16 09:32:26 +08:00
winlin
138d1e3cad Refine get_vhost_http_remux_fast_cache in time unit 2019-04-16 08:50:48 +08:00
winlin
010e35bec2 Refine get_hds_fragment and get_hds_window in time unit 2019-04-16 08:24:11 +08:00
winlin
917f6d066d Refine get_hls_window in time unit 2019-04-16 08:20:32 +08:00
winlin
ca705a6f62 Refine get_hls_fragment in time unit 2019-04-16 08:14:12 +08:00
winlin
402e614471 Refine get_send_min_interval in time unit 2019-04-16 07:59:27 +08:00
winlin
c1b64ba24f Refine get_queue_length and set_queue_size in time unit 2019-04-16 07:55:19 +08:00
ME_Kun_Han
af49e218ce for #1349, use correct value for SRS_CONF_DEFAULT_HLS_ON_ERROR_IGNORE and SRS_CONF_DEFAULT_HLS_ON_ERROR (#1351) 2019-04-15 08:17:35 +08:00
winlin
465d255940 Refine SRS_AUTO_HLS_SEGMENT_MIN_DURATION_MS in time unit 2019-04-15 07:56:16 +08:00
winlin
980c32aee6 Refine on_hls duration in time unit 2019-04-15 07:53:29 +08:00
winlin
5f3d09c8a0 Refine hls muxer duration in time duration. 2019-04-15 07:47:37 +08:00
winlin
41d1e91540 Fix start and end time bug 2019-04-12 10:00:39 +08:00
winlin
bc1189caee Refine SrsFragment.duration in time unit. 2019-04-12 08:04:06 +08:00
winlin
0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 2019-04-11 09:33:26 +08:00
winlin
53357e92fe Refine headers 2019-04-11 09:27:16 +08:00
winlin
92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 2019-04-11 09:18:20 +08:00
winlin
5b0e0d0838 Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit 2019-04-11 08:43:42 +08:00
winlin
695d430dcf Refine SrsMessageQueue.duration in time unit. 2019-04-11 08:35:57 +08:00
winlin
170cca1f58 Refine srs_get_system_startup_time in time unit 2019-04-10 09:11:54 +08:00
winlin
6c12aa0eca Refine srs_update_system_time in time unit 2019-04-10 09:07:03 +08:00
winlin
9b7c0802a9 Refine srs_update_system_time in time unit 2019-04-10 08:32:46 +08:00
winlin
9b1222a79c Refine get_publish_normal_timeout in time unit 2019-04-10 07:58:39 +08:00
winlin
170872135d Refine get_publish_1stpkt_timeout in time unit 2019-04-10 07:53:09 +08:00
winlin
d6828a3e58 Refine get_mw_sleep in time unit 2019-04-09 09:39:16 +08:00
winlin
839a496d50 Refine get_mr_sleep in time unit 2019-04-09 09:20:44 +08:00
winlin
5df8f2f6c1 Refine get_pithy_print in time unit 2019-04-09 08:55:54 +08:00
winlin
60f9561d2d Refine get_heartbeat_interval in time unit 2019-04-09 08:47:18 +08:00
winlin
5937304717 Refine get_dash_timeshift in time unit 2019-04-08 09:20:02 +08:00
winlin
12cf17ef6b Refine get_dash_update_period in time unit 2019-04-08 09:10:06 +08:00
winlin
4302ab7708 Refine get_dash_fragment to time unit 2019-04-08 09:02:39 +08:00
winlin
bb6389143f Refine get_bw_check_interval in time unit 2019-04-08 08:46:22 +08:00
winlin
74c1944e15 Refine config, allow parse multiple times. 2019-04-08 08:31:58 +08:00
winlin
6239dfa489 Apply time unit 2019-04-07 16:25:52 +08:00
winlin
7037f6a197 Cover more ST Coroutine code 2019-04-07 15:22:09 +08:00
winlin
1ce040cc2c Cover more ST Coroutine code 2019-04-07 14:35:11 +08:00
winlin
3d5508e088 Cover more ST Coroutine code 2019-04-07 13:52:16 +08:00
winlin
a9a720e32f Cover ST Coroutine and time unit. 3.0.48 2019-04-07 12:59:37 +08:00
winlin
f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 2019-04-06 16:10:33 +08:00
winlin
a8781aee3e For #1304, Default HSTRS to on. 2.0.264 2019-04-06 15:35:12 +08:00
winlin
633a9a0d35 Merge #1324, Remove dead code 2019-04-05 18:55:33 +08:00
winlin
b9750baa52 For #1339, Support HTTP-FLV params. 2019-04-05 18:44:50 +08:00
winlin
91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 2019-04-05 18:16:05 +08:00