github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,644 Commits
14 Branches
107 Tags
374 MiB
6.0release
5.0release
develop
duiniuluantanqin-patch-1
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '75ddd8f5b6'
${ noResults }
Commit Graph

702 Commits (75ddd8f5b6c293b1b98bd027e0c3de9500a7d0c3)

Author SHA1 Message Date
Winlin 5a420ece3b
GB28181: Support GB28181-2016 protocol. v5.0.74 (#3201) 
01. Support GB config as StreamCaster.
02. Support disable GB by --gb28181=off.
03. Add utests for SIP examples.
04. Wireshark plugin to decode TCP/9000 as rtp.rfc4571
05. Support MPEGPS program stream codec.
06. Add utest for PS stream codec.
07. Decode MPEGPS packet stream.
08. Carry RTP and PS packet as helper in PS message.
09. Support recover from error mode.
10. Support process by a pack of PS/TS messages.
11. Add statistic for recovered and msgs dropped.
12. Recover from err position fastly.
13. Define state machine for GB session.
14. Bind context to GB session.
15. Re-invite when media disconnected.
16. Update GitHub actions with GB28181.
17. Support parse CANDIDATE by env or pip.
18. Support mux GB28181 to RTMP.
19. Support regression test by srs-bench.
 2 years ago
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>
 2 years ago
chundonglinlin 9525511032
Exporter: Listen at port 9972 for Prometheus exporter. (#3195) 2 years ago
winlin 173c683566 GB28181: Refine SRS listeners without wrapper. 2 years ago
winlin 5f8da02ee7 API: Refine stat and config for prometheus exporter. 2 years ago
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>
 2 years ago
winlin d4898bec3c APM: Check endpoint port and team. 2 years ago
winlin 3e2f8622f8 APM: Support distributed tracing by Tencent Cloud APM. v5.0.63 2 years ago
winlin 625069af7f WebRTC: Extract SrsRtcNetwork layer for UDP/TCP. 3 years ago
winlin 770d959148 WebRTC: Support config, listener and SDP for TCP transport. 3 years ago
winlin 38c3d9f1a7 Config: Refine config file, nothing changed. 3 years ago
winlin 84c96076a9 Merge branch '4.0release' into develop 3 years ago
winlin 4a225c5640 For #307: WebRTC: Support use domain name as CANDIDATE. v4.0.259 3 years ago
winlin 783aea7ac3 Fix #1405: Support guessing IBMF first. v5.0.58 3 years ago
winlin e027d28c4d HLS: Support disable hls_ts_ctx. 3 years ago
winlin 7d47017a00 Ingest: Still use -re for stream to ingest HLS better. 3 years ago
winlin 6a108fab6d Fix #2837: Callback: Support stream_url and stream_id. v5.0.55 3 years ago
winlin 9c6774b644 STAT: Refine tcUrl for SRT/RTC. v5.0.54 3 years ago
winlin 937605b18c Remove bandwidth check because falsh is disabled. v5.0.52 3 years ago
winlin d7c2d5ab01 HLS: Stat the HLS streaming clients bandwidth. v5.0.49 3 years ago
winlin f492d8b03a HTTP: Support API with body, for RTC. 3 years ago
winlin 457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 3 years ago
winlin ccf83a3f68 HLS: Extract a HLS streaming to serve pseudo session. 3 years ago
winlin d39995cc31 HLS: Enable hls_ctx by default. 3 years ago
ChenHaibo 2c569f568c HLS: Support config hls_ctx to disable HLS streaming. 3 years ago
winlin 5757950860 Merge 4.0release 3 years ago
winlin cdccdf70b8 Hooks: Remove on_connect and on_close from doc. 3 years ago
winlin 18d25eacfb Merge 4.0release 3 years ago
winlin 95cd0e84eb Log: Support write log to tencentcloud CLS. v5.0.44 3 years ago
winlin 3da0b57121 Merge 4.0release. 3 years ago
winlin 9923c749d4 STAT: Support config server_id and generate one if empty. v4.0.257 3 years ago
winlin a842c6c32a Support crossbuild for hisiv500. v5.0.40 3 years ago
winlin d885d574e4 Add files for reuse port for origins. 3 years ago
winlin f7280399d4 Merge 4.0release, migrate to new website. 3 years ago
winlin d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 3 years ago
winlin b2e083b00d Support multiple threads by thread pool. v5.0.32 3 years ago
winlin b4774d02cc Add log to file config. 3 years ago
winlin e05535267b Disable reload for log config. 3 years ago
hondaxiao fbc6eebe18 SRT: remove rtmp_to_srt 3 years ago
hondaxiao 59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 3 years ago
hondaxiao a929f79d2c SRT: Add SRT option annotation in full.conf 3 years ago
winlin 3616c9976a SRT: Add srt vhost section to full.conf. 3 years ago
winlin ef553b571c SRT: Update full.conf for review. 3 years ago
winlin bda0268a37 SRT: Update full.conf for new configs. 3 years ago
hondaxiao b566182f0b SRT: fix utest failed 3 years ago
hondaxiao 94fa0ff7bd Refine SRT code, with StateThread adpater 3 years ago
winlin f469753b07 RTMP: Add conf for listen at IPv6. 3 years ago
winlin 7e0beb11d8 Conf: Refine comments. 3 years ago
winlin c574ab6465 Live: Refine edge cluster to support FLV. 3 years ago
winlin e8240d64be HTTP: Add configure for nginx proxy. 3 years ago
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 4 years ago
winlin 501b3833a1 RTMP: Remove bandwidth test 4 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