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

5755 commits

Author SHA1 Message Date
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
winlin
c770e6d7bc Bridger: Start RTMP2RTC bridger in RTMP publisher 2021-05-01 18:16:51 +08:00
winlin
c10232b4e2 Bridger: Refine transcoder to support aac2opus and opus2aac. 4.0.94 2021-05-01 18:16:51 +08:00
winlin
00c192ede1 Timer: Apply shared FastTimer to RTC server. 4.0.93 2021-05-01 18:16:51 +08:00
winlin
8747dd6630 Timer: Extract shared FastTimer to use one timer for all connections 2021-05-01 18:16:51 +08:00
winlin
659e173e15 RTC: Refine for writing doc. 4.0.92 2021-05-01 16:42:09 +08:00
winlin
028808a76b Merge branch '4.0release' into merge/develop 2021-04-30 17:24:48 +08:00
winlin
165f97e4a0 SquashSRS3: Link source flv in doc 2021-04-30 17:04:57 +08:00
winlin
3909e15fdf Merge branch '4.0release' into merge/develop 2021-04-30 08:12:26 +08:00
Winlin
e8fe66e3ba
RTC: Support av1 for Chrome M90 enabled it. 4.0.91 (#2324)
* RTC: Support av1 for Chrome M90 enabled it. 4.0.91

* RTC: Show codec for WebRTC publisher
2021-04-30 08:09:01 +08:00
winlin
a9d39f6946 RTC: Refine API params to create connection 2021-04-29 20:30:24 +08:00
winlin
51aa899358 RTC: Refine H5 demo, extract srs.sdk.js 2021-04-29 11:50:51 +08:00
winlin
a5727c373a Script: Remove unused git2unix.sh 2021-04-29 08:26:32 +08:00
winlin
aee20d7d65 Merge branch 'develop' into merge/develop 2021-04-28 15:51:36 +08:00
winlin
e069b0e673 Merge 2021-04-28 15:51:03 +08:00
winlin
7cae97e4d3 SquashSRS3: Update players 2021-04-28 15:45:34 +08:00
winlin
ea1f32526a RTC: Remove DTLS utest, cover by regression test 2021-04-27 18:54:10 +08:00
winlin
a300d1fc54 Fix bug for alone pithy print 2021-04-27 18:34:51 +08:00
winlin
543377ebf1 Test: Update srs-bench 2021-04-27 17:40:47 +08:00
winlin
c2229d392a Add alone pithy print 2021-04-27 17:05:26 +08:00
winlin
e67207f4b1 Script: Refine package and install script 2021-04-26 14:20:18 +08:00
winlin
3d74b0efc9 SquashSRS4: Add crossdomain.xml for install script. 2021-04-26 13:59:29 +08:00
winlin
1fabe5137d Merge branch 'develop' into merge/develop 2021-04-26 13:58:59 +08:00
winlin
099b6c963d Merge branch '4.0release' into merge/develop 2021-04-26 13:58:55 +08:00
winlin
db37a4ac02 SquashSRS3: Add crossdomain.xml for install script. 2021-04-26 13:57:14 +08:00
winlin
f9d9f3a373 Modules: Fix build fail for global variables. 2021-04-25 13:34:57 +08:00
winlin
00a8eef580 Fix utest fail 2021-04-25 12:07:00 +08:00
winlin
eba78149ad SquashSRS4: Change push-RTSP as deprecated feature. 2021-04-24 21:40:09 +08:00
winlin
76c9034f0b Merge 2021-04-24 21:39:37 +08:00
winlin
86f1a8b528 Merge branch '4.0release' into merge/develop 2021-04-24 21:38:48 +08:00
winlin
5516d3751f Change push-RTSP as deprecated feature. 2021-04-24 21:33:44 +08:00
winlin
d4a8a72388 SquashSRS4: Add console. Disable cherrypy by default. 2021-04-24 19:45:05 +08:00
winlin
f5c9996c59 Merge 2021-04-24 19:40:33 +08:00
winlin
6f66cf0868 Player: Change the default from RTMP to HTTP-FLV. 2021-04-24 19:38:49 +08:00
winlin
5232f9e043 Disable CherryPy by --cherrypy=off. 4.0.90 2021-04-24 19:26:24 +08:00
winlin
de1c7522f0 SquashSRS3: Add console 2021-04-24 19:07:37 +08:00
winlin
9ed7565789 SquashSRS3: Package srs-console 2021-04-24 17:51:05 +08:00
winlin
c95bfc4a46 Timer: Apply shared FastTimer to RTC server 2021-04-23 11:17:58 +08:00
winlin
7b413edbb7 Timer: Extract shared FastTimer to use one timer for all connections 2021-04-23 11:04:05 +08:00
winlin
7bdc9e8e96 Moduels: Refine the description 2021-04-21 11:18:35 +08:00
winlin
b29827d22c Modules: Enable app files for module 2021-04-21 11:03:37 +08:00
winlin
aa07f45545 SquashSRS4: Happy 2021 2021-04-20 19:03:02 +08:00
winlin
56446825dc Merge branch '4.0release' into merge/develop 2021-04-20 19:02:17 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
winlin
2ea19a20dd Merge 4.0 2021-04-16 09:28:53 +08:00
winlin
124455be09 Update script 2021-04-16 09:27:47 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
stone
3eb3cb9b51 For #2275, fix bug for transcode engine config param. 2021-04-09 07:22:15 +08:00
winlin
263ead07f0 Merge branch 'develop' into merge/develop 2021-04-09 07:20:57 +08:00
winlin
78af396c76 Merge branch '4.0release' into merge/develop 2021-04-09 07:20:53 +08:00
stone
6da91f7dea For #2275, fix bug for transcode engine config param. 2021-04-09 07:19:31 +08:00
winlin
323306149d SquashSRS4: Eliminate the dup code 2021-04-06 11:22:12 +08:00
winlin
a8fbae9e0a Merge 4.0 2021-04-06 11:21:15 +08:00
winlin
aae0f61165 RTC: Eliminate the dup code 2021-04-06 10:56:40 +08:00
winlin
55426c6331 SquashSRS4: Fix RTC connection dispose bug 2021-04-06 10:51:42 +08:00
winlin
6efa5b37e1 Merge branch '4.0release' into merge/develop 2021-04-06 10:50:57 +08:00
winlin
061f367a82 RTC: Fix RTC connection dispose bug 2021-04-06 10:50:23 +08:00
winlin
1ee77614fb Refine comments 2021-04-05 12:14:26 +08:00
winlin
237c1e4d3d SquashSRS4: Fix DTLS warnings for HTTP api 2021-04-05 08:29:29 +08:00
winlin
79a357a945 Merge branch '4.0release' into merge/develop 2021-04-05 08:28:48 +08:00
winlin
db7e820f04 RTC: Fix DTLS warnings for HTTP api 2021-04-05 08:28:16 +08:00
winlin
fcf72b48f9 SquashSRS4: Fix republish bug 2021-04-04 19:05:44 +08:00
winlin
30b1fa650c Merge 2021-04-04 19:05:10 +08:00
winlin
ee978c319a Merge branch '4.0release' into merge/develop 2021-04-04 19:04:43 +08:00
winlin
96003d4a52 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 19:01:42 +08:00
winlin
52644f50c9 SquashSRS4: Fix republish bug 2021-04-04 18:50:59 +08:00
winlin
bae7484d53 Merge branch '4.0release' into merge/develop 2021-04-04 18:48:48 +08:00
winlin
8d9dd532b9 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 18:35:02 +08:00
winlin
d80ba9d284 SquashSRS4: Fix memory leak 2021-04-01 17:35:40 +08:00
winlin
d455e594b9 Merge branch '4.0release' into merge/develop 2021-04-01 17:35:06 +08:00
winlin
3c59fedab6 RTC: Fix memory leak 2021-04-01 17:34:47 +08:00
winlin
fa2fec3247 SquashSRS4: Refine payload NALU type parser 2021-04-01 14:48:41 +08:00
winlin
cc1cab2803 Merge branch '4.0release' into merge/develop 2021-04-01 14:47:48 +08:00
winlin
7823d75a38 RTC: Refine payload NALU type parser 2021-04-01 14:46:28 +08:00
winlin
0cc3063703 SquashSRS4: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:55:03 +08:00
winlin
bf7118df27 SquashSRS4: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:53:44 +08:00
winlin
aa5d872b8c RTC: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:50:20 +08:00
winlin
bd1752a4b2 RTC: Fix TWCC send bug 2021-04-01 10:47:50 +08:00
winlin
7ac4a4f4ca RTC: Fix audio track description bug 2021-04-01 10:24:37 +08:00
winlin
f4b791a9d5 Kernel: Never assert for SrsBuffer::require 2021-04-01 10:22:07 +08:00
winlin
4d5c7e0a73 RTC: Fix object cache bug, reset payload when recycle 2021-04-01 10:21:19 +08:00
winlin
45b83bd22e SquashSRS4: Update comments and performance data 2021-03-31 18:25:12 +08:00
winlin
ae0871d696 Merge branch '4.0release' into merge/develop 2021-03-31 18:24:10 +08:00
winlin
f2d0c34244 RTC: Refine comments for SrsRtpPacket2 2021-03-31 17:46:45 +08:00
winlin
4692e8b8ad SquashSRS4: Support WebRTC re-publish stream. 2021-03-26 14:59:25 +08:00
winlin
6aed86f852 Merge branch '4.0release' into merge/develop 2021-03-26 14:58:30 +08:00
winlin
d6c16a7e23 RTC: Support WebRTC re-publish stream. 4.0.87 2021-03-24 20:12:31 +08:00
winlin
aab54b2cf4 SquashSRS4: Refine RTC extension ID parsing 2021-03-24 19:00:42 +08:00
winlin
10c6e7dc98 Merge branch '4.0release' into merge/develop 2021-03-24 19:00:08 +08:00
winlin
0cb05a2953 RTC: Refine ID parsing 2021-03-24 18:58:01 +08:00
winlin
ff268dca23 SquashSRS4: Eliminate dead code, we never offer 2021-03-24 15:27:07 +08:00
winlin
0aef74ea7a Merge 4.0release 2021-03-24 15:25:49 +08:00
winlin
89f941fadc Refine version file 2021-03-24 15:24:21 +08:00
winlin
6c7e24fc6d RTC: Eliminate dead code, we nerver send offer 2021-03-24 15:21:40 +08:00
winlin
ecd4527342 SquashSRS4: Use fast parse TWCCID, ignore in packet parsing 2021-03-24 14:17:52 +08:00
winlin
875201b161 Merge 4.0release 2021-03-24 14:16:31 +08:00
winlin
4c39cc7c2f RTC: Use fast parse TWCCID, ignore in packet parsing. 4.0.86
1. TWCC should not be passed from end to end.
2. Publisher TWCC information, should be ignore when pass to player
3. Player should regenerate its own TWCC.
2021-03-24 12:29:17 +08:00