github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,628 Commits
13 Branches
107 Tags
371 MiB
develop
5.0release
6.0release
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 '244ce7bc01'
${ noResults }
Commit Graph

6740 Commits (244ce7bc013a0b805274a65132a2980680ba6b9d)

Author SHA1 Message Date
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 e31f3b0e64 For #3167: WebRTC: Refine sequence jitter algorithm. v5.0.66 2 years ago
winlin 0c6d30861b Merge branch '4.0release' into develop 2 years ago
winlin 386b92e9ab For #3167: WebRTC: Refine sequence jitter algorithm. v4.0.266 2 years ago
winlin ccd9eee2c9 For #3187: Fix build warning for unused variable. 2 years ago
john 62cd2fba85
SRT: do not ignore AUD nalus (#3187) 2 years ago
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>
 2 years ago
hondaxiao 4acb246c57 Fix #3181: SRT & WebRTC: Use SrsRawH264Stream to mux SPS/PPS. 2 years ago
winlin f974c7c8b0 Fix #3183: Fix build fail for HDS. 2 years ago
winlin d4898bec3c APM: Check endpoint port and team. 2 years ago
winlin 6f7b242ce2 APM: Extract research to projects. 2 years ago
winlin b95734fb09 STAT: Update statistic for RISCV. 2 years ago
winlin e63c02e928 APM: Update statistic for APM. 2 years ago
winlin 3e2f8622f8 APM: Support distributed tracing by Tencent Cloud APM. v5.0.63 2 years ago
winlin 4d0a4faa9d For #3179: WebRTC: Make sure the same m-lines order for offer and answer. v5.0.63 2 years ago
winlin 1b25ef9028 Merge branch '4.0release' into develop 2 years ago
winlin 686f57799e Fix #3179: WebRTC: Make sure the same m-lines order for offer and answer. v4.0.265 2 years ago
winlin b2ad3bcdc8 WebRTC: Print offer if negotiate failed. 2 years ago
winlin 98ba8ae541 For #3174: WebRTC: Support Unity to publish or play stream. v5.0.62 2 years ago
winlin 6d18093e16 Merge branch '4.0release' into develop 2 years ago
winlin aea2bfbaf9 For #3174: WebRTC: Support Unity to publish or play stream. v4.0.264 2 years ago
winlin 8ac8ae1c2e Fix #3093: WebRTC: Error when SDP not matched. 2 years ago
winlin 1c0236aa0d Fix #3093: WebRTC: Ignore unknown fmtp for h.264. v4.0.263 2 years ago
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>
 2 years ago
winlin 3eb046612b Fix #3170: WebRTC: Support WHIP(WebRTC-HTTP ingestion protocol). v5.0.61 2 years ago
winlin e47c3c410c Merge branch '4.0release' into develop 2 years ago
winlin 15610ca488 Fix #3170: WebRTC: Support WHIP(WebRTC-HTTP ingestion protocol). v4.0.262 2 years ago
winlin 297a104fef Update state-threads to v1.9.4. 2 years ago
winlin 0410915ddd Update features for SRS 5.0 2 years ago
winlin 2144ff8c40 For #2852: WebRTC: Support only one TCP connected candidate. 2 years ago
Li Peng efa0851476 WebRTC: Refine code and destroy session when tcp close. 2 years ago
Li Peng 07339e1417 WebRTC: Support TCP network. 2 years ago
winlin 625069af7f WebRTC: Extract SrsRtcNetwork layer for UDP/TCP. 2 years ago
winlin 770d959148 WebRTC: Support config, listener and SDP for TCP transport. 2 years ago
winlin 424713a31d Merge branch '4.0release' into develop 2 years ago
winlin e0c8c199d5 Fix HTTP url parsing bug. v4.0.261 2 years ago
winlin 79358673ef Merge branch '4.0release' into develop 2 years ago
winlin 34196ea7f7 Fix #3167: WebRTC: Play stucked when republish. v4.0.260 2 years ago
winlin 38c3d9f1a7 Config: Refine config file, nothing changed. 2 years ago
winlin 77e1f81f91 For #1405: Fix utest build failed, for parsing SPS/PPS. 2 years ago
winlin 84c96076a9 Merge branch '4.0release' into develop 2 years ago
winlin 4a225c5640 For #307: WebRTC: Support use domain name as CANDIDATE. v4.0.259 2 years ago
winlin 6988e60ad6 Fix #1405: Restore the stream when parsing failed. v5.0.59 2 years ago
chundonglinlin ef04d411c0 Main: remove extra space and refine code. (#3127) 2 years ago
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
 2 years ago
winlin 783aea7ac3 Fix #1405: Support guessing IBMF first. v5.0.58 2 years ago
winlin e027d28c4d HLS: Support disable hls_ts_ctx. 2 years ago
winlin eb2056db25 ST: Define and use a new jmpbuf. v5.0.57 2 years ago
winlin 7d47017a00 Ingest: Still use -re for stream to ingest HLS better. 2 years ago
winlin dd37a041b9 Fix URL parsing bug for __defaultVhost__. v5.0.55 2 years ago
winlin b009860b11 UTest: Split utest to smaller file. 2 years ago
winlin 6a108fab6d Fix #2837: Callback: Support stream_url and stream_id. v5.0.55 2 years ago
winlin 9c6774b644 STAT: Refine tcUrl for SRT/RTC. v5.0.54 2 years ago
winlin d877c0b76f Tools: Update console and httpx. 2 years ago
winlin 2c259bd95b Refactor: Extract SrsNetworkKbps from SrsKbps. v5.0.53 2 years ago
winlin 937605b18c Remove bandwidth check because falsh is disabled. v5.0.52 2 years ago
winlin 1630918b0f Refactor: Use compositor for ISrsKbpsDelta. v5.0.51 2 years ago
winlin 29ae29c693 Merge branch '4.0release' into develop 2 years ago
winlin 88ba3d25f8 Copy libxml2-dev for FFmpeg. v4.0.258 2 years ago
winlin db91102e67 STAT: Extract an ephemeral delta object. 2 years ago
winlin 4fe90d4885 RTC: Stat the WebRTC clients bandwidth. v5.0.50 2 years ago
winlin d7c2d5ab01 HLS: Stat the HLS streaming clients bandwidth. v5.0.49 2 years ago
winlin c1df280211 HLS: Rebuild m3u8 to make ts with id, for stat. 2 years ago
winlin bc569d91a0 STAT: Ignore stat for API, only for HTTP streaming clients. 2 years ago
winlin 28154e820c URL: Use SrsHttpUri to parse URL and query. 2 years ago
winlin 9bd3c51818 RTMP: Refine code for gussing stream by app. 2 years ago
chundonglinlin 96add9be3d RTMP: Support publish with Server without StreamKey using OBS.(#3018) 2 years ago
winlin f492d8b03a HTTP: Support API with body, for RTC. 2 years ago
winlin 457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 2 years ago
winlin 6508a082e9 Fix #3108: STAT: Update stat for SRT. v5.0.46 2 years ago
winlin 4e3ea99ccd STAT: Refine stat for global server. 2 years ago
winlin da24de5ecb STAT: Update stat for SRT connection. 2 years ago
winlin 101e4fa3b9 STAT: Add hls-play, flv-play, srt-play and srt-publish. 2 years ago
winlin 2944fe430f STAT: Only stat media streaming clients. 2 years ago
winlin ccf83a3f68 HLS: Extract a HLS streaming to serve pseudo session. 2 years ago
winlin d39995cc31 HLS: Enable hls_ctx by default. 2 years ago
ChenHaibo ca7b5a1c4e HLS: Add utest for HLS streaming. 2 years ago
ChenHaibo 2c569f568c HLS: Support config hls_ctx to disable HLS streaming. 2 years ago
winlin 6dc86b8a2e CLS: Refine logging to global object. 2 years ago
winlin 8bc7342c3c Protobuf: Extract protobuf encoder. 2 years ago
winlin a54d371549 Log: Stat the number of logs. v5.0.45 2 years ago
winlin 5757950860 Merge 4.0release 2 years ago
winlin cdccdf70b8 Hooks: Remove on_connect and on_close from doc. 2 years ago
winlin 5225a07727 Merge 4.0release 2 years ago
winlin d5293e34e1 Refine release doc and wiki link. 2 years ago
winlin 18d25eacfb Merge 4.0release 2 years ago
winlin 95cd0e84eb Log: Support write log to tencentcloud CLS. v5.0.44 2 years ago
winlin 3da0b57121 Merge 4.0release. 2 years ago
winlin 9923c749d4 STAT: Support config server_id and generate one if empty. v4.0.257 2 years ago
winlin 8e6d207e56 For #2136: API: Cleanup no active streams for statistics. v4.0.256 2 years ago
winlin 41155b7789 STAT: Add kbps for client. 2 years ago
winlin 2438bc99e0 Config: Refine ulimit check. 3 years ago
winlin 9b010ac158 Fix #3114: Origin cluster config bug. v5.0.43 3 years ago
winlin e9d6601f7d For #2136: API: Cleanup no active streams for statistics. v5.0.42 3 years ago
winlin 4edf33326d Merge branch '4.0release' into develop 3 years ago
winlin f9941a325b RTMP URL supports domain in stream parameters. v4.0.255 3 years ago
winlin 4126c42118 Speedup test by refine the task dependencies. 3 years ago
winlin 2d036c3fd6 Fix #2747: Support Apple Silicon M1(aarch64). v5.0.41 3 years ago
ChenGH f2fa289fe8 AppleM1: Support Apple Silicon M1(aarch64). 3 years ago
winlin b787656eea AppleM1: Update openssl to v1.1.1l 3 years ago
winlin 1fe12b8e8c Speedup test by using cache image. 3 years ago
winlin d478d7b2ca Add test for crossbuild on Ubuntu20. 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 b73847de7d Refine configure for crossbuild. 3 years ago
winlin 7f7406ec77 Build: Detect OS by packager. v5.0.39 3 years ago
winlin 0227e44ef0 Fix warning for comparing int with sizeof. 3 years ago
winlin 26284e368f Merge branch '4.0release' into develop 3 years ago
winlin febd45d514 Fix server id generator bug. v4.0.254 3 years ago
winlin 262b79f747 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.38 3 years ago
winlin a71eddd56a Fix the snprintf size issue. 3 years ago
winlin 1ab584b2ae Loongson/mips64: Support FFmpeg and openssl. 3 years ago
winlin 0a025fc4b6 Remove unneccessary depends headers. 3 years ago
winlin 25c004e947 Opus: Add TODO because the audio might be corrupted, if use FFmpeg native opus. 3 years ago
winlin f9e8065b51 Fix build warnings. 3 years ago
winlin f44b694a17 For test docker image, use cache eventhough the kernel changed. v5.0.37 3 years ago
winlin 14832b66eb Build: Disable openssl ASM for loongson. v5.0.35 3 years ago
winlin 5ae495ab95 For #1229: Check the return value of vsnprintf. 3 years ago
winlin 079ac107f0 For loongarch, fix openssl build bug, always use linux64-mips64 as required. 3 years ago
winlin 1589858cb0 Support MIPS 64bits for loongson 3A4000/3B3000. v5.0.34 3 years ago
winlin aba6667357 Refine build script. 3 years ago
winlin 2e4fe0aea9 Refine options, extract crossbuild from toolchain. 3 years ago
winlin f7280399d4 Merge 4.0release, migrate to new website. 3 years ago
winlin 7b23a42139 Migrate license to new website. 3 years ago
winlin d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 3 years ago
winlin 6c295952f6 RTMP: Fix unused variable warning. 3 years ago
Steven Liu 08c4b25030 RISCV: Patch ST and libsrtp. #3115 3 years ago
Steven Liu 8a6fa30992 app/srs_app_rtmp_conn: move err result to RTC MACRO to fix compiling warning 3 years ago
Steven Liu ad2d7c3779 srtp-2-fit/config.guess: add riscv support 3 years ago
Steven Liu ec7123d54c Support riscv, starfive CPU. 
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 3 years ago
winlin 755a2a74ed Merge branch '4.0release' into develop 3 years ago
winlin 7d0d2af817 UTEST: Refine coverage script. 3 years ago
winlin cd85a96255 Update SRS image for r.ossrs.net 3 years ago
winlin 0badae4797 Support thread pool and update ossrs.net. v5.0.33 3 years ago
winlin 57be5188c3 Merge branch '4.0release' into develop 3 years ago
winlin a2cfec2dcc Update SRS image for r.ossrs.net 3 years ago
winlin b2e083b00d Support multiple threads by thread pool. v5.0.32 3 years ago
winlin 7c6bd0ce5c Refine async DVR manager. 3 years ago
winlin b4774d02cc Add log to file config. 3 years ago
winlin e05535267b Disable reload for log config. 3 years ago
winlin cb6a4d0143 Thread: Refine SrsThreadMutex and SrsThreadLocker. 3 years ago
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.
 3 years ago
winlin d117145b95 Update date from 2021 to 2022. 3 years ago
winlin f92fb9653b Speedup the test from srs-cache image. 3 years ago
winlin c722eba48f SRT: Support Coroutine Native SRT over ST. (#3010). (1af30de). v5.0.30 3 years ago
winlin 82efa564e4 Merge branch '4.0release' into develop 3 years ago
winlin d9352ec43b Disable all asm for FFmpeg, to compatible with ARM CPU. 3 years ago
winlin f568e4f91d Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v5.0.29 3 years ago
winlin d525d27e64 Merge from 4.0release 3 years ago
winlin 1f0ea3fdf5 Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252 3 years ago
winlin 93fed3874b SRT: Rebase develop. 3 years ago
winlin 0957cdb944 SRT: Refine the lock for log. 3 years ago
hondaxiao 910b5945af SRT: add srt log handle, srs log supoort multithread 3 years ago
hondaxiao d03c6793b8 SRT: add srs_core_lock, support scope lock guard 3 years ago
hondaxiao fd74b2f6e1 SRT: readd mix_correct, compatible old srt conf 3 years ago
hondaxiao c037f920b2 SRT: move accept log into srt conn cycle 3 years ago
winlin e09daa2d4b SRT: Change bridges to bridge. 3 years ago
winlin 077d93c7b6 SRT: Refine code, remove SrsSrtListenerType 3 years ago
winlin 9efb6de0b4 SRT: Merge develop, fix build fail. 3 years ago
winlin d2149a8b79 SRT: Add todo for coroutine yield. 3 years ago
winlin 8437370c1e SRT: Refine packet error handler. 3 years ago
winlin 9a0db5a14f SRT: Undo extract of fetch_or_create_source and change mode_ to local. 3 years ago
winlin 6009395c10 SRT: Hide srt implements from API. 3 years ago
winlin d39ec3cf45 SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT 3 years ago
winlin 94cc50d146 SRT: Wrap SRT stat object. 3 years ago
winlin 78b778fb93 SRT: Rename srs_service_st_srt to srs_protocol_srt 3 years ago
hondaxiao fbc6eebe18 SRT: remove rtmp_to_srt 3 years ago
hondaxiao 43d98d0b1c SRT: remove mix_correct 3 years ago
hondaxiao a5ac7cfe37 SRT: use srs code style in function defination 3 years ago
hondaxiao 59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 3 years ago
hondaxiao dd8ccfe5d8 SRT: refine int to srs_utime_t in srt timeout config 3 years ago
hondaxiao 26498a00fe SRT: Tsbpdmode default on 3 years ago
hondaxiao a929f79d2c SRT: Add SRT option annotation in full.conf 3 years ago
winlin 492e3a888c SRT: Refine the SRT socket code. 3 years ago
winlin 6c94e91792 SRT: Refine get_srt_poller to poller. 3 years ago
winlin 21899c5998 SRT: Initialize SRT eventloop in adapter. 3 years ago
winlin 4899be9c34 SRT: Refine the schedule resolution to 10ms if idle. 3 years ago
winlin b507a080b2 SRT: Refine parse SRT listen ip and port. 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
winlin d88fd12c26 SRT: Fix cmake bug, quit if error. 3 years ago
hondaxiao b566182f0b SRT: fix utest failed 3 years ago
hondaxiao e13d16439e SRT: support rtmp to srt 3 years ago
hondaxiao 7da792f19d SRT: check srt_connect return value 3 years ago
winlin bb91297071 SRT: Eliminate unused files for SRT. 3 years ago
winlin cf4fbb887b SRT: Support debugging with CLion. 3 years ago
hondaxiao 94fa0ff7bd Refine SRT code, with StateThread adpater 3 years ago
winlin 3ed4aed824 Fix build failed. 3 years ago
winlin fa78cf3354 Prefix with srs_protocol in protocol directory. 3 years ago
winlin 665ad564fb Rename service to protocol files. 3 years ago
winlin f1840b87e5 Fix typo, change bridger to bridge. 3 years ago
winlin 0304e78cf1 Support SIGABRT to generate coredump. 3 years ago
winlin f469753b07 RTMP: Add conf for listen at IPv6. 3 years ago
winlin 310514ea94 Update players and console. 3 years ago
winlin e2cc356c31 Update 3rdparty. 3 years ago
winlin ec5bdc7dfa Refine the signaling dynamic images. 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 2b2379de12 RTC: Refine player sdk, reject with xhr. 3 years ago
winlin b3baa888ee RTC: Refine player sdk, directly use raw HTTP. 3 years ago
winlin 16babd2b64 Merge branch '4.0release' into develop 3 years ago
winlin 1d503c770f Fix proc stat issue. 3 years ago
winlin f87a959480 Support NGINX HLS Cluster. 3 years ago
winlin 4163dce18d Support NGINX HLS Cluster. v5.0.28 3 years ago
winlin 101d1ffbbf Support DigitalOcean Droplet SRS 1-Click. v5.0.27 3 years ago
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
 3 years ago
winlin 9385f2b80b Merge branch '4.0release' into develop 3 years ago
winlin 76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 3 years ago
winlin 41e35155f7 SRT: Compatible with previous auth querystring. #2908 3 years ago
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>
 3 years ago
winlin c225c3f745 Merge branch '4.0release' into develop 3 years ago
winlin 06cff31b24 Update script. 3 years ago
winlin fd219aa074 Refine utest script. 3 years ago
Winlin 350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 3 years ago
winlin c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 3 years ago
winlin 61f1531aa3 Merge branch '4.0release' into develop 3 years ago
ChenGH ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248 
Co-authored-by: Winlin <winlin@vip.126.com>
 3 years ago
ChenGH 70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966) 
Co-authored-by: Winlin <winlin@vip.126.com>
 3 years ago
winlin 636066124a SRT: Fix typo in libsrt build options. v5.0.26 3 years ago
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.
 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
winlin 451b01011c Merge SRS 4.0 for bugfix. v5.0.25 3 years ago
winlin 9d3ae5c8ed Merge branch '4.0release' into develop 3 years ago
winlin e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 3 years ago
winlin 107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 3 years ago
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>
 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
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
 3 years ago
winlin 4b838659e9 Merge 4.0release, update AUTHORS 3 years ago
winlin e222f0da1b Add active developers 3 years ago
winlin 88c8a4f6c0 Squash: Bug fixed 3 years ago
winlin d78a4f25a6 Forward: Support dynamic forwarding by backend api. (#2799). v5.0.24 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 b94ae922d4 Fix warnings for uuid. v4.0.245 3 years ago
winlin 37b6b48882 SRT: Close connection if RTMP failed. (#2917). v4.0.244 3 years ago
loveforever e8fca60ece
SRT: Close connection if RTMP failed. (#2917) 
* SRT: using global variables  to pass errors (#2897)

* SRT: using global variables  to pass errors (#2897)
 3 years ago
winlin 0a848430e9 Refine build script for SRT to avoid warnings. v4.0.243 3 years ago
winlin eeb44ebbe9 Version: Ignore the mgmt version 3 years ago
winlin 957e952b41 Update authors 3 years ago
winlin b839c2ea9c Support include directive for config file. (#2878). v5.0.23 3 years ago
mapengfei53 fde44885d9
Support include directive for config file (#2878) 
* Support include import configuration

* Remove support for regular rules

* Remove support for regular rules

* Fix configuration file parsing bug

* Added utest tests for include functionality

* Added utest tests for include functionality

* Modify the UTest function

* optimized code

* Config: Refine parse error with state

* Config: Reorder functions

* Config: Rename parsing type to context

* Config: Refine args for include

* Config: Add utests for include

* Config: Refine code, parsing recursively.

* Config: Change the mock from file to buffer

* Config: Mock buffer in config

* Config: Refine code

* Add utests for include

* Added utest for include

Co-authored-by: pengfei.ma <pengfei.ma@ngaa.com.cn>
Co-authored-by: winlin <winlin@vip.126.com>
 3 years ago
winlin acf0af6b5a Squash: Update 3 years ago
winlin 8d88a5b4cc Release v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines. 3 years ago
winlin c2b07ad943 Squash: Fix bugs 3 years ago
winlin ff93bdd14f Mirror docker images in TCR Singapore. v4.0.240 3 years ago
winlin e27b658ef9 Refine the error for WebRTC H5 publisher. v4.0.239 3 years ago
winlin 5c1556ac74 Squash: Refine release 3 years ago
winlin d1534c099b Push docker to docker, acr and tcr. v4.0.238 3 years ago
winlin 32bb96a5c2 Squash: Fix bugs 3 years ago
winlin dcf565bba1 Fix bug when the value of http header is empty. (#2888). v4.0.237 3 years ago
Haibo Chen 290c3b95a5 Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 3 years ago
Haibo Chen b94ce1485a
Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 3 years ago
winlin 1d4fac0dbc Refine docker console, preview by players at the same server. v4.0.236 3 years ago
winlin ba0b62fd37 For docker, always use the console for logging. v4.0.235 3 years ago
winlin bdf6540c89 SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 3 years ago
Alex.CR 0c036e0435
SRT: Reduce the SRT bug by limit the max times for retry. 3 years ago
winlin 6b7fc6fdb5 Squash: Fix bugs for 4.0 3 years ago
winlin 339d942e7b Fix bug when free addrinfo. (#2886). v4.0.233 3 years ago
winlin 8f2d23ff73 Fix memory leak in SrsMetaCache. (#2887). v4.0.232 3 years ago
winlin 6c6c0f0f0f Support docker image for lighthouse. v4.0.231 3 years ago
stone 386ac44558
bugfix: SrsAutoFree addrinfo (#2886) 
* bugfix: SrsAutoFree addrinfo

* bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo)

Co-authored-by: wanglei <wanglei@unicloud.com>
 3 years ago
stone 92434cfeba
bugfix:SrsMetaCache memleak (#2887) 
Co-authored-by: wanglei <wanglei@unicloud.com>
 3 years ago
winlin 7c9f88be0b Eliminate unused *.as files for Adobe Flash. v5.0.22 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 5d8b950a06 Update CHANGELOG 3 years ago
winlin b9bfe18829 CICD: Refine release for droplet 3 years ago
winlin 27e5d77302 Squash: Update README 3 years ago
winlin 16f17848bb Update README for **Cloud Virtual Machine** 3 years ago
winlin 55ea0a62d3 Build: Disable c++11 and c++14 for CentOS 6.0 3 years ago
winlin d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 3 years ago
winlin 93aa0eb5ba Squash: Fix bugs 3 years ago
winlin 0dd6246c2f Release v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines. 3 years ago
winlin 7796083e9a RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229 3 years ago
chundonglinlin 584889754c
RTC: fix play rtc judge for config rtc2rtmp on.(#2863) (#2872) 3 years ago
winlin 99ff853de9 Refine package variables. v4.0.228 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 3881c4c77e Add SrsAutoFreeH to release ptr with hooks. (#2880). v4.0.226 3 years ago
winlin 73d0ce1cee Support api to specify the WebRTC API port. v4.0.225 3 years ago
winlin c6c2e97189 Support api_port to specify the WebRTC API port. v4.0.225 3 years ago
winlin db3ceb445b Support api_port to specify the WebRTC API port. v4.0.224 3 years ago
winlin e6ab5db113 LiveSource: Refine fetch for external exposed interface. (#2873). v4.0.223 3 years ago
chundonglinlin 7580341a1e
LiveSource/RtcSource: Refine fetch for external exposed interface. (#2873) 3 years ago
winlin 71a4b3c3f7 Add conf/lighthouse.conf for LightHouse. v4.0.222 3 years ago
winlin d47dd81f46 Refine the running homepage. v4.0.221 3 years ago
winlin fb93631407 Refine the running homepage. v4.0.221 3 years ago
winlin 574afb4320 Refine the running homepage. v4.0.221 3 years ago
winlin 7e25d0d7f4 Refine the running homepage. v4.0.221 3 years ago
chundonglinlin c30aa479a7
RTC: Fix both rtmp and rtc streams can be published at the same time. (#2875) 3 years ago
winlin 4110fb14cb Squash: Fix bugs. v5.0.20 3 years ago
chundonglinlin 750c58beff
RTC: fix play rtc judge for rtmp inactive.(#2863) (#2867) 3 years ago
winlin 2bc5e9a8b4 RTC: fix play crash or no stream for rtmp2rtc tips.(#2863). v4.0.220 3 years ago
chundonglinlin c85daeb12d
RTC: fix play crash or no stream for rtmp2rtc tips.(#2728) (#2863) 3 years ago
winlin 2f6d6a0ac0 Change warn to trace for release query 3 years ago
liuxiaoliang 4434bb1a25
SRT: use const string to sprint rtmp url. (#2847) 3 years ago
winlin 51ca3fd80a Only discover api server ip as candidate. 3 years ago
winlin 6919011e86 Update sync script, ignore gb28181 3 years ago
winlin 4d09b8caae When reopening segment, never update the duration. (#2717). v4.0.219 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 c0a7790c91 Update README 3 years ago
winlin 7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 3 years ago
winlin 8bc2759c7e Refine error log for rtmp2rtc. (#2728). v4.0.215 3 years ago
along cf010064eb
Update srs_core.hpp (#2832) 
modify a word.
 3 years ago
winlin 56a9e4d140 Change images from gitee to ossrs.net 3 years ago
winlin 5aba212f3d Bugs fixed. (#2770)(#2820). v4.0.214 3 years ago
john a9397598e8
Fix typo(HTTP-Server -> HTTPS-Server) (#2822) 3 years ago
chundonglinlin a16590b3a6
SRT: Eliminate duplicate header file.(#2786) (#2827) 3 years ago
mapengfei53 3f8b1a2922
Fix the error of pps statistics (#2820) 3 years ago
akanchi f1a448bc6a
SRT: Fix srt2rtmp crash when streamid is too long(#2770) (#2786) 3 years ago
winlin c7ea21d06a Fix ulimit issue by detecting epoll on Ubuntu. (#2811). v4.0.213 3 years ago
Winlin fd90e49cd6
CI: Support build and test for CentOS 6.0 (#2816) 3 years ago
winlin d2fe83b032 RTC: Fix build warning 3 years ago
winlin 13103ec7d5 For #2815: Extract macros and headers for platform. 3 years ago
winlin 716e578a19 Squash: Fix bugs 3 years ago
winlin d401c83a66 Refine install script 3 years ago
winlin fb98113550 Fix #2815: Build fail for CentOS6 3 years ago
winlin 44e9dc83e9 Upgrade gperftools to 2.9 for GCP/GMC/GMP/GMD. (#2247) 3 years ago
winlin 63da0dca92 Cleanup server for GMC, by WaitGroup to destroy. (#2247). v4.0.206 3 years ago
winlin ab97eb5fcf HTTP: Fix 2GB+ mp4/flv file downloading error. (#2809)(#2780)(#2781). v4.0.211 3 years ago
chundonglinlin e73d00250b
HTTP: Fix mp4/flv file size exceed 2GB download error (#2780) (#2809) 3 years ago
winlin faf5fb0a83 Refine the config 3 years ago
winlin cc501e3eef Fix bug for large mp4(5G+) offset. (#2800). v4.0.210 3 years ago
john aa85ce024b
DVR: Fix large file mp4 dvr failed. (#2800) 3 years ago
winlin 2f52d0aefa Fix bug for HLS log printing. (#2807). v4.0.209 3 years ago
winlin d32195993d Refine the default config file. (#2711). v4.0.208 3 years ago
chundonglinlin 3188c772b1
RTC: Eliminate duplicate assignment for video packet frame type (#2803) 
Co-authored-by: zhangjunqin1 <zhangjunqin@jd.com>
 3 years ago
along c15fadb9d5
Update the stable version to SRS 4.0 (#2802) 
now 4.0 is released and stable.
VERSION_STABLE should be 4
 3 years ago
winlin ee24bb49f3 RTC: Support payload name AV1X/AV1. (#2784)(#2760). v4.0.207 3 years ago
Huachao Mao faeacf1fc9
RTC: Replace payload name AV1X with AV1 for WebRTC. (#2760) (#2784) 
* RTC: Replace payload name AV1X with AV1 for WebRTC. (#2760)

* Add compatibility check code for old versions of Chrome

* 新增获取track_desc的AV1X编码兼容性检查
 3 years ago
winlin 5decc95e2e Release v4.0-b1, 4.0 beta1, v4.0.206, 144126 lines. 3 years ago
winlin f05e67e1a6 Squash: Fix bugs 3 years ago
winlin 027715e4ea RTC: Update config 3 years ago
john 7c353b5986 RTC: Fix memory leak when replace rtp packet in cache. (#2771). v4.0.205 
* fix memory leak when replace rtp packet in cache.
 3 years ago
winlin 2f93e68285 RTC: Fix nack encode seqnum. (#2766). v4.0.204 3 years ago
long 4decc1fa6b
RTC: Fix nack encode seqnum (#2766) 
* fix nack encode seqnum

* add nack encode utest

* change Variable naming

Co-authored-by: liyalong1 <liyalong1@100tal.com>
 3 years ago
winlin 8576fa7052 Squash: Merge v4.0.203 3 years ago
winlin 5ccd63dec3 RTC: Fix bugs for RTC2RTMP. (#2768). v4.0.203 3 years ago
john f3c4023c25
Fix bugs for RTC2RTMP. (#2768) 
1. Cache IDR frame's rtp timestamp instead of avsync timestamp.
2. Cache clock rate calculate by sender report.
3. Using srs_rtp_seq_distance instead of direct minus.
4. Add utest of av timestamp sync when duplicated sender report.
 3 years ago
winlin b807ef9049 Fix dead links 3 years ago
winlin 4e64c66e02 RTC: Ignore empty audio packet when transcoding (#2757). v4.0.202 3 years ago
James 2c0cd9b58d
fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文 (#2757) 
* fix #2690, 如果发现音频包为空，则不送解码，以免提前结束了解码上下文

* fix #2690，出错信息中，显示相关参数名称

Co-authored-by: jiankai <wangjiankai@cmhi.chinamobile.com>
 3 years ago
winlin e16830e989 Squash: Merge 4.0.201 3 years ago
winlin bc063945f1 Build: Change make utest for test 3 years ago
winlin 4d10a453f6 Build: Change default make to build SRS only 3 years ago
winlin 04a8a2866b Release v4.0-b0, 4.0 beta0, v4.0.201, 144022 lines. 3 years ago