1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

1810 commits

Author SHA1 Message Date
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
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
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
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