1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Commit graph

2092 commits

Author SHA1 Message Date
winlin
6bbd461ec9 Release v6.0-d6, 6.0 dev6, v6.0.134, 168904 lines. 2024-07-04 16:13:13 +08:00
winlin
e3d74fb045 Release v5.0-r3 and v6.0-d5. 2024-06-15 17:33:45 +08:00
winlin
427104f1da Release v5.0-r2, 5.0 release2, v5.0.210, 163515 lines. 2024-04-03 15:06:20 +08:00
Jacob Su
08971e5905
Build: Refine workflow for cygwin and remove scorecard. v6.0.120 (#3995)
#3983 already fixed the `test` workflow, but I think the `release` will
have same issue.

---------

Co-authored-by: winlin <winlinvip@gmail.com>
2024-03-26 16:37:33 +08:00
winlin
fa8096ad01 Release v6.0-d4, 6.0 dev4, v6.0.113, 167695 lines. 2024-02-15 21:04:00 +08:00
winlin
2a2da2253f Switch to 2013-2024. v6.0.109 2024-01-01 10:51:24 +08:00
Winlin
ad7ddde318
Fix DO droplet link bug. 2023-12-23 20:30:26 +08:00
winlin
470a373a68 Release v6.0-d3, 6.0 dev3, v6.0.101, 167560 lines. 2023-11-19 22:00:43 +08:00
winlin
1840476fe0 Update README for v5.0-b6, 5.0 beta6, v5.0.195 2023-10-25 20:45:10 +08:00
winlin
9a6f5f04f5 Refine LICENSE. 2023-10-23 14:26:17 +08:00
Winlin
4e7c075559
Disable asan by default. v5.0.192 v6.0.92 (#3840)
---------

Co-authored-by: john <hondaxiao@tencent.com>
2023-10-17 10:03:44 -05:00
Winlin
d10e16e335
Use new cache image name. v6.0.86 (#3815)
---------

Co-authored-by: john <hondaxiao@tencent.com>
2023-10-08 07:43:14 -05:00
winlin
411ae5aff7 Update README, use docker by default. 2023-09-28 11:41:42 +08:00
winlin
f4d75543a7 Release v6.0-d2, 6.0 dev2, v6.0.85, 167509 lines. 2023-09-28 09:54:55 +08:00
Winlin
a52080171d
Change dev code for John. v6.0.84 (#3810)
Update dev code for SRS 6.0, see
https://ossrs.io/lts/en-us/product#release-60

---------

Co-authored-by: john <hondaxiao@tencent.com>
2023-09-25 09:39:30 +08:00
winlin
7138edd318 Release v6.0-d1, 6.0 dev1, v6.0.72, 167135 lines. 2023-08-31 09:49:36 +08:00
terrencetang2023
a2e10f12e2
Compile: Add aarch64 to the conditions of use of the cbrt function. v6.0.72 (#3776)
I got an error when cross-compiling the aarch64 platform, the log is as
follows:
`./libavutil/libm.h:54:32: error: static declaration of 'cbrt' follows
non-static declaration`
I see that there are such compilation errors in the
trunk/auto/depends.sh file that have been resolved for the ARM and MIPSE
platforms, and it is recommended to add the ARCH64 platform
2023-08-31 08:51:23 +08:00
Winlin
cff5064d0b HLS: Fix on_hls and hls_dispose critical zone issue. v5.0.174 v6.0.69 (#3781)
on_hls and hls_dispose are two coroutines, with potential race
conditions. That is, during on_hls, if the API Server being accessed is
slower, it will switch to the hls_dispose coroutine to start cleaning
up. However, when the API Server is processing the slice, a situation
may occur where the slice does not exist, resulting in the following
log:

```
[2023-08-22 12:03:20.309][WARN][40][x5l48q7b][11] ignore task failed code=4005(HttpStatus)(Invalid HTTP status code) : callback on_hls http://localhost:2024/terraform/v1/hooks/srs/hls : http: post http://localhost:2024/terraform/v1/hooks/srs/hls with {"server_id":"vid-5d7dxn8","service_id":"cu153o7g","action":"on_hls","client_id":"x5l48q7b","ip":"172.17.0.1","vhost":"__defaultVhost__","app":"live","tcUrl":"srt://172.17.0.2/live","stream":"stream-44572-2739617660809856576","param":"secret=1ed8e0ffbc53439c8fc8da30ab8c19f0","duration":4.57,"cwd":"/usr/local/srs-stack/platform","file":"./objs/nginx/html/live/stream-44572-2739617660809856576-1.ts","url":"live/stream-44572-2739617660809856576-1.ts","m3u8":"./objs/nginx/html/live/stream-44572-2739617660809856576.m3u8","m3u8_url":"live/stream-44572-2739617660809856576.m3u8","seq_no":1,"stream_url":"/live/stream-44572-2739617660809856576","stream_id":"vid-0n9zoz3"}, status=500, res=invalid ts file ./objs/nginx/html/live/stream-44572-2739617660809856576-1.ts: stat ./objs/nginx/html/live/stream-44572-2739617660809856576-1.ts: no such file or directory
thread [40][x5l48q7b]: call() [./src/app/srs_app_hls.cpp:122][errno=11]
thread [40][x5l48q7b]: on_hls() [./src/app/srs_app_http_hooks.cpp:401][errno=11]
thread [40][x5l48q7b]: do_post() [./src/app/srs_app_http_hooks.cpp:638][errno=11]

[error] 2023/08/22 12:03:20.076984 [52][1001] Serve /terraform/v1/hooks/srs/hls failed, err is stat ./objs/nginx/html/live/stream-44572-2739617660809856576-1.ts: no such file or directory
invalid ts file ./objs/nginx/html/live/stream-44572-2739617660809856576-1.ts
main.handleOnHls.func1.1
	/g/platform/srs-hooks.go:684
main.handleOnHls.func1
	/g/platform/srs-hooks.go:720
net/http.HandlerFunc.ServeHTTP
	/usr/local/go/src/net/http/server.go:2084
net/http.(*ServeMux).ServeHTTP
	/usr/local/go/src/net/http/server.go:2462
net/http.serverHandler.ServeHTTP
	/usr/local/go/src/net/http/server.go:2916
net/http.(*conn).serve
	/usr/local/go/src/net/http/server.go:1966
runtime.goexit
	/usr/local/go/src/runtime/asm_amd64.s:1571
```

Similarly, when stopping the stream, on_hls will also be called to
handle the last slice. If the API Server is slower at this time, it will
enter hls_dispose and call unpublish repeatedly. Since the previous
unpublish is still blocked in on_hls, the following interference log
will appear:

```
[2023-08-22 12:03:18.748][INFO][40][6498088c] hls cycle to dispose hls /live/stream-44572-2739617660809856576, timeout=10000000ms
[2023-08-22 12:03:18.752][WARN][40][6498088c][115] flush audio ignored, for segment is not open.
[2023-08-22 12:03:18.752][WARN][40][6498088c][115] ignore the segment close, for segment is not open.
```

Although this log will not cause problems, it can interfere with
judgment.

The solution is to add an 'unpublishing' status. If it is in the
'unpublishing' status, then do not clean up the slices.

---------

Co-authored-by: Haibo Chen <495810242@qq.com>
2023-08-28 11:41:08 +08:00
Winlin
cf46dae80f Support include empty config file. v5.0.173 v6.0.68 (#3768)
SRS supports including another configuration in the include package.
When generating configurations, we can only generate the changed
configurations, while the unchanged configurations are in the fixed
files, for example:

```nginx
listen 1935;
include server.conf;
```

In `server.conf`, we can manage the changing configurations with the
program:

```nginx
http_api { enabled on; }
```

However, during system initialization, we often create an empty
`server.conf`, and the content is generated only after the program
starts, so `server.conf` might be an empty file. This also makes it
convenient to use a script to confirm the existence of this file:

```bash
touch server.conf
```

Currently, SRS does not support empty configurations and will report an
error. This PR is to solve this problem, making it more convenient to
use include.

`TRANS_BY_GPT4`

---------

Co-authored-by: Haibo Chen <495810242@qq.com>
2023-08-28 10:53:27 +08:00
winlin
a1c7b9f2ba Release v6.0-d0, 6.0 dev0, v6.0.59, 166739 lines. 2023-07-10 08:17:28 +08:00
Winlin
cb44e81d83
Switch to 5.0 document, because it's beta now. (#3609)
------

Co-authored-by: john <hondaxiao@tencent.com>
2023-06-30 06:01:56 +08:00
Winlin
0ce2983e44
TOC: Welcome to the new TOC member, ZhangJunqin. (#3579)
------

Co-authored-by: ChenGH <chengh_math@126.com>
Co-authored-by: Haibo Chen <495810242@qq.com>
Co-authored-by: LiPeng <lipeng19811218@gmail.com>
2023-06-13 10:24:40 +08:00
chundonglinlin
27f9db9762
SSL: Fix SSL_get_error get the error of other coroutine. v5.0.155, v6.0.46 (#3513)
---------

Co-authored-by: john <hondaxiao@tencent.com>
Co-authored-by: winlin <winlin@vip.126.com>
2023-05-29 13:00:41 +08:00
winlin
665c30af90 Release v6.0.45, a development version.
Release v5.0-b0, 5.0 beta0, v5.0.155, 162600 lines.

PICK 6e77653cdc
2023-05-14 13:14:11 +08:00
Winlin
78f1ebfcb1
Improve README and documents with AI. v5.0.153. v6.0.43 (#3538)
* Improve README with AI and add new features

1. Update README file with AI to make it more informative and user-friendly
2. Add a detailed table of contents (TOC) with an introduction for easy navigation
3. Introduce an auto-detecting Automake feature that displays the correct installation command
4. Add support for SRT to HTTP-TS config file
5. Refine the WHIP delete location URL
6. Add support for disabling encryption for WHIP or WHEP

This pull request aims to enhance the quality of the project by introducing innovative features and making the necessary updates. These updates will help users navigate the project more efficiently while also improving the overall project's quality.

---------

Co-authored-by: ChenGH <chengh_math@126.com>
Co-authored-by: john <hondaxiao@tencent.com>
2023-05-12 17:18:30 +08:00
winlin
99ca66ddc8 Add new contributors. 2023-02-21 09:13:40 +08:00
winlin
b6cb5b9cd7 Release v5.0-a4, 5.0 alpha4, v5.0.141, 161897 lines.
PICK af7f5b3c55
2023-02-12 16:27:26 +08:00
winlin
1d11d02e4b Update the dev code for SRS 2023-01-31 16:19:28 +08:00
winlin
6dd1536186 Update backer link. 2023-01-29 19:27:29 +08:00
winlin
8ea7d8b33f Scorecard: Add OpenSSF Best Practics badge. 2023-01-11 11:55:42 +08:00
Winlin
d34085615b
Create scorecard.yml (#3374) 2023-01-10 21:17:13 +08:00
winlin
2f7e474853 Merge branch v5.0.112 into develop
1. SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112 (#3323)
2. GB28181: Fix memory overlap for small packets. v5.0.111 (#3315)
3. FLV: Support set default has_av and disable guessing. v5.0.110 (#3311)
4. FLV: Drop packet if header flag is not matched. v5.0.109 (#3306)
5. FLV: Reset has_audio or has_video if only sequence header. (#3310)
2022-12-18 11:44:29 +08:00
winlin
e6f40bd0c7 Release v5.0-a2, 5.0 alpha2, v5.0.112, 161233 lines. 2022-12-18 09:55:57 +08:00
winlin
56be854f36 Update README. 2022-12-09 08:04:58 +08:00
winlin
fa177679a6 Merge 5.0.100, v5.0-a1 into develop. 2022-12-01 23:13:56 +08:00
winlin
8adb1693cc Release v5.0-a1, 5.0 alpha1, v5.0.100, 160817 lines. 2022-12-01 23:10:21 +08:00
winlin
79d096ae91 Merge branch 5.0.98 into develop
1. Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines.
2022-11-25 16:46:26 +08:00
winlin
aa5496aa69 Release v5.0-a0, 5.0 alpha0, v5.0.98, 159813 lines. 2022-11-25 13:41:38 +08:00
winlin
9b7db9aa68 DASH: Update README for MPEG-DASH. 2022-11-24 18:45:52 +08:00
winlin
56bf2a421f Merge 5.0release 2022-11-23 18:53:52 +08:00
winlin
237d60a55d Coverage: Refine the codecov link. 2022-11-23 18:30:47 +08:00
winlin
0b955b4166 Update README for SRS 6.0 2022-11-22 12:49:19 +08:00
winlin
d2a526ae6a Develop is SRS 6.0 now.
This reverts commit daa7fd2247.
2022-11-22 12:44:49 +08:00
winlin
daa7fd2247 Create 5.0release branch, features freezed. 2022-11-22 12:41:57 +08:00
winlin
cdbebb3729 Merge branch '4.0release' into develop 2022-11-22 11:25:06 +08:00
winlin
2573a25101 Release v4.0-r4, 4.0 release4, v4.0.268, 145482 lines. 2022-11-22 11:01:56 +08:00
winlin
8dcbcd1656 GB28181: Update README for GB28181. 2022-10-26 21:30:40 +08:00
winlin
f02656f946 Merge branch '4.0release' into develop 2022-09-16 10:14:12 +08:00
winlin
64c2ac8176 Release v4.0-r3, 4.0 release3, v4.0.265, 145328 lines. 2022-09-16 10:10:35 +08:00
winlin
18d25eacfb Merge 4.0release 2022-08-24 19:26:47 +08:00