external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
7114 commits 14 branches 107 tags 377 MiB
Commit graph

2888 commits

Author SHA1 Message Date
winlin
88c8a4f6c0 Squash: Bug fixed 2022-02-16 11:34:05 +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
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
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +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
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
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
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
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
Haibo Chen
88cdba6965
STAT: Add server_id into http_hooks (#2692) 2021-10-25 14:11:15 +08:00
winlin
99904f9ec2 For #2689: Support stat for CPU archs. 2021-10-24 18:41:12 +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
Haibo Chen
7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 2021-10-16 14:06:43 +08:00
Haibo Chen
974bed6b26
API: Fix the same 'client_id' error when asynchronous call (#2665) 2021-10-16 07:50:47 +08:00
winlin
cd7e5a131e Squash: SRS 4.0, Stat the oc(origin cluster). 2021-10-13 09:03:47 +08:00
Haibo Chen
579b90dc1e
on_dvr: use publish param instead of play (#2550) 2021-10-12 14:04:22 +08:00
winlin
4e6a3321cd Squash: Merge SRS 4.0 2021-10-12 14:04:02 +08:00
Haibo Chen
93cd025e2a
replace the placeholder of ts url in m3u8 (#2549) 2021-10-12 09:15:21 +08:00
winlin
b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 2021-10-12 08:36:24 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
5042117034 Squash: Merge SRS 4.0 2021-10-07 21:10:44 +08:00
winlin
a19c0fa121 OpenWRT: Try to create dir for pidfile 2021-10-03 20:51:07 +08:00
winlin
7d3ec991e1 Squash: Merge SRS 4.0 2021-09-26 17:12:55 +08:00
johzzy
dc778020fc
fix some crash in rtc. (#2545) 2021-09-26 17:01:53 +08:00
winlin
34cd7b2586 Squash: Merge SRS 4.0 2021-09-23 22:35:52 +08:00
winlin
f01c9638f1 Support http callback on_play/stop. 5.0.12 2021-09-23 13:38:04 +08:00
Haibo Chen
f901831362
Enhance HLS: support http callback on_play/stop, support statistic (#2578) 
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
 2021-09-23 13:31:45 +08:00
winlin
40f8460929 Squash: Merge SRS 4.0 2021-09-17 14:48:22 +08:00
winlin
a830289d97 Squash: Merge SRS4.0 2021-09-07 08:20:43 +08:00
winlin
19c0a9eb4b Suqash: Merge 4.0 2021-09-05 14:17:41 +08:00
winlin
7ab3e4a86c Squash: Merge SRS 4.0 2021-08-28 09:03:06 +08:00
Haibo Chen
a7feedabc6
Use SrsAsyncCallWorker in http hooks instead, to covert to async call. (#2542) 
* Use SrsAsyncCallWorker in http hooks instead, to covert to async call.

* delete invalid function
 2021-08-27 07:44:19 +08:00
winlin
38b0b1dab2 Squash: Fix ingest bug. Refine AUTHORS. 2021-08-25 08:11:44 +08:00
winlin
85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 2021-08-17 07:25:03 +08:00
winlin
e22035b749 Squash: Fix RTC session info bug 2021-08-14 14:45:12 +08:00
winlin
7c899a0afd Squash: Update version query. 2021-08-14 11:53:27 +08:00
winlin
24431d35ac Squash: Merge SRS4 2021-08-13 14:29:32 +08:00
Haibo Chen
aad90c7f42
fix coredump bug: caused by publish stream that codec is unsupport, sush as G.711, H.263 (#2526) 2021-08-13 12:05:28 +08:00