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
7170 commits 13 branches 107 tags 375 MiB
Commit graph

5777 commits

Author SHA1 Message Date
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
winlin
67c5f8ad7e Refine code 2021-03-24 11:07:03 +08:00
winlin
b7b474deba SquashSRS4: Update srs-bench. 2021-03-24 11:05:25 +08:00
winlin
07265d8d73 Merge 4.0release 2021-03-24 11:03:21 +08:00
winlin
f5ff28d47a RTC: Refine play stream init 2021-03-24 10:50:13 +08:00
winlin
3fea5c0ec3 Test: Add republish regression test, should fail 2021-03-23 19:32:59 +08:00
winlin
bb37a5550c Test: Update srs-bench 2021-03-23 12:12:01 +08:00
winlin
25145b945d RTC: Use send_rtcp to encrypt and send RTCP bytes 2021-03-22 16:25:08 +08:00
winlin
4329c7e7cb Live: Refine edge to follow client and HTTP/302. 5.0.1 2021-03-17 16:58:40 +08:00
winlin
4f1d213c91 Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge. 2021-03-17 16:53:39 +08:00
winlin
35431749c4 Live: Support follow client protocol for edge. 2021-03-17 16:48:18 +08:00
winlin
33fa43c118 Init SRS/5. 5.0.0 2021-03-15 14:11:34 +08:00
winlin
ccbc11c2d6 Test: Fix bug for srs-bench. 2021-03-12 13:10:10 +08:00
winlin
c07b7db3c5 Test: Update srs-bench. 2021-03-12 13:08:46 +08:00
winlin
57f8a1afec Update doc. 2021-03-11 17:15:33 +08:00
winlin
a3dbb22696 Fix bugs. 4.0.85 2021-03-11 17:12:44 +08:00
winlin
4f1aa924e6 SquashSRS4: Add security scan. Feed TWCC before drop PT. 2021-03-11 16:55:05 +08:00
winlin
a53fe451ff RTC: Feed TWCC then drop the specified PT packet. 
1. Sometimes we might drop RTP packets, by PT(payload type).
2. For example, the padding packets from client.
3. We should feed these packets to TWCC, then drop it.
 2021-03-11 16:48:29 +08:00
winlin
7f8df6f21f Build: Refine script for SRTP. 
Because we have upgraded to openssl-1.1.1d and libsrtp-2.3,
so it's able to enable ASM for SRTP for not only openssl-1.0,
because libsrtp-2.3 fixed the capacity bug.
 2021-03-11 08:16:25 +08:00
