winlin

refine readme, add exec for stream arch

正在显示 1 个修改的文件 包含 10 行增加6 行删除
@@ -815,6 +815,7 @@ SRS always use the most simple architecture to support complex transaction. @@ -815,6 +815,7 @@ SRS always use the most simple architecture to support complex transaction.
815 | Flash,XSPLIT, | +-> FLV/MP3/Aac/Ts ---+-> HTTP player | 815 | Flash,XSPLIT, | +-> FLV/MP3/Aac/Ts ---+-> HTTP player |
816 | ......) | +-> Fowarder ---------+-> RTMP server | 816 | ......) | +-> Fowarder ---------+-> RTMP server |
817 | | +-> Transcoder -------+-> RTMP server | 817 | | +-> Transcoder -------+-> RTMP server |
  818 +| | +-> EXEC(5) ----------+-> External app |
818 | | +-> DVR --------------+-> Flv file | 819 | | +-> DVR --------------+-> Flv file |
819 | | +-> BandwidthTest ----+-> flash | 820 | | +-> BandwidthTest ----+-> flash |
820 +----------------------+ | | 821 +----------------------+ | |
@@ -834,12 +835,11 @@ SRS always use the most simple architecture to support complex transaction. @@ -834,12 +835,11 @@ SRS always use the most simple architecture to support complex transaction.
834 </pre> 835 </pre>
835 836
836 Remark: 837 Remark:
837 -  
838 -* Encoder: encoder must push RTMP stream to SRS server.  
839 -* MediaSource: any media source, which can be ingest by ffmpeg.  
840 -* Ingester: SRS will fork a process to run ffmpeg(or your application) to ingest any input to rtmp, push to SRS. Read [Ingest][v1_CN_Ingest].  
841 -* Streamer: SRS will listen for some protocol and accept stream push  
842 -over some protocol and remux to rtmp to SRS. Read <a href="https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer">Streamer</a>. 838 +1. Encoder: Encoder must push RTMP stream to SRS server.
  839 +1. MediaSource: Any media source, which can be ingest by ffmpeg.
  840 +1. Ingester: SRS fork a ffmpeg(or application) to ingest something to rtmp to SRS. Read [Ingest][v1_CN_Ingest].
  841 +1. Streamer: SRS listen to remux some protocol to rtmp to SRS. Read [Streamer][v2_CN_Streamer].
  842 +1. EXEC: SRS exec external application when got event, read [ng-exec][v3_CN_NgExec].
843 843
844 Beijing, 2013.10<br/> 844 Beijing, 2013.10<br/>
845 Winlin 845 Winlin
@@ -987,6 +987,8 @@ Winlin @@ -987,6 +987,8 @@ Winlin
987 [v2_EN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHttpStream 987 [v2_EN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHttpStream
988 [v1_CN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHDS 988 [v1_CN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHDS
989 [v1_EN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHDS 989 [v1_EN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHDS
  990 +[v2_CN_Streamer]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer
  991 +[v2_EN_Streamer]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer
990 [v2_CN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs 992 [v2_CN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs
991 [v2_EN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs 993 [v2_EN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs
992 [v2_CN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlv 994 [v2_CN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlv
@@ -1012,6 +1014,8 @@ Winlin @@ -1012,6 +1014,8 @@ Winlin
1012 [v2_EN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write 1014 [v2_EN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write
1013 [v1_CN_IDE]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE 1015 [v1_CN_IDE]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE
1014 [v2_CN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write 1016 [v2_CN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write
  1017 +[v3_CN_NgExec]:https://github.com/simple-rtmp-server/srs/wiki/v3_CN_NgExec
  1018 +[v3_EN_NgExec]:https://github.com/simple-rtmp-server/srs/wiki/v3_EN_NgExec
1015 1019
1016 [bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 1020 [bug #213]: https://github.com/simple-rtmp-server/srs/issues/213
1017 [bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 1021 [bug #194]: https://github.com/simple-rtmp-server/srs/issues/194