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

3615 commits

Author SHA1 Message Date
winlin
b5f2c842fe Fix perf api bug 2020-04-15 10:50:56 +08:00
winlin
ab53c34945 For #307: Change the RTP payload to 1400 2020-04-15 10:44:26 +08:00
winlin
6e9e0d6ce3 Fix build script 2020-04-15 10:35:38 +08:00
xiaozhihong
e0cd148ad6 merge 2020-04-15 10:31:38 +08:00
winlin
c143c80fd6 Fix GSO stat bug 2020-04-15 07:10:41 +08:00
winlin
dd7b5cf53f Fix GSO stat bug 2020-04-15 06:44:09 +08:00
winlin
6cf9933bf3 For #307, refine gperf api 2020-04-14 21:49:49 +08:00
winlin
a80084289b Support debug 2020-04-14 20:12:33 +08:00
winlin
8e4ef98629 For #307, correct the RTP packet stat. 2020-04-14 20:12:14 +08:00
winlin
97cfae624c Fix CentOS8 build warnings 2020-04-14 19:23:15 +08:00
winlin
bda7bdee54 Change RTC realtime to 0 cache 2020-04-14 19:19:46 +08:00
winlin
de343d6547 Add tool for GSO 2020-04-14 18:48:57 +08:00
winlin
ba3d293bfd Refactor stat for frames 2020-04-14 14:22:30 +08:00
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
0bb61f7d98 For #307, RTC RTP support padding 2020-04-13 13:44:55 +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
acbbdf51d6 Refacor STAP RTP packet 2020-04-12 01:05:11 +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
1e0474e470 support sip query catalog message, parse xml to map, nvr 2020-04-11 20:18:38 +08:00
kyxlx550
769efa87c3 add sip device channel error code 2020-04-11 20:01:35 +08:00
kyxlx550
3d1c34a45e add gbs log id define 2020-04-11 20:00:31 +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
7ffe4aacb8 For #307, refactor shared msg, add samples and extra payload 2020-04-11 15:26:20 +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
a1371fe93c Fix utest warnings 2020-04-11 09:11:46 +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
9b2f429571 Allows empty body metadata. 2020-04-09 20:43:51 +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
b2f0696976 Fix build warning 2020-04-07 11:36:03 +08:00
winlin
368e93e9e8 For #307, support use sendto or sendmsg when senmmsg(1 msg) 2020-04-06 21:24:06 +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
b8db61bd9c For #307, Support disable sendmmsg 2020-04-05 22:13:49 +08:00
winlin
6f7ebbdc5f Merge branch 'develop' into feature/rtc 2020-04-05 21:59:46 +08:00
winlin
f228b3809a Fix utest failed. 2020-04-05 21:22:50 +08:00
winlin
dc3df926eb For #307, support configure with sendmmsg. 2020-04-05 18:34:57 +08:00
winlin
b23525033b Merge branch 'develop' into feature/rtc 2020-04-05 17:21:07 +08:00
winlin
10d5f99d3d For #307, SRTP ASM only works with openssl-1.0, auto detect it. 4.0.22 2020-04-05 17:14:22 +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
9e9b5374d5 srs_get_sip_utc_date external use 2020-04-05 13:51:19 +08:00
xialixin
c70ed1cd74 add sip session status check 2020-04-05 13:49:47 +08:00
xialixin
778f12508f add todo info log level compile error 2020-04-05 13:48:42 +08:00
xialixin
8ac39cb22f del print_sip_message config 2020-04-05 13:45:52 +08:00
winlin
737dcdd2c8 Merge branch 'develop' into feature/rtc 2020-04-04 22:48:33 +08:00
winlin
9943565ec9 Merge RTC and GB28181, with bugs fixed. 4.0.21 2020-04-04 22:45:16 +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
c5c0df6536 Update build script 2020-04-04 15:44:56 +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
5ad58933a9 For #307, build SRTP with openssl to improve performance. 4.0.19 2020-04-03 21:14:06 +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
winlin
9ad5a5d9b6 RTC support openssl 1.0.* 2020-04-03 13:41:45 +08:00
winlin
f853c7a1e0 Support start SRS when wireshark capturing 2020-04-03 13:40:34 +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
df6274daf8 Merge branch 'feature/rtc' into develop 2020-03-31 18:19:15 +08:00
winlin
4ac8991a8e Update author to runner365 for SRT 2020-03-31 18:10:44 +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
winlin
c7113f27e0 Play stream by WebRTC on iOS/Android/PC browser. 4.0.17 2020-03-31 09:35:36 +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
f3d708c2b5 Fix utest build warnings 2020-03-30 12:46:53 +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
84652265d9 Update README 2020-03-29 00:23:16 +08:00
winlin
cc6a447332 Merge feature/rtc 2020-03-29 00:21:00 +08:00
winlin
13ee53434e Merge branch '4.0release' into develop 2020-03-29 00:14:46 +08:00
winlin
3e0a7ee7fb Merge branch '3.0release' into 4.0release 2020-03-29 00:13:41 +08:00
winlin
98a71954da Support multiple OS/Platform build cache. 3.0.139 2020-03-29 00:09:17 +08:00
winlin
c1e124786c For #307, fix build warnings for rtc 2020-03-28 20:57:03 +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
3556da40ce Fix #1250, Support macOS, OSX, MacbookPro, Apple Darwin. 3.0.138 2020-03-28 17:23:11 +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
winlin
2b6da30ac6 Welcome maintainers Runner365, John, B.P.Y(Bepartofyou). 4.0.15 2020-03-22 21:22:15 +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
winlin
e5e2d05da0 For #307, support play with WebRTC. 4.0.14 2020-03-22 19:46:56 +08:00
bepartofyou
4a17259471 err wrap change to new 2020-03-22 19:36:11 +08:00
winlin
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +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
850a4bbf20 Fix #1619, configure without utest by default. 3.0.136 2020-03-21 20:41:37 +08:00
winlin
f89b4b3b26 For #1651, fix return pnwrite of srs_write_large_iovs. 3.0.135 2020-03-21 20:20:40 +08:00
winlin
955de3dac9 Merge branch '3.0release' into 4.0release 2020-03-21 19:36:16 +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
l
bbfb03f98a
修复srs_write_large_iovs中nwrite未累加的错误 2020-03-19 14:36:56 +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
9ba861f42f 3.0release is beta now 2020-03-16 15:11:34 +08:00
winlin
a8ddd5afe7 For #1635, refine inotify watch for relative path 2020-03-16 11:52:31 +08:00
winlin
8db2c3d821 For #1635, refine inotify watch for relative path 2020-03-16 11:39:20 +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
768598a3bb add kernel rtp packet 2020-03-13 20:35:07 +08:00
xiaozhihong
027d34bbd3 add rtp shared packet 2020-03-13 20:34:40 +08:00
winlin
a7c8980a60 For #1636, muxing sh, use sound_rate if aac sr not set. 2020-03-13 17:36:22 +08:00
winlin
7036f839d2 For #1636, add comments 2020-03-13 17:05:22 +08:00
winlin
aa20a04abb For #1636, fix bug for mux AAC to ADTS, never overwrite by RTMP sampling rate. 4.0.13 2020-03-13 16:56:00 +08:00
winlin
c66f33ac87
Merge pull request #1636 from runner365/3.0release.srt.dev 
support all aac sample rate in srt2rtmp
 2020-03-13 16:46:49 +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
runner365
f102a598b8 Merge branch 'develop' into 3.0release.srt.dev 2020-03-12 20:30:59 +08:00
runner365
b9195122cf support all sample rate in aac 2020-03-12 20:30:07 +08:00