1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

6657 commits

Author SHA1 Message Date
winlin
cfbbe3044f HTTP: Skip body and left message by upgrade. v5.0.73 2022-10-05 20:49:50 +08:00
winlin
d4ce877407 Kernel: Refine lazy sweep resource. 2022-10-04 21:07:49 +08:00
mapengfei53
eb04f92176
Config: Support overwrote by environment variables. (#3197)
* Support overwrite by environment virable.

* modify duplicated code

* Config: Add stat for envrionment config.

* Config: Fix utest fail.

Co-authored-by: pengfei.ma <pengfei.ma@ctechm.com>
Co-authored-by: winlin <winlin@vip.126.com>
2022-10-03 13:00:12 +08:00
winlin
dc20d5ddbc ST: Support set context id while thread running. v5.0.72 2022-10-02 10:05:01 +08:00
chundonglinlin
9525511032
Exporter: Listen at port 9972 for Prometheus exporter. (#3195) 2022-10-01 07:35:54 +08:00
winlin
4ad4dd0975 RTC: Refine SDP to support GB28181 SSRC spec. v5.0.71 2022-09-30 19:36:20 +08:00
winlin
d32bd72527 Micro changes and fix utest fail. 2022-09-30 19:32:22 +08:00
winlin
1e6143e2eb GB28181: Refine HTTP parser to support SIP. v5.0.70 2022-09-30 19:21:31 +08:00
winlin
dae46a59ae Fix utest failed. 2022-09-30 19:15:02 +08:00
winlin
927dd473eb Kernel: Support lazy sweeping simple GC. v5.0.69 2022-09-30 18:33:29 +08:00
winlin
4b7d9587f4 HTTP: Support HTTP header in creating order. v5.0.68 2022-09-30 18:22:25 +08:00
winlin
d65c699829 Micro changes and refines. 2022-09-30 18:11:59 +08:00
winlin
378bffa34f Micro changes and refines. 2022-09-30 17:57:48 +08:00
winlin
173c683566 GB28181: Refine SRS listeners without wrapper. 2022-09-30 12:38:02 +08:00
winlin
b452144fb7 GB28181: Remove unused RTSP protocol stack. 2022-09-30 12:35:10 +08:00
winlin
912cd6a59c Merge branch '4.0release' into develop 2022-09-28 17:47:51 +08:00
winlin
8bd8c1146d WebRTC: Eliminate unused debugging log. 2022-09-28 17:46:50 +08:00
winlin
5f8da02ee7 API: Refine stat and config for prometheus exporter. 2022-09-28 16:07:26 +08:00
chundonglinlin
981cab40d3
API: support metrics for prometheus.(#2899) (#3189)
* API: support metrics for prometheus.

* Metrics: optimize metrics statistics info.

* Refine: remove redundant code.

* Refine: fix metrics srs_streams param.

* Metrics: add major param.

* Metrics: refine params and metric comments.

* For #2899: API: Support exporter for Prometheus. v5.0.67

Co-authored-by: winlin <winlin@vip.126.com>
2022-09-27 15:39:26 +08:00
winlin
e31f3b0e64 For #3167: WebRTC: Refine sequence jitter algorithm. v5.0.66 2022-09-27 14:54:22 +08:00
winlin
0c6d30861b Merge branch '4.0release' into develop 2022-09-27 14:53:23 +08:00
winlin
386b92e9ab For #3167: WebRTC: Refine sequence jitter algorithm. v4.0.266 2022-09-27 14:53:05 +08:00
winlin
ccd9eee2c9 For #3187: Fix build warning for unused variable. 2022-09-27 08:56:53 +08:00
john
62cd2fba85
SRT: do not ignore AUD nalus (#3187) 2022-09-26 22:05:13 +08:00
john
b328142140
Printf warn log when SRT audio duration too large (#3186)
* SRT: print warning log when audio duration too large

* Fix #3164: SRT: Choppy when audio ts gap is too large. v5.0.65

Co-authored-by: winlin <winlin@vip.126.com>
2022-09-22 20:37:22 +08:00
hondaxiao
4acb246c57 Fix #3181: SRT & WebRTC: Use SrsRawH264Stream to mux SPS/PPS. 2022-09-22 14:55:55 +08:00
winlin
f974c7c8b0 Fix #3183: Fix build fail for HDS. 2022-09-21 20:07:48 +08:00
winlin
d4898bec3c APM: Check endpoint port and team. 2022-09-21 20:06:33 +08:00
winlin
6f7b242ce2 APM: Extract research to projects. 2022-09-19 13:30:22 +08:00
winlin
b95734fb09 STAT: Update statistic for RISCV. 2022-09-19 10:55:50 +08:00
winlin
e63c02e928 APM: Update statistic for APM. 2022-09-16 21:04:43 +08:00
winlin
3e2f8622f8 APM: Support distributed tracing by Tencent Cloud APM. v5.0.63 2022-09-16 18:54:28 +08:00
winlin
4d0a4faa9d For #3179: WebRTC: Make sure the same m-lines order for offer and answer. v5.0.63 2022-09-16 08:09:30 +08:00
winlin
1b25ef9028 Merge branch '4.0release' into develop 2022-09-16 08:05:32 +08:00
winlin
686f57799e Fix #3179: WebRTC: Make sure the same m-lines order for offer and answer. v4.0.265 2022-09-16 08:02:12 +08:00
winlin
b2ad3bcdc8 WebRTC: Print offer if negotiate failed. 2022-09-11 21:57:59 +08:00
winlin
98ba8ae541 For #3174: WebRTC: Support Unity to publish or play stream. v5.0.62 2022-09-10 21:27:33 +08:00
winlin
6d18093e16 Merge branch '4.0release' into develop 2022-09-10 21:25:38 +08:00
winlin
aea2bfbaf9 For #3174: WebRTC: Support Unity to publish or play stream. v4.0.264 2022-09-09 16:34:45 +08:00
winlin
8ac8ae1c2e Fix #3093: WebRTC: Error when SDP not matched. 2022-09-09 16:19:47 +08:00
winlin
1c0236aa0d Fix #3093: WebRTC: Ignore unknown fmtp for h.264. v4.0.263 2022-09-09 16:17:01 +08:00
faicker
ef3347e37e
WebRTC: Fix missing type in track desc when backup H.264 payload type is chosen.
Signed-off-by: faicker <faicker.mo@gmail.com>

Signed-off-by: faicker <faicker.mo@gmail.com>
2022-09-09 14:27:24 +08:00
winlin
3eb046612b Fix #3170: WebRTC: Support WHIP(WebRTC-HTTP ingestion protocol). v5.0.61 2022-09-06 18:48:46 +08:00
winlin
e47c3c410c Merge branch '4.0release' into develop 2022-09-06 18:47:22 +08:00
winlin
15610ca488 Fix #3170: WebRTC: Support WHIP(WebRTC-HTTP ingestion protocol). v4.0.262 2022-09-06 18:46:47 +08:00
winlin
297a104fef Update state-threads to v1.9.4. 2022-09-06 09:22:32 +08:00
winlin
0410915ddd Update features for SRS 5.0 2022-09-06 09:04:44 +08:00
winlin
2144ff8c40 For #2852: WebRTC: Support only one TCP connected candidate. 2022-09-05 08:51:24 +08:00
Li Peng
efa0851476 WebRTC: Refine code and destroy session when tcp close. 2022-09-04 22:57:47 +08:00
Li Peng
07339e1417 WebRTC: Support TCP network. 2022-09-04 20:46:39 +08:00
winlin
625069af7f WebRTC: Extract SrsRtcNetwork layer for UDP/TCP. 2022-09-04 20:14:09 +08:00
winlin
770d959148 WebRTC: Support config, listener and SDP for TCP transport. 2022-09-04 20:13:33 +08:00
winlin
424713a31d Merge branch '4.0release' into develop 2022-09-03 22:12:46 +08:00
winlin
e0c8c199d5 Fix HTTP url parsing bug. v4.0.261 2022-09-03 22:11:00 +08:00
winlin
79358673ef Merge branch '4.0release' into develop 2022-09-03 18:13:11 +08:00
winlin
34196ea7f7 Fix #3167: WebRTC: Play stucked when republish. v4.0.260 2022-09-03 17:14:32 +08:00
winlin
38c3d9f1a7 Config: Refine config file, nothing changed. 2022-09-02 22:21:52 +08:00
winlin
77e1f81f91 For #1405: Fix utest build failed, for parsing SPS/PPS. 2022-09-02 11:37:05 +08:00
winlin
84c96076a9 Merge branch '4.0release' into develop 2022-09-02 10:57:56 +08:00
winlin
4a225c5640 For #307: WebRTC: Support use domain name as CANDIDATE. v4.0.259 2022-09-02 10:52:30 +08:00
winlin
6988e60ad6 Fix #1405: Restore the stream when parsing failed. v5.0.59 2022-09-01 21:45:19 +08:00
chundonglinlin
ef04d411c0 Main: remove extra space and refine code. (#3127) 2022-09-01 19:45:09 +08:00
mingo-wu
232fbfa4c3
Update srs_core_performance.hpp (#3160)
In included file: main file cannot be included recursively when building a preamble
    clang(pp_including_mainfile_in_preamble)
    srs_core.hpp(43, 10): Error occurred here
2022-09-01 19:39:34 +08:00
winlin
783aea7ac3 Fix #1405: Support guessing IBMF first. v5.0.58 2022-09-01 19:28:51 +08:00
winlin
e027d28c4d HLS: Support disable hls_ts_ctx. 2022-09-01 16:17:47 +08:00
winlin
eb2056db25 ST: Define and use a new jmpbuf. v5.0.57 2022-09-01 11:51:04 +08:00
winlin
7d47017a00 Ingest: Still use -re for stream to ingest HLS better. 2022-08-31 13:30:13 +08:00
winlin
dd37a041b9 Fix URL parsing bug for __defaultVhost__. v5.0.55 2022-08-31 11:46:09 +08:00
winlin
b009860b11 UTest: Split utest to smaller file. 2022-08-31 09:18:47 +08:00
winlin
6a108fab6d Fix #2837: Callback: Support stream_url and stream_id. v5.0.55 2022-08-31 08:00:05 +08:00
winlin
9c6774b644 STAT: Refine tcUrl for SRT/RTC. v5.0.54 2022-08-30 21:28:06 +08:00
winlin
d877c0b76f Tools: Update console and httpx. 2022-08-30 19:25:42 +08:00
winlin
2c259bd95b Refactor: Extract SrsNetworkKbps from SrsKbps. v5.0.53 2022-08-30 13:41:27 +08:00
winlin
937605b18c Remove bandwidth check because falsh is disabled. v5.0.52 2022-08-30 10:45:40 +08:00
winlin
1630918b0f Refactor: Use compositor for ISrsKbpsDelta. v5.0.51 2022-08-30 09:26:51 +08:00
winlin
29ae29c693 Merge branch '4.0release' into develop 2022-08-29 19:24:17 +08:00
winlin
88ba3d25f8 Copy libxml2-dev for FFmpeg. v4.0.258 2022-08-29 19:23:02 +08:00
winlin
db91102e67 STAT: Extract an ephemeral delta object. 2022-08-29 13:44:10 +08:00
winlin
4fe90d4885 RTC: Stat the WebRTC clients bandwidth. v5.0.50 2022-08-29 13:21:43 +08:00
winlin
d7c2d5ab01 HLS: Stat the HLS streaming clients bandwidth. v5.0.49 2022-08-29 12:09:26 +08:00
winlin
c1df280211 HLS: Rebuild m3u8 to make ts with id, for stat. 2022-08-29 09:08:46 +08:00
winlin
bc569d91a0 STAT: Ignore stat for API, only for HTTP streaming clients. 2022-08-29 07:54:48 +08:00
winlin
28154e820c URL: Use SrsHttpUri to parse URL and query. 2022-08-28 20:24:07 +08:00
winlin
9bd3c51818 RTMP: Refine code for gussing stream by app. 2022-08-28 17:03:34 +08:00
chundonglinlin
96add9be3d RTMP: Support publish with Server without StreamKey using OBS.(#3018) 2022-08-28 16:19:11 +08:00
winlin
f492d8b03a HTTP: Support API with body, for RTC. 2022-08-28 16:14:05 +08:00
winlin
457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 2022-08-28 13:11:31 +08:00
winlin
6508a082e9 Fix #3108: STAT: Update stat for SRT. v5.0.46 2022-08-27 20:40:34 +08:00
winlin
4e3ea99ccd STAT: Refine stat for global server. 2022-08-27 20:40:34 +08:00
winlin
da24de5ecb STAT: Update stat for SRT connection. 2022-08-27 20:40:34 +08:00
winlin
101e4fa3b9 STAT: Add hls-play, flv-play, srt-play and srt-publish. 2022-08-27 20:40:33 +08:00
winlin
2944fe430f STAT: Only stat media streaming clients. 2022-08-27 20:39:09 +08:00
winlin
ccf83a3f68 HLS: Extract a HLS streaming to serve pseudo session. 2022-08-27 20:37:27 +08:00
winlin
d39995cc31 HLS: Enable hls_ctx by default. 2022-08-27 19:41:07 +08:00
ChenHaibo
ca7b5a1c4e HLS: Add utest for HLS streaming. 2022-08-27 19:41:07 +08:00
ChenHaibo
2c569f568c HLS: Support config hls_ctx to disable HLS streaming. 2022-08-27 19:41:07 +08:00
winlin
6dc86b8a2e CLS: Refine logging to global object. 2022-08-27 18:56:53 +08:00
winlin
8bc7342c3c Protobuf: Extract protobuf encoder. 2022-08-26 18:46:26 +08:00
winlin
a54d371549 Log: Stat the number of logs. v5.0.45 2022-08-26 12:41:19 +08:00
winlin
5757950860 Merge 4.0release 2022-08-26 11:42:29 +08:00
winlin
cdccdf70b8 Hooks: Remove on_connect and on_close from doc. 2022-08-26 10:39:00 +08:00
winlin
5225a07727 Merge 4.0release 2022-08-25 07:31:53 +08:00
winlin
d5293e34e1 Refine release doc and wiki link. 2022-08-25 07:27:00 +08:00
winlin
18d25eacfb Merge 4.0release 2022-08-24 19:26:47 +08:00
winlin
95cd0e84eb Log: Support write log to tencentcloud CLS. v5.0.44 2022-08-24 15:51:23 +08:00
winlin
3da0b57121 Merge 4.0release. 2022-08-24 15:27:56 +08:00
winlin
9923c749d4 STAT: Support config server_id and generate one if empty. v4.0.257 2022-08-24 15:06:43 +08:00
winlin
8e6d207e56 For #2136: API: Cleanup no active streams for statistics. v4.0.256 2022-08-24 12:47:16 +08:00
winlin
41155b7789 STAT: Add kbps for client. 2022-08-24 12:42:21 +08:00
winlin
2438bc99e0 Config: Refine ulimit check. 2022-08-22 19:46:47 +08:00
winlin
9b010ac158 Fix #3114: Origin cluster config bug. v5.0.43 2022-08-22 11:43:44 +08:00
winlin
e9d6601f7d For #2136: API: Cleanup no active streams for statistics. v5.0.42 2022-08-19 19:45:19 +08:00
winlin
4edf33326d Merge branch '4.0release' into develop 2022-08-17 11:10:30 +08:00
winlin
f9941a325b RTMP URL supports domain in stream parameters. v4.0.255 2022-08-17 11:08:32 +08:00
winlin
4126c42118 Speedup test by refine the task dependencies. 2022-08-15 07:57:42 +08:00
winlin
2d036c3fd6 Fix #2747: Support Apple Silicon M1(aarch64). v5.0.41 2022-08-14 22:46:54 +08:00
ChenGH
f2fa289fe8 AppleM1: Support Apple Silicon M1(aarch64). 2022-08-14 22:46:52 +08:00
winlin
b787656eea AppleM1: Update openssl to v1.1.1l 2022-08-14 22:46:51 +08:00
winlin
1fe12b8e8c Speedup test by using cache image. 2022-08-14 22:41:29 +08:00
winlin
d478d7b2ca Add test for crossbuild on Ubuntu20. 2022-08-12 20:12:13 +08:00
winlin
a842c6c32a Support crossbuild for hisiv500. v5.0.40 2022-08-12 17:41:15 +08:00
winlin
d885d574e4 Add files for reuse port for origins. 2022-08-12 17:40:57 +08:00
winlin
b73847de7d Refine configure for crossbuild. 2022-08-11 16:55:24 +08:00
winlin
7f7406ec77 Build: Detect OS by packager. v5.0.39 2022-08-10 23:20:14 +08:00
winlin
0227e44ef0 Fix warning for comparing int with sizeof. 2022-08-10 19:34:23 +08:00
winlin
26284e368f Merge branch '4.0release' into develop 2022-08-10 10:23:25 +08:00
winlin
febd45d514 Fix server id generator bug. v4.0.254 2022-08-10 10:20:47 +08:00
winlin
262b79f747 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.38 2022-08-10 08:35:39 +08:00
winlin
a71eddd56a Fix the snprintf size issue. 2022-08-10 08:32:02 +08:00
winlin
1ab584b2ae Loongson/mips64: Support FFmpeg and openssl. 2022-08-09 22:44:10 +08:00
winlin
0a025fc4b6 Remove unneccessary depends headers. 2022-08-09 18:32:01 +08:00
winlin
25c004e947 Opus: Add TODO because the audio might be corrupted, if use FFmpeg native opus. 2022-08-09 13:35:57 +08:00
winlin
f9e8065b51 Fix build warnings. 2022-08-09 08:27:08 +08:00
winlin
f44b694a17 For test docker image, use cache eventhough the kernel changed. v5.0.37 2022-08-09 08:27:01 +08:00
winlin
14832b66eb Build: Disable openssl ASM for loongson. v5.0.35 2022-08-08 20:33:27 +08:00
winlin
5ae495ab95 For #1229: Check the return value of vsnprintf. 2022-08-08 08:31:57 +08:00
winlin
079ac107f0 For loongarch, fix openssl build bug, always use linux64-mips64 as required. 2022-08-06 17:26:55 +08:00
winlin
1589858cb0 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.34 2022-08-06 13:03:45 +08:00
winlin
aba6667357 Refine build script. 2022-08-05 18:32:05 +08:00
winlin
2e4fe0aea9 Refine options, extract crossbuild from toolchain. 2022-08-05 18:24:46 +08:00
winlin
f7280399d4 Merge 4.0release, migrate to new website. 2022-07-31 18:34:18 +08:00
winlin
7b23a42139 Migrate license to new website. 2022-07-31 17:12:14 +08:00
winlin
d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 2022-07-31 16:26:35 +08:00
winlin
6c295952f6 RTMP: Fix unused variable warning. 2022-07-20 21:53:57 +08:00
Steven Liu
08c4b25030 RISCV: Patch ST and libsrtp. #3115 2022-07-20 21:53:39 +08:00
Steven Liu
8a6fa30992 app/srs_app_rtmp_conn: move err result to RTC MACRO to fix compiling warning 2022-07-18 13:50:10 +08:00
Steven Liu
ad2d7c3779 srtp-2-fit/config.guess: add riscv support 2022-07-18 13:46:59 +08:00
Steven Liu
ec7123d54c Support riscv, starfive CPU.
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2022-07-16 16:52:24 +08:00
winlin
755a2a74ed Merge branch '4.0release' into develop 2022-07-02 14:18:49 +08:00
winlin
7d0d2af817 UTEST: Refine coverage script. 2022-07-02 14:04:26 +08:00
winlin
cd85a96255 Update SRS image for r.ossrs.net 2022-06-30 07:43:13 +08:00
winlin
0badae4797 Support thread pool and update ossrs.net. v5.0.33 2022-06-29 20:48:08 +08:00
winlin
57be5188c3 Merge branch '4.0release' into develop 2022-06-29 20:37:20 +08:00
winlin
a2cfec2dcc Update SRS image for r.ossrs.net 2022-06-29 20:36:35 +08:00
winlin
b2e083b00d Support multiple threads by thread pool. v5.0.32 2022-06-29 20:15:44 +08:00
winlin
7c6bd0ce5c Refine async DVR manager. 2022-06-29 19:51:10 +08:00
winlin
b4774d02cc Add log to file config. 2022-06-29 19:50:57 +08:00
winlin
e05535267b Disable reload for log config. 2022-06-29 19:29:50 +08:00
winlin
cb6a4d0143 Thread: Refine SrsThreadMutex and SrsThreadLocker. 2022-06-28 20:50:25 +08:00
winlin
339d3b31cc ST: Support thread-local for multiple threads.
1. All statick and global variables is thread-local.
2. Call st_init() to init st for each thread.
3. Notice that ST is isolate for threads.
2022-06-28 20:49:53 +08:00
winlin
d117145b95 Update date from 2021 to 2022. 2022-06-20 19:22:25 +08:00
winlin
f92fb9653b Speedup the test from srs-cache image. 2022-06-17 14:18:27 +08:00
winlin
c722eba48f SRT: Support Coroutine Native SRT over ST. (#3010). (1af30de). v5.0.30 2022-06-17 08:54:00 +08:00
winlin
82efa564e4 Merge branch '4.0release' into develop 2022-06-17 07:13:37 +08:00
winlin
d9352ec43b Disable all asm for FFmpeg, to compatible with ARM CPU. 2022-06-15 21:13:56 +08:00
winlin
f568e4f91d Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v5.0.29 2022-06-15 19:35:24 +08:00
winlin
d525d27e64 Merge from 4.0release 2022-06-15 19:21:13 +08:00
winlin
1f0ea3fdf5 Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252 2022-06-15 09:58:05 +08:00
winlin
93fed3874b SRT: Rebase develop. 2022-06-14 20:17:00 +08:00
winlin
0957cdb944 SRT: Refine the lock for log. 2022-06-14 20:05:11 +08:00
hondaxiao
910b5945af SRT: add srt log handle, srs log supoort multithread 2022-06-14 20:05:11 +08:00
hondaxiao
d03c6793b8 SRT: add srs_core_lock, support scope lock guard 2022-06-14 20:05:11 +08:00
hondaxiao
fd74b2f6e1 SRT: readd mix_correct, compatible old srt conf 2022-06-14 20:05:11 +08:00
hondaxiao
c037f920b2 SRT: move accept log into srt conn cycle 2022-06-14 20:05:11 +08:00
winlin
e09daa2d4b SRT: Change bridges to bridge. 2022-06-14 20:05:09 +08:00
winlin
077d93c7b6 SRT: Refine code, remove SrsSrtListenerType 2022-06-14 20:02:25 +08:00
winlin
9efb6de0b4 SRT: Merge develop, fix build fail. 2022-06-14 20:02:25 +08:00
winlin
d2149a8b79 SRT: Add todo for coroutine yield. 2022-06-14 20:02:25 +08:00
winlin
8437370c1e SRT: Refine packet error handler. 2022-06-14 20:02:25 +08:00
winlin
9a0db5a14f SRT: Undo extract of fetch_or_create_source and change mode_ to local. 2022-06-14 20:02:25 +08:00
winlin
6009395c10 SRT: Hide srt implements from API. 2022-06-14 20:02:25 +08:00
winlin
d39ec3cf45 SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT 2022-06-14 20:02:25 +08:00
winlin
94cc50d146 SRT: Wrap SRT stat object. 2022-06-14 20:02:25 +08:00
winlin
78b778fb93 SRT: Rename srs_service_st_srt to srs_protocol_srt 2022-06-14 20:02:25 +08:00
hondaxiao
fbc6eebe18 SRT: remove rtmp_to_srt 2022-06-14 20:02:25 +08:00
hondaxiao
43d98d0b1c SRT: remove mix_correct 2022-06-14 20:02:24 +08:00
hondaxiao
a5ac7cfe37 SRT: use srs code style in function defination 2022-06-14 20:02:24 +08:00
hondaxiao
59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 2022-06-14 20:02:24 +08:00
hondaxiao
dd8ccfe5d8 SRT: refine int to srs_utime_t in srt timeout config 2022-06-14 20:02:24 +08:00
hondaxiao
26498a00fe SRT: Tsbpdmode default on 2022-06-14 20:02:24 +08:00
hondaxiao
a929f79d2c SRT: Add SRT option annotation in full.conf 2022-06-14 20:02:24 +08:00
winlin
492e3a888c SRT: Refine the SRT socket code. 2022-06-14 20:02:24 +08:00
winlin
6c94e91792 SRT: Refine get_srt_poller to poller. 2022-06-14 20:02:24 +08:00
winlin
21899c5998 SRT: Initialize SRT eventloop in adapter. 2022-06-14 20:02:24 +08:00
winlin
4899be9c34 SRT: Refine the schedule resolution to 10ms if idle. 2022-06-14 20:02:24 +08:00
winlin
b507a080b2 SRT: Refine parse SRT listen ip and port. 2022-06-14 20:02:24 +08:00
winlin
3616c9976a SRT: Add srt vhost section to full.conf. 2022-06-14 20:02:24 +08:00
winlin
ef553b571c SRT: Update full.conf for review. 2022-06-14 20:02:24 +08:00
winlin
bda0268a37 SRT: Update full.conf for new configs. 2022-06-14 20:02:24 +08:00
winlin
d88fd12c26 SRT: Fix cmake bug, quit if error. 2022-06-14 20:02:24 +08:00
hondaxiao
b566182f0b SRT: fix utest failed 2022-06-14 20:02:24 +08:00
hondaxiao
e13d16439e SRT: support rtmp to srt 2022-06-14 20:02:22 +08:00
hondaxiao
7da792f19d SRT: check srt_connect return value 2022-06-14 19:59:13 +08:00
winlin
bb91297071 SRT: Eliminate unused files for SRT. 2022-06-14 19:59:12 +08:00
winlin
cf4fbb887b SRT: Support debugging with CLion. 2022-06-14 19:58:46 +08:00
hondaxiao
94fa0ff7bd Refine SRT code, with StateThread adpater 2022-06-14 19:58:42 +08:00
winlin
3ed4aed824 Fix build failed. 2022-06-09 20:46:20 +08:00
winlin
fa78cf3354 Prefix with srs_protocol in protocol directory. 2022-06-09 20:26:58 +08:00
winlin
665ad564fb Rename service to protocol files. 2022-06-09 19:59:51 +08:00
winlin
f1840b87e5 Fix typo, change bridger to bridge. 2022-06-09 19:35:07 +08:00
winlin
0304e78cf1 Support SIGABRT to generate coredump. 2022-05-25 12:45:58 +08:00
winlin
f469753b07 RTMP: Add conf for listen at IPv6. 2022-05-17 21:37:59 +08:00
winlin
310514ea94 Update players and console. 2022-05-16 22:44:21 +08:00
winlin
e2cc356c31 Update 3rdparty. 2022-05-16 22:37:22 +08:00
winlin
ec5bdc7dfa Refine the signaling dynamic images. 2022-05-16 22:24:27 +08:00
winlin
7e0beb11d8 Conf: Refine comments. 2022-05-10 22:17:55 +08:00
winlin
c574ab6465 Live: Refine edge cluster to support FLV. 2022-05-10 22:16:32 +08:00
winlin
e8240d64be HTTP: Add configure for nginx proxy. 2022-04-24 09:24:04 +08:00
winlin
2b2379de12 RTC: Refine player sdk, reject with xhr. 2022-04-10 16:39:56 +08:00
winlin
b3baa888ee RTC: Refine player sdk, directly use raw HTTP. 2022-04-08 23:02:32 +08:00
winlin
16babd2b64 Merge branch '4.0release' into develop 2022-04-07 13:48:59 +08:00
winlin
1d503c770f Fix proc stat issue. 2022-04-07 13:48:19 +08:00
winlin
f87a959480 Support NGINX HLS Cluster. 2022-04-04 16:49:15 +08:00
winlin
4163dce18d Support NGINX HLS Cluster. v5.0.28 2022-04-04 13:45:49 +08:00
winlin
101d1ffbbf Support DigitalOcean Droplet SRS 1-Click. v5.0.27 2022-03-30 12:39:56 +08:00
mapengfei53
8dc5853f8c
Fix parse_file function did not handle err (#2928)
* Fix parse file function did not handle err

* Fix parse_file function did not handle err

* Fix error message

* Updated error information
2022-03-19 13:22:27 +08:00
winlin
9385f2b80b Merge branch '4.0release' into develop 2022-03-19 13:21:58 +08:00
winlin
76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 2022-03-19 12:06:07 +08:00
winlin
41e35155f7 SRT: Compatible with previous auth querystring. #2908 2022-03-19 09:04:51 +08:00
loveforever
210cdf04be
SRT: url supports multiple QueryStrings (#2908)
* SRT:  parse srt url to supports multiple QueryStrings.(#2893)

* SRT:  url supports multiple QueryStrings by  comma-separated key-value pairs with no nesting  (#2893)

* SRT:  url supports multiple QueryStrings by comma-separated key-value pairs with no nesting  (#2893)

* SRT: Add comments for url.

* Add utest for SRT URL parsing.

* Update README.

Co-authored-by: winlin <winlin@vip.126.com>
2022-03-19 08:24:06 +08:00
winlin
c225c3f745 Merge branch '4.0release' into develop 2022-03-18 12:03:52 +08:00
winlin
06cff31b24 Update script. 2022-03-18 12:02:49 +08:00
winlin
fd219aa074 Refine utest script. 2022-03-18 12:01:11 +08:00
Winlin
350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 2022-03-17 16:56:52 +08:00
winlin
c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 2022-03-17 08:42:44 +08:00
winlin
61f1531aa3 Merge branch '4.0release' into develop 2022-03-15 08:48:26 +08:00
ChenGH
ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:43:03 +08:00
ChenGH
70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966)
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:40:06 +08:00
winlin
636066124a SRT: Fix typo in libsrt build options. v5.0.26 2022-03-12 18:37:41 +08:00
everything411
d6ead6c0c5
SRT: Fix typo in libsrt build options (#2943)
the cmake option is ENABLE_APPS, so we should use --disable-apps or --enable-apps=0. this commit fixes the typo.
2022-03-12 18:34:30 +08:00
Haibo Chen
67ccd589c1
Security: Enable CIDR for allow/deny play/publish (#2914)
* protocol/utility: add srs_ipv4_to_num

* protocol/utility: add srs_ipv4_within_mask

* protocol/utility: add srs_get_cidr_mask and CIDR_VALUES static struct

* protocol/utility: add srs_get_cidr_ipv4

* app/security: support cidr ip ranges in allow/deny rules

* conf: update security example with cidr ranges

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* fix compile error on centos6

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
2022-03-11 12:24:35 +08:00
winlin
451b01011c Merge SRS 4.0 for bugfix. v5.0.25 2022-03-09 08:09:27 +08:00
winlin
9d3ae5c8ed Merge branch '4.0release' into develop 2022-03-09 08:06:56 +08:00
winlin
e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 2022-03-07 16:34:51 +08:00
winlin
107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 2022-03-07 15:53:55 +08:00
CommanderRoot
8a75e8a165
Replace deprecated String.prototype.substr() (#2948)
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() or substring() which work similarily but aren't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-03-07 08:02:27 +08:00
mapengfei53
84951cbc74
Update the demo config file for include directive (#2927)
* Update the demo config file for include directive

* update config file

* update config file
2022-03-05 17:43:20 +08:00
Matthew
526cd62075
Fix FD leak when exceed max connections limit. (#2925)
* fix fd leak

when tcp connection exceed max_connection, that connection will leak because of not closing the fd

* fix leak, code refine
2022-02-26 07:50:09 +08:00
winlin
4b838659e9 Merge 4.0release, update AUTHORS 2022-02-18 12:45:22 +08:00
winlin
e222f0da1b Add active developers 2022-02-16 13:16:18 +08:00