winlin
e74810230a SquashSRS4: Regine DTLS and add regression tests. 4.0.84 2021-03-10 08:29:40 +08:00
winlin
f066914968 Test: Add missing files. 2021-03-10 07:38:11 +08:00
winlin
27d4080084 Test: Fix check file bug 2021-03-10 07:26:18 +08:00
winlin
030b94e717 Test: Add missing files for srs-bench 2021-03-10 07:03:57 +08:00
winlin
06f2e1462e DTLS: Update regression tests 2021-03-09 22:26:50 +08:00
winlin
d4d11c2c18 DTLS: Change max loop to larger 2021-03-09 22:19:32 +08:00
winlin
62987aa01f DTLS: Refine retransmit between ClientHello and Certificate. 2021-03-09 22:12:23 +08:00
winlin
02aac0fea4 DTLS: Fix ARQ bug, use openssl timeout. 4.0.84 2021-03-09 19:36:45 +08:00
winlin
dc93836489 SquashSRS4: Refine DTLS init, use specified API by role 2021-03-09 12:01:23 +08:00
winlin
3c6e466280 DTLS: Use specified init API, to decrease packet size 2021-03-09 11:54:27 +08:00
winlin
3a5d88b435 DTLS: Disable QueryMTU for openssl, or the packet get fragmented 2021-03-09 07:22:11 +08:00
winlin
079c54bbe7 Add important comment for ST 2021-03-09 07:21:07 +08:00
winlin
55bdc354f5 Add important comment for disposing and thread stop 2021-03-08 21:05:02 +08:00
winlin
de65a331f1 SquashSRS4: Fix DTLS config bug, dup Alert bug. 4.0.83 2021-03-08 12:39:25 +08:00
winlin
e4df2eb2ce DTLS: Fix dead loop by duplicated Alert message. 4.0.83 2021-03-08 12:35:16 +08:00
winlin
1ed567a005 DTLS: Fix dead loop by duplicated Alert message 2021-03-08 12:34:15 +08:00
winlin
43028c99c8 Fix bug when client DTLS is passive. 4.0.82 2021-03-08 10:41:42 +08:00
winlin
fe1b427462 Update 2021-03-06 10:46:07 +08:00
winlin
fc4f539907 Should check bridger status when publish stream. 2021-03-05 16:47:47 +08:00
winlin
c3f057e4d3 Squash SRS4: Update README for docker 2021-03-05 10:04:18 +08:00
winlin
c143b6bfd0 Squash SRS3: Update README for docker 2021-03-05 09:53:15 +08:00
winlin
56b64689bf SquashSRS4: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 2021-03-04 23:06:08 +08:00
winlin
83c615aa8a SquashSRS3: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 2021-03-04 22:45:43 +08:00
winlin
817c704db7 SquashSRS4: Support fast local coverage with module 2021-03-04 17:13:24 +08:00
winlin
990dc8cda9 Script: Fast coverage support module filter 2021-03-04 17:10:12 +08:00
winlin
d6a6f98a70 Script: Support local fast coverage by gcovr 2021-03-04 17:10:12 +08:00
winlin
7d12c3641a Merge ST, support utest and coverage by gtest. 2021-03-04 15:01:14 +08:00
winlin
3bb1b673c5 Merge SRS4, lots of features 2021-03-04 14:49:03 +08:00
winlin
bb3bd1705e Refine the regression test tool, add missing files 2021-03-04 14:19:39 +08:00
winlin
876210f6c9 For regression test, add srs-bench to 3rdparty 2021-03-04 14:18:57 +08:00
winlin
de87dd427d Fix utest fail 2021-03-04 14:18:54 +08:00
winlin
5a66d15e85 Support regression test in CI. 2021-03-04 14:18:52 +08:00
winlin
212ff6fc2d Never force to openssl-1.0 for asm and srtp-asm, because openssl-1.1+libsrtp-2.3 is ok now 2021-03-04 14:18:50 +08:00
Pieere Pi
4ba485002c Fix #2106, #2011, RTMP/AAC transcode to Opus bug. 4.0.81 2021-03-04 14:17:36 +08:00
winlin
dd8f7ff09a Enable HTTP-FLV for conf/rtc.conf 2021-03-04 14:16:03 +08:00
winlin
0bc3bdc7b8 Refine gcov files 2021-03-04 14:15:52 +08:00
winlin
27712fdda7 Rename ffmpeg-4.2-fit to ffmpeg-4-fit 2021-03-04 14:14:06 +08:00
winlin
b19074721c Refine build script 2021-03-04 14:14:01 +08:00
winlin
8089fc004c Upgrade libsrtp from 2.0.0 to 2.3.0, with source code. 4.0.79 2021-03-04 14:13:58 +08:00
winlin
3749d4d833 Update doc 2021-03-04 14:13:56 +08:00
winlin
921e4041ba Update doc 2021-03-04 14:13:52 +08:00
winlin
c9d68aae79 Refine FFmpeg-4.2-fit build bug 2021-03-04 14:13:45 +08:00
winlin
812d4ebfea Refine FFmpeg-4.2-fit build, copy source code 2021-03-04 14:13:43 +08:00
winlin
98839d3d53 RTC: Fix TWCC enable bug 2021-03-04 14:13:40 +08:00
winlin
96dbd7bced Upgrade openssl from 1.1.0e to 1.1.1b, with source code. 4.0.78 2021-03-04 14:12:47 +08:00
winlin
8f1c992379 Refine code, rename drop to loss 2021-03-04 14:12:39 +08:00
winlin
d4b8a57cf7 Enable Object Cache and Zero Copy Nack by default. 4.0.77 2021-03-04 14:12:31 +08:00
winlin
57f16299f4 Fix #2219, Ubuntu build fail. Add CI for ubuntu20 2021-03-03 21:15:26 +08:00
winlin
969b947849 Hotfix 4.0.76, fix build fail for FFmpeg-fit CentOS6 2021-03-02 20:51:31 +08:00
winlin
58924d41b1 RTC: Support high performance NO-COPY-NACK. 4.0.76 2021-03-02 19:34:59 +08:00
winlin
f63441413d RTC: Support disable the NACK no-copy, enable copy by default 2021-03-02 19:34:56 +08:00
winlin
50860325dd RTC: Fix copy RTP packet bug 2021-03-02 19:34:53 +08:00
winlin
2719e4c0be Refine code 2021-03-02 19:34:50 +08:00
winlin
ee9ef378f9 RTC: Fix bug for wrap exists buffer size 2021-03-02 19:34:46 +08:00
winlin
b91d37b78a RTC: Store the actual size of buffer for RTP packet. 2021-03-02 19:34:39 +08:00
winlin
171ae5dd2d RTC: Fix shared msg cache bug 2021-03-02 19:34:37 +08:00
winlin
eed98dd85b RTC: Refine code, remove the reset for header 2021-03-02 19:34:35 +08:00
winlin
5d4baf4eca RTC: Refine code, remove the assign 2021-03-02 19:34:33 +08:00
winlin
7c517988a6 Perf: Refine header extensions marshal 2021-03-02 19:34:31 +08:00
winlin
eb9a263433 Cache RTP packet size, revert 9ee0ed919a 2021-03-02 19:34:18 +08:00