Commit Graph

652 Commits (5a420ece3bfc83934621a8477cdb953f7b59fee0)

Author SHA1 Message Date
winlin f87a959480 Support NGINX HLS Cluster. 3 years ago
winlin 4163dce18d Support NGINX HLS Cluster. v5.0.28 3 years ago
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>
3 years ago
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
3 years ago
chundonglinlin 03cf93fc2b
Forward: support config full rtmp url forward to other server (#2799)
* Forward: add backend config and demo server for dynamic create forwarder to other server.(#1342)

* Forward: if call forward backend failed, then return directly.

* Forward: add API description and change return value format.

* Forward: add backend conf file and wrapper function for backend service.

* Forward: add backend comment in full.conf and update forward.backend.conf.

* Forward: rename backend param and add comment tips.
3 years ago
winlin 32bb96a5c2 Squash: Fix bugs 3 years ago
winlin ba0b62fd37 For docker, always use the console for logging. v4.0.235 3 years ago
winlin 12ffddd363 Release v5.0.21 3 years ago
winlin dc43a11aed Enable rtmp2rtc and rtc2rtmp for docker.conf 3 years ago
winlin 93aa0eb5ba Squash: Fix bugs 3 years ago
winlin 8830d267f2 Refine conf for vm.conf 3 years ago
winlin 6a5bc27f9b Support configure with --config as default config file. v4.0.227 3 years ago
winlin 71a4b3c3f7 Add conf/lighthouse.conf for LightHouse. v4.0.222 3 years ago
winlin 4110fb14cb Squash: Fix bugs. v5.0.20 3 years ago
winlin fbb6d9464c Discover api server and ip as candidates. v4.0.218 3 years ago
winlin 013fa8ac6c Install test-on self-sign certificate. v4.0.217 3 years ago
winlin 7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 3 years ago
winlin 716e578a19 Squash: Fix bugs 3 years ago
winlin faf5fb0a83 Refine the config 3 years ago
winlin f05e67e1a6 Squash: Fix bugs 3 years ago
winlin 027715e4ea RTC: Update config 3 years ago
winlin e16830e989 Squash: Merge 4.0.201 3 years ago
winlin 1167f68165 FLV: Add realtime HTTP-FLV config 3 years ago
winlin 66435d583a Squash: Fix stat bug 3 years ago
winlin f3380d2ec0 Fix bug for CPU arch info 3 years ago
winlin e1f65478af Sqush: Refine config for origin cluster 3 years ago
lvndry e176401499 Cluster: Origin server shouldn't be it's own coworker. v4.0.186 (#1963) 3 years ago
winlin b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 3 years ago
winlin 71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 3 years ago
winlin fe9e43b6d4 RTC: Refine config for RTC 3 years ago
winlin f8b4121497 Test: Add Multiple Sequence test for RTMP 3 years ago
winlin 0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 3 years ago
winlin a81aa2edc5 Squash: Merge SRS 4.0 3 years ago
winlin 2fa5a0bee8 Fix #2304, Remove Push RTSP feature. v4.0.171 3 years ago
winlin df53c801b2 For #2653: Update config for HTTP RAW API removed. 3 years ago
winlin 55d8cb4b7b Default to log to console for docker. v4.0.168 3 years ago
winlin 1acb80b9c8 Enable WebRTC for srs.conf 3 years ago
winlin a19c0fa121 OpenWRT: Try to create dir for pidfile 3 years ago
winlin 8ea9783de7 OpenWRT: Disable mprotect of ST. 5.0.16 3 years ago
winlin 149ad80b5d Squash: Merge SRS 4.0 3 years ago
winlin 10fe04ac18 LIVE: Add conf/live.conf for RTMP/FLV/HLS 3 years ago
winlin 28e3a1ca69 Squash: Merge SRS 4.0 3 years ago
winlin 501b3833a1 RTMP: Remove bandwidth test 3 years ago
winlin 19c0a9eb4b Suqash: Merge 4.0 4 years ago
winlin 90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 4 years ago
winlin 85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 4 years ago
john ea8cff6163
RTC: Fix rtc to rtmp sync timestamp using sender report. (#2470)
* fix annotation spell failed

* RTC to RTMP using SenderReport to sync av timestamp

* update pion/webrtc versio from v3.0.4 -> v3.0.13, auto config sender/receiver report

* Add rtc push flv play regression test

* Add unit test of ntp and av sync time

* Take flag CXX to makefile of utest

* Add annotation about rtc unit test

* Fix compiler error in C++98

* Add FFmpeg log callback funciton.
4 years ago
winlin 24431d35ac Squash: Merge SRS4 4 years ago
matthew1838 452ca7e88f
add server_id into http_hooks (#2521)
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
4 years ago
winlin 301a8ceadb Squash: Merge SRS 4.0 4 years ago
Winlin 8c7ba05f9a
For #2371: Add regression test for SDP nack (#2487)
* explicitly enable nack, for firefox (#2373)

* For #2371: Add regression test for SDP nack

1. Refine API to change defaule decodes.
2. Add test for publish SDP nack.
3. Add test for play SDP nack.

Co-authored-by: Haibo Chen <495810242@qq.com>
4 years ago
winlin 97c627f9d4 Squash: Support CLion 4 years ago
winlin c209e547a8 [IDE] Support CLion and cmake to build and debug SRS. 4.0.141
1. Remove all except JetBrains clion by cmake
2. Add .run/srs.run.xml for debugging for CLion.
3. Auto configure SRS when load CMakeLists.txt
4 years ago
winlin 5ee20613ca Squash: Support query lastest available version. 5.0.6 4 years ago
winlin da763e43d5 Squash for #2424, query the latest available version. 4.0.132 4 years ago
winlin efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 4 years ago
winlin 68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 4 years ago
louis.xia 1c7c74b01a 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>
4 years ago
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>
4 years ago
cfw11 3e7536c493 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>
4 years ago
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>
4 years ago
winlin 34aa11b72a SquashSRS4: Update doc 4 years ago
winlin 0d14c4b073 System: Fail if use use full.conf 4 years ago
winlin e3bca883e1 SuqashSRS4: Build SRT native 4 years ago
hondaxiao 90f1b482ab SRT: Build SRT from source by SRS. 4.0.115 4 years ago
winlin 262f0fc8c8 SRT: Enable HTTP-FLV for SRT 4 years ago
winlin 9b6a1b16e1 RTC: Eliminate unused perf_stat 4 years ago
winlin 6a980683f7 SquashSRS4: Remove object cache and stat api 4 years ago
winlin f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 4 years ago
winlin 276bd2223e SquashSRS4: Support circuit breaker 4 years ago
winlin 92fc0af8f4 RTC: Support circuit breaker. 4.0.103 4 years ago
winlin 74bb47c13f SquashSRS4: Support RTC2RTMP. 4 years ago
winlin f7473c90bc For #2303: Add conf for RTC2RTMP 4 years ago
winlin 3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 4 years ago
winlin 659e173e15 RTC: Refine for writing doc. 4.0.92 4 years ago
winlin eba78149ad SquashSRS4: Change push-RTSP as deprecated feature. 4 years ago
winlin 5516d3751f Change push-RTSP as deprecated feature. 4 years ago
winlin 35431749c4 Live: Support follow client protocol for edge. 4 years ago
winlin 56b64689bf SquashSRS4: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 4 years ago
winlin 83c615aa8a SquashSRS3: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 4 years ago
winlin 3bb1b673c5 Merge SRS4, lots of features 4 years ago
winlin bb3bd1705e Refine the regression test tool, add missing files 4 years ago
winlin 5a66d15e85 Support regression test in CI. 4 years ago
winlin dd8f7ff09a Enable HTTP-FLV for conf/rtc.conf 4 years ago
winlin d4b8a57cf7 Enable Object Cache and Zero Copy Nack by default. 4.0.77 4 years ago
winlin f63441413d RTC: Support disable the NACK no-copy, enable copy by default 4 years ago
winlin 29b33e6303 RTC: Disable player perf stat, because it should be refined. 4 years ago
winlin 8d7a201742 RTC: Remove unused config 4 years ago
winlin 501104e728 Perf: Limit the size of object cache pool 4 years ago
winlin 3989f2d553 RTC: Refine the stat logs, limit the object cache pool 4 years ago
winlin 4d0863468a RTC: Cache the large buffer allocation 4 years ago
winlin 86f43d4f72 RTC: Support RTP packet cache manager 4 years ago
winlin c20d8fb617 RTC: Support disable the NACK no-copy, enable copy by default 4 years ago
winlin ab601ff386 RTC: Disable player perf stat, because it should be refined. 4 years ago
winlin 427e3e0d84 RTC: Remove unused config 4 years ago
winlin a29d6cba68 Perf: Limit the size of object cache pool 4 years ago
winlin 7b3b7381e2 RTC: Refine the stat logs, limit the object cache pool 4 years ago
winlin d5b210abc8 RTC: Cache the large buffer allocation 4 years ago
winlin 1833780655 RTC: Support RTP packet cache manager 4 years ago
xialixin@kanzhun.com fdaee20b81 For #2200, Enable RTC and FLV for GB28181 4 years ago