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

Merge srs2

Browse source
This commit is contained in:
winlin 2017-02-11 13:55:45 +08:00
commit af0d98619a
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
README.md
View file

@ -16,25 +16,25 @@ For the wiki for SRS/3.0, please read [Chinese][srs_CN] or [English][srs_EN].
* [About](#about) * [About](#about)
* [Product](#product) * [Product](#product)
* [Usage](#usage) * [Usage](#usage)
* [Wiki for v3.0](#srs-30-wiki) * [Wiki for v3.0](#srs-30-wiki)
* [Wiki for v2.0](#srs-20-wiki) * [Wiki for v2.0](#srs-20-wiki)
* [Wiki for v1.0](#srs-10-wiki) * [Wiki for v1.0](#srs-10-wiki)
* [Features](#features) * [Features](#features)
* [v3.0 changes](#v3-changes) * [v3.0 changes](#v3-changes)
* [v2.0 changes](#v2-changes) * [v2.0 changes](#v2-changes)
* [v1.0 changes](#v1-changes) * [v1.0 changes](#v1-changes)
* [Releases](#releases) * [Releases](#releases)
* [Compare](#compare) * [Compare](#compare)
* [Performance](#performance) * [Performance](#performance)
* [Architecture](#architecture) * [Architecture](#architecture)
* [System Architecture](#system-architecture) * [System Architecture](#system-architecture)
* [Modularity Architecture](#modularity-architecture) * [Modularity Architecture](#modularity-architecture)
* [Stream Architecture](#stream-architecture) * [Stream Architecture](#stream-architecture)
* [Tips](#tips) * [Tips](#tips)
* [Authors](#authors) * [Authors](#authors)
* [Mirrors](#mirrors) * [Mirrors](#mirrors)
* [System Requirements](#system-requirements) * [System Requirements](#system-requirements)
## About ## About
@ -871,9 +871,9 @@ Remark:
### Stream Architecture ### Stream Architecture
``` ```
+---------+ +----------+ +---------+ +----------+
| Publish | | Deliver | | Publish | | Deliver |
+---|-----+ +----|-----+ +---|-----+ +----|-----+
+----------------------+-------------------------+----------------+ +----------------------+-------------------------+----------------+
| Input | SRS(Simple RTMP Server) | Output | | Input | SRS(Simple RTMP Server) | Output |
+----------------------+-------------------------+----------------+ +----------------------+-------------------------+----------------+