external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
7115 commits 13 branches 107 tags 375 MiB
Commit graph

5780 commits

Author SHA1 Message Date
winlin
e222f0da1b Add active developers 2022-02-16 13:16:18 +08:00
winlin
88c8a4f6c0 Squash: Bug fixed 2022-02-16 11:34:05 +08:00
winlin
d78a4f25a6 Forward: Support dynamic forwarding by backend api. (#2799). v5.0.24 2022-02-16 11:14:25 +08:00
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.
 2022-02-16 10:49:16 +08:00
winlin
957e952b41 Update authors 2022-02-14 15:30:02 +08:00
winlin
b839c2ea9c Support include directive for config file. (#2878). v5.0.23 2022-02-14 15:20:48 +08:00
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>
 2022-02-14 15:08:51 +08:00
winlin
acf0af6b5a Squash: Update 2022-02-13 08:31:10 +08:00
winlin
c2b07ad943 Squash: Fix bugs 2022-02-11 08:44:31 +08:00
winlin
5c1556ac74 Squash: Refine release 2022-02-04 09:57:05 +08:00
winlin
32bb96a5c2 Squash: Fix bugs 2022-02-03 15:16:52 +08:00
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
 2022-02-03 15:05:09 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
winlin
7c9f88be0b Eliminate unused *.as files for Adobe Flash. v5.0.22 2022-01-18 12:04:15 +08:00
winlin
12ffddd363 Release v5.0.21 2022-01-17 21:43:47 +08:00
winlin
27e5d77302 Squash: Update README 2022-01-17 09:47:27 +08:00
winlin
55ea0a62d3 Build: Disable c++11 and c++14 for CentOS 6.0 2022-01-15 09:02:14 +08:00
winlin
d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 2022-01-13 18:40:22 +08:00
winlin
93aa0eb5ba Squash: Fix bugs 2022-01-13 18:26:28 +08:00
winlin
4110fb14cb Squash: Fix bugs. v5.0.20 2022-01-11 08:40:37 +08:00
winlin
d2fe83b032 RTC: Fix build warning 2021-12-26 18:16:10 +08:00
winlin
13103ec7d5 For #2815: Extract macros and headers for platform. 2021-12-26 17:50:19 +08:00
winlin
716e578a19 Squash: Fix bugs 2021-12-26 17:30:51 +08:00
winlin
f05e67e1a6 Squash: Fix bugs 2021-12-13 09:24:16 +08:00
winlin
8576fa7052 Squash: Merge v4.0.203 2021-12-04 11:21:35 +08:00
winlin
e16830e989 Squash: Merge 4.0.201 2021-12-04 10:43:04 +08:00
johzzy
a862573220
RTC: Fix crash when pkt->payload() if pkt is nullptr (#2751) 2021-11-25 07:33:41 +08:00
winlin
66435d583a Squash: Fix stat bug 2021-11-15 20:39:35 +08:00
winlin
93242918ad Squash: For #1708 2021-11-15 11:10:44 +08:00
winlin
440f29b758 Squash: Merge #2732 2021-11-14 21:50:58 +08:00
winlin
5f85d405e7 Squash: Merge #2721, #2729 2021-11-13 19:36:43 +08:00
winlin
6cde9a0230 Squash: Guess config files by FHS 2021-11-07 18:53:21 +08:00
Haibo Chen
3974b319d1
DVR: Copy req from publish (#2714) 
* DVR: copy req from publish

* DVR: copy req from publish
 2021-11-07 16:59:33 +08:00
winlin
f4e87b17a3 AUTHORS: Update new contributors. 2021-11-04 07:38:19 +08:00
winlin
523b055c06 Squash: Support RPM. Fix bugs. 2021-11-04 07:37:17 +08:00
Haibo Chen
a01354a595
Edge: Refuse edge request when state is stopping (#2707) 2021-11-04 07:28:48 +08:00
winlin
da7fac0939 Release SRS v5.0.19, develop version, not stable 2021-10-28 08:06:26 +08:00
winlin
e1f65478af Sqush: Refine config for origin cluster 2021-10-27 17:34:03 +08:00
winlin
3c4b9be76b For #2689, Refine the patches for loongarch 2021-10-26 07:15:11 +08:00
Haibo Chen
88cdba6965
STAT: Add server_id into http_hooks (#2692) 2021-10-25 14:11:15 +08:00
winlin
a6c4cc9692 Squash: Merge SRS 4.0, API: Always stat client event if auth fail. 2021-10-24 20:58:34 +08:00
winlin
99904f9ec2 For #2689: Support stat for CPU archs. 2021-10-24 18:41:12 +08:00
winlin
5b44cc6a17 For #2689, Support loongarch, loongson CPU. v5.0.19 2021-10-24 18:00:54 +08:00
Haibo Chen
a86f3905b2
Put the statistics code after http callback (#2687) 2021-10-22 08:03:49 +08:00
winlin
f0910cf9b7 Squash: For #1758: Fix bug for marshal JSON with SDP. 2021-10-21 09:03:17 +08:00
winlin
665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 2021-10-20 09:16:18 +08:00
Matheus Macabu
9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 2021-10-19 08:20:28 +08:00
winlin
85131dad63 Squash: Update SRS 4.0 version 2021-10-18 15:10:05 +08:00
Alex.CR
60c8724879
SRT: Solve mpegts demux assert bug (#2670) 
* solve mpegts demux bug

* remove assert

* add error log in mpegts demux

* sovle compile problem

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-10-18 15:03:47 +08:00
winlin
596dd8c523 Support daemon(fork twice) for Darwin/OSX. v5.0.18 2021-10-17 16:53:39 +08:00