Skip to content

Commit

Permalink
Support new origin cluster architecture. (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
@winlinvip
winlinvip authored Sep 5, 2024
1 parent 5815d9a commit 3a7efe5
Show file tree
Hide file tree
Showing 176 changed files with 568 additions and 269 deletions.
4 changes: 2 additions & 2 deletions i18n/en-us/docusaurus-plugin-content-docs/current/doc/arm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ SRS configure options for cross build:
Presets:
--cross-build Enable cross-build, please set bellow Toolchain also. Default: off

Cross Build options: @see https://ossrs.io/lts/en-us/docs/v6/doc/arm#ubuntu-cross-build-srs
Cross Build options: @see https://ossrs.io/lts/en-us/docs/v7/doc/arm#ubuntu-cross-build-srs
--cpu=<CPU> Toolchain: Select the minimum required CPU. For example: --cpu=24kc
--arch=<ARCH> Toolchain: Select architecture. For example: --arch=aarch64
--host=<BUILD> Toolchain: Build programs to run on HOST. For example: --host=aarch64-linux-gnu
Expand All @@ -173,6 +173,6 @@ Toolchain options:

Winlin 2014.11

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/arm)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/arm)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/client-sdk.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ Although the number of PC users are smaller, there are still some use scenarios

Winlin 2017.4

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/client-sdk)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/client-sdk)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/cloud.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ hide_table_of_contents: false

Migrated to [Cloud](/cloud)

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/cloud)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/cloud)
2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/delivery-hds.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ The config items are similar to HLS, read [HLS config](./hls.md#hls-config)

Winlin 2015.3

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/delivery-hds)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/delivery-hds)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/delivery-hls.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ hide_table_of_contents: false

Migrated to [HLS](./hls.md).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/delivery-hls)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/delivery-hls)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/delivery-http-flv.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ hide_table_of_contents: false

Migrated to [HTTP-FLV](./flv.md).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/delivery-http-flv)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/delivery-http-flv)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/delivery-rtmp.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ hide_table_of_contents: false

Migrated to [RTMP](./rtmp.md).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/delivery-rtmp)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/delivery-rtmp)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/drm.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,6 @@ SRS does not support.

Winlin 2015.8

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/drm)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/drm)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/dvr.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,6 @@ The changing of dvr and reload will restart the dvr, that is, to close current d

Winlin 2015.1

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/dvr)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/dvr)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/edge.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,6 @@ For more information, read the config of edge server.

Winlin 2015.4

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/edge)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/edge)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/exporter.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,5 @@ There are more other dashboards, please get them in [srs-grafana](https://github

Any patch is welcome.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/exporter)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/exporter)

2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/ffmpeg.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,6 @@ FFMPEG links:

Winlin 2015.6

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/ffmpeg)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/ffmpeg)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/flv-vod-stream.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ Read [HTTP Server](./http-server.md#config)

Winlin 2015.1

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/flv-vod-stream)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/flv-vod-stream)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/flv.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,5 @@ Why use HTTP FLV? HTTP FLV streaming is becoming more popular. The main advantag
5. Universality: Flash can play both RTMP and HTTP FLV. Custom apps and mainstream players also support HTTP FLV playback.
6. Simplicity: FLV is the simplest streaming media encapsulation, and HTTP is the most widely used protocol. Combining these two makes maintenance much easier than RTMP.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.net&path=/lts/doc/en/v6/flv)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.net&path=/lts/doc/en/v7/flv)

2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/forward.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,6 @@ stream to slave. Then all stream on slave is h.264+aac, to delivery HLS.

Winlin 2014.11

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/forward)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/forward)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/getting-started-build.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,6 @@ Normally you're able to build SRS on both ARM or MIPS servers.

If need to cross-build SRS for embed devices, pelase read [ARM and CrossBuild](./arm.md).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/getting-started-build)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/getting-started-build)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/getting-started-k8s.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ Compared to Docker, HELM and K8s are mainly for medium to large scale deployment
big, we recommend using Docker or Oryx directly. Generally, if you have less than a thousand streams, please
do not use HELM or K8s.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/getting-started-k8s)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/getting-started-k8s)


4 changes: 2 additions & 2 deletions i18n/en-us/docusaurus-plugin-content-docs/current/doc/getting-started-oryx.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ All responses should use:
* `Status: 200 OK` and `{"code": 0}` for success.
* Otherwise, error or fail.

