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

7313 commits

Author SHA1 Message Date
winlin
fa235a81aa Merge branch '4.0release' into merge/develop 2021-05-08 09:59:32 +08:00
winlin
e7cce88912 RTC: Refine timer stat 2021-05-07 19:01:25 +08:00
winlin
25f17c32e9 RTC: Refine fast timer 2021-05-07 18:42:36 +08:00
winlin
92fc0af8f4 RTC: Support circuit breaker. 4.0.103 2021-05-07 17:43:05 +08:00
winlin
fd6c653d3c SquashSRS4: Refine performance for FastTimer 2021-05-07 11:25:37 +08:00
winlin
f4704c2662 Merge 2021-05-07 10:58:34 +08:00
winlin
ee15d19878 Merge branch '4.0release' into merge/develop 2021-05-07 10:58:09 +08:00
winlin
46c980c70a RTC: Eliminate unused code 2021-05-07 10:57:25 +08:00
winlin
4527a91545 RTC: Refine play stream find track. 4.0.102 2021-05-07 10:50:51 +08:00
winlin
b823dcdfd7 RTC: Refine FastTimer to fixed interval. 4.0.101 2021-05-07 10:20:00 +08:00
winlin
f995bf7ca8 SquashSRS4: Transform config for nack/twcc. 2021-05-06 17:39:10 +08:00
winlin
019cdfd6ba Merge 2021-05-06 17:38:14 +08:00
winlin
bebc55439b Merge branch '4.0release' into merge/develop 2021-05-06 17:37:46 +08:00
winlin
0c0b467917 RTC: Transform config for nack/twcc. 4.0.100 2021-05-06 17:24:20 +08:00
winlin
f41c0b42b1 SquashSRS4: Fix config bug for nack and twcc. 2021-05-06 13:50:28 +08:00
winlin
1fe5ae04d3 Merge branch '4.0release' into merge/develop 2021-05-06 13:49:41 +08:00
winlin
c06b4838b8 Merge branch 'develop' into merge/develop 2021-05-06 13:49:34 +08:00
winlin
b41788ca4a RTC: Fix config bug for nack and twcc. 4.0.99 2021-05-06 11:42:42 +08:00
winlin
4f48ad7a8b RTC: Fix config check bug for nack and twcc 2021-05-06 11:41:11 +08:00
winlin
becbe45bcd SquashSRS4: Add demo for RTC 2021-05-05 13:26:25 +08:00
winlin
5317265b26 Merge 2021-05-05 13:24:56 +08:00
winlin
16162eccce Merge 2021-05-05 13:16:56 +08:00
winlin
320bff49e0 Update demos 2021-05-05 12:56:26 +08:00
winlin
37f051f16d Update console 2021-05-05 12:54:47 +08:00
winlin
1e27db6a7d Update players 2021-05-05 12:53:26 +08:00
winlin
a39ff09f2a Tools: Add wx-video brocasting for demo 2021-05-04 12:47:24 +08:00
winlin
5405494de8 Tools: Refine one to one RTC demo 2021-05-04 11:42:15 +08:00
winlin
6e26da2323 Tools: Refine sig sdk for demo 2021-05-04 11:27:18 +08:00
winlin
700186b1c8 Tools: Refine random room and display for demo 2021-05-04 11:20:10 +08:00
winlin
81a87d07f6 Add video room demo. 4.0.98 2021-05-04 10:48:02 +08:00
winlin
bfeca8e068 Tools: Add video room demo 2021-05-04 10:46:56 +08:00
winlin
b42bf496c7 Tools: Update script 2021-05-03 16:11:11 +08:00
winlin
9fb2b69212 Add RTC stream merging demo by FFmpeg. 4.0.97 2021-05-03 15:53:55 +08:00
winlin
aa9c4e8604 Tools: Refine one to one demo 2021-05-03 14:36:29 +08:00
winlin
ea417201b3 Tools: Copy to gits 2021-05-03 14:27:43 +08:00
winlin
74043b4153 Tools: Update one to one demo 2021-05-03 14:13:32 +08:00
winlin
fc23b9e5f5 Tools: Refine script 2021-05-03 10:06:56 +08:00
winlin
2783ac7c92 Tools: Sync 3rdparty tools 2021-05-03 10:05:45 +08:00
winlin
dea6136238 Copy demos to SRS release 2021-05-03 08:49:16 +08:00
winlin
206d95879f SquashSRS4: Add one to one RTC demo. 2021-05-02 21:46:41 +08:00
winlin
64243ddb8a Merge branch '4.0release' into merge/develop 2021-05-02 21:46:06 +08:00
winlin
63568380f3 Merge branch 'develop' into merge/develop 2021-05-02 21:46:01 +08:00
winlin
5e6fe49da1 Add one to one demo for no-localhost 2021-05-02 21:06:31 +08:00
winlin
5a611e0c4b Add one to one demo. 4.0.96 2021-05-02 19:35:03 +08:00
winlin
74bb47c13f SquashSRS4: Support RTC2RTMP. 2021-05-01 22:15:57 +08:00
winlin
2efeb33d14 Merge branch '4.0release' into merge/develop 2021-05-01 22:15:08 +08:00
winlin
1a7a508cc9 Merge 2021-05-01 22:15:01 +08:00
winlin
f7473c90bc For #2303: Add conf for RTC2RTMP 2021-05-01 18:19:17 +08:00
winlin
8a30cc86d9 Bridger: Fix build fail if disable rtc and ffmpeg-fit 2021-05-01 18:16:51 +08:00
winlin
3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 2021-05-01 18:16:51 +08:00