github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,144 Commits
14 Branches
107 Tags
373 MiB
develop
duiniuluantanqin-patch-1
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 'aba6667357'
${ noResults }
Commit Graph

6319 Commits (aba6667357c4cbfc7ad2cca52855dcdd777b8353)

Author SHA1 Message Date
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
winlin 1ba3de1139 Refine CHANGELOG 3 years ago
winlin 542a3e4f36 RTC: Refine publish security error message (#2762). v4.0.200 3 years ago
johzzy ff8657e1c5 RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751). v4.0.199 3 years ago
johzzy a862573220
RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751) 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 93242918ad Squash: For #1708 3 years ago
winlin 5e22b1929a ST: Print log when multiple thread stop one coroutine. (#1708). v4.0.198 3 years ago
winlin 93964bb037 ST: Print log when multiple thread stop one coroutine. (#1708) 3 years ago
winlin ff33940d90 WebRTC: Fail to publish RTC automatically for HTML5. 3 years ago
winlin 440f29b758 Squash: Merge #2732 3 years ago
winlin 7771fbe858 Fix #2732: WebRTC: Fail to publish RTC automatically for HTML5. 3 years ago
winlin 5f85d405e7 Squash: Merge #2721, #2729 3 years ago
winlin be0f6197d0 RTC: check audio track exist when negotiate (#2729) v4.0.196 3 years ago
john 469bd8cfe2
RTC: check audio track exist when negotiate (#2729) 3 years ago
winlin 92f061ee7d Rtc2Rtmp: Use RTP timestamp to identify video frames. v4.0.195 (#2721) 3 years ago
john 878833bb95
Rtc2Rtmp: Using rtp timestamp to distinguish different video frame (#2721) 3 years ago
winlin 6cde9a0230 Squash: Guess config files by FHS 3 years ago
winlin 1f4dad024e Config: Guess config files by FHS. v4.0.194 (#2711) 3 years ago
Haibo Chen b06661539c DVR: Copy req from publish. v4.0.193 (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 3 years ago