See examples in [HTTP Callback](../docs/v6/doc/http-callback#go-example)
See examples in [HTTP Callback](../docs/v7/doc/http-callback#go-example)

### HTTP Callback: Connectivity Check

Expand Down Expand Up @@ -419,6 +419,6 @@ Response:
* The `result` is the OCR result.
* Ignore any response error.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/getting-started-oryx)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/getting-started-oryx)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@ SRS uses a configuration at the virtual host (vhost) level. All applications(app
same vhost share this configuration. For more information, please refer to the [RTMP URL](./rtmp-url-vhost.md)
documentation.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/getting-started)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/getting-started)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/git.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ The release branch is more stable than develop.

Winlin 2014.11

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/git)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/git)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/gperf.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ hide_table_of_contents: false

No English version, please read [v4_CN_GPERF](./gperf.md) or [SRS性能(CPU)、内存优化工具用法](https://www.jianshu.com/p/6d4a89359352)

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/gperf)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/gperf)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/gprof.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ hide_table_of_contents: false

Please read [SRS性能(CPU)、内存优化工具用法](https://www.jianshu.com/p/6d4a89359352)

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/gprof)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/gprof)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/hevc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,6 @@ We will merge some of these commits to SRS 6.0, but not all commits.
3. Almost all browsers supports MSE, except iOS. HEVC over MSE requires hardware decoder.
4. Apart from mpegts.js, other H5 players such as hls.js/dash.js doesn't support HEVC.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/hevc)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/hevc)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/hls.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,5 +495,5 @@ https://developer.apple.com/library/ios/technotes/tn2288/_index.html

SRS3 supports slice encryption, for specific usage, refer to [#1093](https://github.com/ossrs/srs/issues/1093#issuecomment-415971022).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/hls)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/hls)

2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/http-api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,6 @@ To clean up the username and password, you can access the HTTP API with the user
Winlin 2015.8

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/http-api)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/http-api)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/http-callback.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,6 @@ The HttpCallback can used to snapshot, please read [snapshot](./snapshot.md#http

Winlin 2015.1

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/http-callback)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/http-callback)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/http-server.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,6 @@ cd $GOPATH/bin
Winlin 2015.1

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/http-server)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/http-server)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/ide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ Read [http://www.jetbrains.com/clion/](http://www.jetbrains.com/clion/)

Winlin 2015.10

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/ide)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/ide)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/ingest.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ Read https://github.com/ossrs/srs/issues/55

Winlin 2014.11

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/ingest)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/ingest)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/install.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ For ARM/MIPS or crossbuild, please read [here](./arm.md)

Winlin 2014.11

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/install)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/install)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/introduction.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,6 @@ The value of open-source will grow, and community support will increase.
Oryx is a lightweight, open-source video cloud solution based on Go, Reactjs, SRS, FFmpeg, WebRTC,
and more. For more details, please refer to [Oryx](./getting-started-oryx.md).

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/introduction)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/introduction)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/k8s.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,6 @@ Coming soon...

Winlin 2020.02

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/k8s)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/k8s)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/learning-path.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ From：jianshu.com

The copyright belongs to the author. For commercial reproduction, please contact the author for authorization, and for non-commercial reproduction, please cite the source.

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/learning-path)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/learning-path)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/log-rotate.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ END

Winlin 2016.12

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/log-rotate)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/log-rotate)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/log.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,6 @@ To startup with default config `conf/srs.conf`:

Winlin 2014.10

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/log)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/log)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/low-latency.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,6 @@ Read ![Edge-latency](/img/doc-main-concepts-low-latency-002.png)

Winlin 2015.8

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/low-latency)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/low-latency)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/nginx-exec.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ Winlin 2015.8

[ne]: https://github.com/arut/nginx-rtmp-module/wiki/Directives#exec

![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/nginx-exec)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/nginx-exec)


2 changes: 1 addition & 1 deletion i18n/en-us/docusaurus-plugin-content-docs/current/doc/nginx-for-hls.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,6 @@ If you are using aaPanel, you can add a new site, and then write the following c

> Note: Generally, when adding a new site in aaPanel, it listens to port 80, and the domain server_name is the domain name you fill in yourself. Other configurations are the same as the aaPanel settings. Alternatively, you can also add the above cache and location configurations to the site settings in aaPanel.
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v6/nginx-for-hls)
![](https://ossrs.io/gif/v1/sls.gif?site=ossrs.io&path=/lts/doc/en/v7/nginx-for-hls)


Loading

0 comments on commit 3a7efe5

Please sign in to comment.