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

5784 commits

Author SHA1 Message Date
winlin
29dea37dbb Squash: Merge SRS4 2021-08-10 12:10:35 +08:00
Haibo Chen
345b691895
support http hooks for rtc: on_play/stop/publish/unpublish (#2509) 
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
 2021-08-10 09:41:20 +08:00
winlin
9bf5005bdd Squash: Merge SRS4 2021-08-08 00:30:08 +08:00
Haibo Chen
84d04adfff
get original ip instead of proxy ip, for rtc api (#2514) 2021-08-07 23:37:18 +08:00
winlin
adf0043cbc Fix #2508, Support features query by API. 5.0.10 2021-08-07 23:21:23 +08:00
winlin
69faf06f0f API: For #2508, query feature docker and packager. 2021-08-07 21:35:00 +08:00
winlin
983d521987 API: Use libuuid to generate uuid. v5.0.9 2021-08-06 22:02:46 +08:00
Haibo Chen
06f10b1894
fix coredump bug: caused by publish stream that codec is h.263 (#2505) 2021-08-04 17:06:55 +08:00
Haibo Chen
f62a4c4893
correct the client ip of http-flv player, for statistic (#2491) 2021-07-26 20:01:29 +08:00
winlin
ed6f8689b4 Release 4.0 dev1, v4.0.146 2021-07-25 08:42:19 +08:00
winlin
301a8ceadb Squash: Merge SRS 4.0 2021-07-24 21:10:35 +08:00
Haibo Chen
fb73d42c38
explicitly enable nack, for firefox (#2373) 2021-07-24 20:47:34 +08:00
winlin
1c80b529f8 Squash: Merge SRS 4.0 2021-07-24 08:20:05 +08:00
Haibo Chen
0efd7b1bbc
RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) 
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
 2021-07-24 08:05:10 +08:00
winlin
33610c6865 Squash: Merge SRS 4.0 2021-07-21 10:36:07 +08:00
Alex.CR
4b7ba0e1e9 SRT: Use thread-safe log for multiple-threading SRT module. (#2474) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* optimize srt log system

* update conf

* update srt hpp

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-07-21 10:23:25 +08:00
winlin
4ca433d3f8 Refine push script 2021-07-19 07:51:35 +08:00
winlin
6c40419de7 Fix configure bug 2021-07-19 07:49:57 +08:00
winlin
beea3216fe Squash: Refine IDE 2021-07-17 19:50:35 +08:00
winlin
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +08:00
winlin
12ba584ea3 Fix build failed 2021-07-09 09:00:35 +08:00
winlin
8f91a90f28 Squash: Fix padding packets for RTMP2RTC 2021-07-08 14:37:18 +08:00
Winlin
c8a1e0f3da
Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464) 
* Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8

* Update README.md

* Update README.md

* Refine format for AUTHORS.md
 2021-07-08 14:30:47 +08:00
Haibo Chen
7eee9aa598
Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461) 
* Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy

* make clear for magic number

make clear for magic number

* Update srs_app_rtc_source.cpp
 2021-07-08 14:23:53 +08:00
winlin
5a7a742f36 Squash: Update README 2021-07-06 11:37:31 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
winlin
db3e11152e Move AUTHORS.txt to trunk for docker. 5.0.7 2021-07-01 06:30:24 +08:00
Haibo Chen
d32d8c0da6
update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:22:16 +08:00
winlin
9f5d011687 Squash: Fix build fail for arm/aarch64 2021-06-30 10:28:23 +08:00
winlin
75530efbc4 Squash: Merge #2448, #2440 2021-06-30 07:32:28 +08:00
Alex.CR
346cc96d7a
SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:14:56 +08:00
winlin
0391e71682 Squash: Merge SRS4 2021-06-28 08:02:49 +08:00
Xiaoniu
f986b5956b
check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:51:57 +08:00
winlin
d02ba80db1 Squash: Fix bug for building FFmpeg 2021-06-28 07:51:02 +08:00
winlin
5ee20613ca Squash: Support query lastest available version. 5.0.6 2021-06-28 07:33:24 +08:00
Xiaoniu
d987e194ff
fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438) 2021-06-28 07:25:25 +08:00
winlin
ce47d5cc28 Squash: Update README 2021-06-24 22:11:19 +08:00
Alex.CR
67ac720b92
srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-24 22:03:18 +08:00
winlin
a594678e3d Squash #1685, #1282, #1547: Support ARM platform. 5.0.5 2021-06-22 07:49:48 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +08:00
winlin
f75ef2f808 Build: Support --shared-ffmpeg 2021-06-01 15:39:37 +08:00
winlin
785d2fce08 Build: Support --shared-srt 2021-06-01 12:29:22 +08:00
winlin
7e657ae654 Refine AUTHORS format 2021-06-01 09:36:28 +08:00
winlin
9e2c6d458e Fix build fail for SPDX 2021-05-31 13:46:19 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
johzzy
2aad8ad5bd
fix: fix typo about inactive. (#2380) 2021-05-28 22:20:04 +08:00
winlin
81bda41b31 SquashSRS4: Refine srs.sdk.js 2021-05-28 21:44:51 +08:00
louis.xia
cc52e5b27c
GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 2021-05-28 21:38:12 +08:00
cfw11
4d6f00e6bf
GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 2021-05-28 21:19:05 +08:00
winlin
a9f171144d SquashSRS4: Eliminate dead code 2021-05-24 08:17:59 +08:00
winlin
e50582f9c7 SquashSRS4: Refine SDK 2021-05-21 19:57:59 +08:00
winlin
a7ab78a588 SquashSRS4: Update SDK 2021-05-21 17:14:04 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
f043a7eb48 SquashSRS4: Allow RTC play before publish. 2021-05-19 21:06:17 +08:00
winlin
442cf615c0 ST: Simplify it, only Linux/Darwin, epoll/kqueue, single process. 5.0.2 
commit f4872e528cad07f8ea683cc8cb26e34111bad1b5
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 09:13:21 2021 +0800

    ST: For #2188: Remove sendmmsg from ST.

commit aaeb8919bd4a026268e0600398cb1e9ad477663f
Author: winlin <winlin@vip.126.com>
Date:   Thu Mar 11 08:09:54 2021 +0800

    ST: Refine utest script.

commit d1ac9da53060b6bfa82b5d041da4c2ad9bd6b90a
Author: winlin <winlin@vip.126.com>
Date:   Wed Mar 3 11:02:25 2021 +0800

    ST: Support fast utest and coverage

commit 8400115b83c022e33f59422dbf6d85ee46fb9edb
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 07:02:19 2021 +0800

    ST: Always use unserialized accept for linux or darwin

commit c3686f2bca80d2c139239b08975575b1bb981ffa
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 06:54:05 2021 +0800

    ST: Refine ARFLAGS by disable the verbose log

commit aaa5c4f863eba278c4ed2b29a46297fb01a4ed63
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:58:46 2021 +0800

    ST: Stack always grows from top to down.

commit dddd466e5c2e418c6f4896cd8bf701130052b3d9
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:51:31 2021 +0800

    ST: Ignore process fork, for single process only

commit 7906cb5f6e78c916cb8b8d9522275bfc086bb6a3
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:50:59 2021 +0800

    ST: Fix build warnings

commit d94921b84a3b6cf88ace2c766cc2bfedb9c0602e
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:27:45 2021 +0800

    ST: Remove select and poll support, only epoll and kqueue

commit 76d202514615f78d1a8f2b15778f3dac5abf4abb
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:10:47 2021 +0800

    ST: Remove multiple OS support, except Linux and Darwin.

commit 13c4ba345c61170e86dde486a174378ca235f442
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 06:59:35 2021 +0800

    ST: Remove __ia64__ CPU support

commit 46c06e4a11879cfeb828382e44f11287782ce4b5
Author: winlin <winlin@vip.126.com>
Date:   Wed Feb 24 11:37:27 2021 +0800

    ST: Remove unused files for ST
 2021-05-19 18:25:49 +08:00
winlin
34aa11b72a SquashSRS4: Update doc 2021-05-18 11:47:50 +08:00
xialixin
2e14d80aa4 SquashSRS4: Refine GB28181 2021-05-18 09:11:57 +08:00
winlin
e3bca883e1 SuqashSRS4: Build SRT native 2021-05-16 16:14:00 +08:00
winlin
a1d7fe46c1 SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket. 2021-05-15 08:53:54 +08:00
winlin
6a980683f7 SquashSRS4: Remove object cache and stat api 2021-05-14 18:17:42 +08:00
winlin
f711eb79ed SquashSRS4: Refine stat id. Fix SRT build bug 2021-05-14 08:26:07 +08:00
winlin
47f3f4da5c SquashSRS4: fix bugs 2021-05-12 21:50:57 +08:00
winlin
3939844301 SquashSRS4: Fix bugs 2021-05-11 19:12:15 +08:00
winlin
eb339432c4 SquashSRS4: Update benchmark data. 2021-05-10 18:09:59 +08:00
winlin
8895d36746 SquashSRS4: Refine shared fast timer 2021-05-08 17:44:15 +08:00
winlin
3256c7c2fa SquashSRS4: Refine the init of global objects 2021-05-08 11:51:54 +08:00
winlin
276bd2223e SquashSRS4: Support circuit breaker 2021-05-08 10:04:44 +08:00
winlin
fd6c653d3c SquashSRS4: Refine performance for FastTimer 2021-05-07 11:25:37 +08:00
winlin
f995bf7ca8 SquashSRS4: Transform config for nack/twcc. 2021-05-06 17:39:10 +08:00
winlin
f41c0b42b1 SquashSRS4: Fix config bug for nack and twcc. 2021-05-06 13:50:28 +08:00
winlin
becbe45bcd SquashSRS4: Add demo for RTC 2021-05-05 13:26:25 +08:00
winlin
206d95879f SquashSRS4: Add one to one RTC demo. 2021-05-02 21:46:41 +08:00
winlin
74bb47c13f SquashSRS4: Support RTC2RTMP. 2021-05-01 22:15:57 +08:00
winlin
0b62216999 SquashSRS4: Support av1 for Chrome M90 enabled it. 2021-04-30 08:13:38 +08:00
winlin
b4b79179a7 SuqashSRS4: Update players 2021-04-28 15:52:28 +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
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
d4a8a72388 SquashSRS4: Add console. Disable cherrypy by default. 2021-04-24 19:45: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
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
stone
3eb3cb9b51 For #2275, fix bug for transcode engine config param. 2021-04-09 07:22:15 +08:00
winlin
323306149d SquashSRS4: Eliminate the dup code 2021-04-06 11:22:12 +08:00
winlin
55426c6331 SquashSRS4: Fix RTC connection dispose bug 2021-04-06 10:51:42 +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
fcf72b48f9 SquashSRS4: Fix republish bug 2021-04-04 19:05:44 +08:00
winlin
52644f50c9 SquashSRS4: Fix republish bug 2021-04-04 18:50:59 +08:00
winlin
d80ba9d284 SquashSRS4: Fix memory leak 2021-04-01 17:35:40 +08:00
winlin
fa2fec3247 SquashSRS4: Refine payload NALU type parser 2021-04-01 14:48:41 +08:00
winlin
0cc3063703 SquashSRS4: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:55:03 +08:00
winlin
45b83bd22e SquashSRS4: Update comments and performance data 2021-03-31 18:25:12 +08:00
winlin
4692e8b8ad SquashSRS4: Support WebRTC re-publish stream. 2021-03-26 14:59:25 +08:00
winlin
aab54b2cf4 SquashSRS4: Refine RTC extension ID parsing 2021-03-24 19:00:42 +08:00
winlin
ff268dca23 SquashSRS4: Eliminate dead code, we never offer 2021-03-24 15:27:07 +08:00
winlin
ecd4527342 SquashSRS4: Use fast parse TWCCID, ignore in packet parsing 2021-03-24 14:17:52 +08:00
winlin
b7b474deba SquashSRS4: Update srs-bench. 2021-03-24 11:05:25 +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
4f1aa924e6 SquashSRS4: Add security scan. Feed TWCC before drop PT. 2021-03-11 16:55:05 +08:00
winlin
e74810230a SquashSRS4: Regine DTLS and add regression tests. 4.0.84 2021-03-10 08:29:40 +08:00
winlin
dc93836489 SquashSRS4: Refine DTLS init, use specified API by role 2021-03-09 12:01:23 +08:00
winlin
de65a331f1 SquashSRS4: Fix DTLS config bug, dup Alert bug. 4.0.83 2021-03-08 12:39:25 +08:00
winlin
fe1b427462 Update 2021-03-06 10:46:07 +08:00
winlin
c3f057e4d3 Squash SRS4: Update README for docker 2021-03-05 10:04:18 +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
817c704db7 SquashSRS4: Support fast local coverage with module 2021-03-04 17:13:24 +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