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

rename org simple-rtmp-server to ossrs

Browse source
This commit is contained in:
winlin 2015-11-11 10:37:50 +08:00
parent 1d8318d2fc
commit 1ffd5fd455
241 changed files with 957 additions and 957 deletions
Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

740
README.md
View file

@ -68,10 +68,10 @@ A big THANK YOU goes to:
## Mirrors ## Mirrors
Github: [https://github.com/simple-rtmp-server/srs][srs], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git]) Github: [https://github.com/ossrs/srs][srs], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
``` ```
git clone https://github.com/simple-rtmp-server/srs.git git clone https://github.com/ossrs/srs.git
``` ```
CSDN: [https://code.csdn.net/winlinvip/srs-csdn][csdn], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git]) CSDN: [https://code.csdn.net/winlinvip/srs-csdn][csdn], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
@ -97,7 +97,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git
<strong>Step 1:</strong> get SRS <strong>Step 1:</strong> get SRS
<pre> <pre>
git clone https://github.com/simple-rtmp-server/srs && git clone https://github.com/ossrs/srs &&
cd srs/trunk cd srs/trunk
</pre> </pre>
@ -152,7 +152,7 @@ Donation:<br/>
[http://www.ossrs.net/srs.release/donation/index.html][donation1] [http://www.ossrs.net/srs.release/donation/index.html][donation1]
Donations:<br/> Donations:<br/>
[https://github.com/simple-rtmp-server/srs/blob/develop/DONATIONS.txt][donations] [https://github.com/ossrs/srs/blob/develop/DONATIONS.txt][donations]
## System Requirements ## System Requirements
Supported operating systems and hardware: Supported operating systems and hardware:
@ -846,40 +846,40 @@ Remark:
(1) Encoder: encoder must push RTMP stream to SRS server. (1) Encoder: encoder must push RTMP stream to SRS server.
(2) MediaSource: any media source, which can be ingest by ffmpeg. (2) MediaSource: any media source, which can be ingest by ffmpeg.
(3) Ingester: SRS will fork a process to run ffmpeg(or your application) (3) Ingester: SRS will fork a process to run ffmpeg(or your application)
to ingest any input to rtmp, push to SRS. Read <a href="https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Ingest">Ingest</a>. to ingest any input to rtmp, push to SRS. Read <a href="https://github.com/ossrs/srs/wiki/v1_CN_Ingest">Ingest</a>.
(4) Streamer: SRS will listen for some protocol and accept stream push (4) Streamer: SRS will listen for some protocol and accept stream push
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>. over some protocol and remux to rtmp to SRS. Read <a href="https://github.com/ossrs/srs/wiki/v2_CN_Streamer">Streamer</a>.
</pre> </pre>
Beijing, 2013.10<br/> Beijing, 2013.10<br/>
Winlin Winlin
[p1]: https://github.com/simple-rtmp-server/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8 [p1]: https://github.com/ossrs/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8
[p2]: https://github.com/simple-rtmp-server/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf [p2]: https://github.com/ossrs/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf
[p3]: https://github.com/simple-rtmp-server/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff [p3]: https://github.com/ossrs/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff
[p4]: https://github.com/simple-rtmp-server/srs/commit/f57801eb46c16755b173984b915a4166922df6a6 [p4]: https://github.com/ossrs/srs/commit/f57801eb46c16755b173984b915a4166922df6a6
[p5]: https://github.com/simple-rtmp-server/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da [p5]: https://github.com/ossrs/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da
[p6]: https://github.com/simple-rtmp-server/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be [p6]: https://github.com/ossrs/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be
[p7]: https://github.com/simple-rtmp-server/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247 [p7]: https://github.com/ossrs/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247
[p8]: https://github.com/simple-rtmp-server/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1 [p8]: https://github.com/ossrs/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1
[p9]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 [p9]: https://github.com/ossrs/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5
[p10]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 [p10]: https://github.com/ossrs/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5
[p11]: https://github.com/simple-rtmp-server/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004 [p11]: https://github.com/ossrs/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004
[p12]: https://github.com/simple-rtmp-server/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8 [p12]: https://github.com/ossrs/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8
[p13]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 [p13]: https://github.com/ossrs/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8
[p14]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 [p14]: https://github.com/ossrs/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8
[p15]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc [p15]: https://github.com/ossrs/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc
[p16]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc [p16]: https://github.com/ossrs/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc
[p17]: https://github.com/simple-rtmp-server/srs/commit/fc995473eb02c7cf64b5b212b456e11f34aa7984 [p17]: https://github.com/ossrs/srs/commit/fc995473eb02c7cf64b5b212b456e11f34aa7984
[p18]: https://github.com/simple-rtmp-server/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73 [p18]: https://github.com/ossrs/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73
[p19]: https://github.com/simple-rtmp-server/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9 [p19]: https://github.com/ossrs/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9
[p20]: https://github.com/simple-rtmp-server/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a [p20]: https://github.com/ossrs/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a
[p21]: https://github.com/simple-rtmp-server/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c [p21]: https://github.com/ossrs/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c
[p22]: https://github.com/simple-rtmp-server/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa [p22]: https://github.com/ossrs/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa
[p23]: https://github.com/simple-rtmp-server/srs/pull/239 [p23]: https://github.com/ossrs/srs/pull/239
[authors]: https://github.com/simple-rtmp-server/srs/blob/develop/AUTHORS.txt [authors]: https://github.com/ossrs/srs/blob/develop/AUTHORS.txt
[bigthanks]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#bigthanks [bigthanks]: https://github.com/ossrs/srs/wiki/v1_CN_Product#bigthanks
[st]: https://github.com/winlinvip/state-threads [st]: https://github.com/winlinvip/state-threads
[st2]: http://sourceforge.net/projects/state-threads/ [st2]: http://sourceforge.net/projects/state-threads/
[state-threads]: http://sourceforge.net/projects/state-threads/ [state-threads]: http://sourceforge.net/projects/state-threads/
@ -888,362 +888,362 @@ Winlin
[nginx]: http://nginx.org/ [nginx]: http://nginx.org/
[FFMPEG]: http://ffmpeg.org/ [FFMPEG]: http://ffmpeg.org/
[libx264]: http://www.videolan.org/ [libx264]: http://www.videolan.org/
[srs]: https://github.com/simple-rtmp-server/srs [srs]: https://github.com/ossrs/srs
[csdn]: https://code.csdn.net/winlinvip/srs-csdn [csdn]: https://code.csdn.net/winlinvip/srs-csdn
[oschina]: http://git.oschina.net/winlinvip/srs.oschina [oschina]: http://git.oschina.net/winlinvip/srs.oschina
[srs-dolphin]: https://github.com/simple-rtmp-server/srs-dolphin [srs-dolphin]: https://github.com/ossrs/srs-dolphin
[srs-bench]: https://github.com/simple-rtmp-server/srs-bench [srs-bench]: https://github.com/ossrs/srs-bench
[srs-ngb]: https://github.com/simple-rtmp-server/srs-ngb [srs-ngb]: https://github.com/ossrs/srs-ngb
[srs-librtmp]: https://github.com/simple-rtmp-server/srs-librtmp [srs-librtmp]: https://github.com/ossrs/srs-librtmp
[gitlab]: https://gitlab.com/winlinvip/srs-gitlab [gitlab]: https://gitlab.com/winlinvip/srs-gitlab
[console]: http://ossrs.net:1985/console [console]: http://ossrs.net:1985/console
[v1_CN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Git [v1_CN_Git]: https://github.com/ossrs/srs/wiki/v1_CN_Git
[v1_EN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Git [v1_EN_Git]: https://github.com/ossrs/srs/wiki/v1_EN_Git
[v1_CN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMP [v1_CN_SampleRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleRTMP
[v1_EN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleRTMP [v1_EN_SampleRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleRTMP
[v1_CN_SampleRTMPCluster]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMPCluster [v1_CN_SampleRTMPCluster]: https://github.com/ossrs/srs/wiki/v1_CN_SampleRTMPCluster
[v1_EN_SampleRTMPCluster]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleRTMPCluster [v1_EN_SampleRTMPCluster]: https://github.com/ossrs/srs/wiki/v1_EN_SampleRTMPCluster
[v2_CN_SampleHLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHLS [v2_CN_SampleHLS]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHLS
[v2_EN_SampleHLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHLS [v2_EN_SampleHLS]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHLS
[v2_CN_SampleTranscode2HLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleTranscode2HLS [v2_CN_SampleTranscode2HLS]: https://github.com/ossrs/srs/wiki/v2_CN_SampleTranscode2HLS
[v2_EN_SampleTranscode2HLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleTranscode2HLS [v2_EN_SampleTranscode2HLS]: https://github.com/ossrs/srs/wiki/v2_EN_SampleTranscode2HLS
[v2_CN_SampleFFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleFFMPEG [v2_CN_SampleFFMPEG]: https://github.com/ossrs/srs/wiki/v2_CN_SampleFFMPEG
[v2_EN_SampleFFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleFFMPEG [v2_EN_SampleFFMPEG]: https://github.com/ossrs/srs/wiki/v2_EN_SampleFFMPEG
[v1_CN_SampleForward]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleForward [v1_CN_SampleForward]: https://github.com/ossrs/srs/wiki/v1_CN_SampleForward
[v1_EN_SampleForward]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleForward [v1_EN_SampleForward]: https://github.com/ossrs/srs/wiki/v1_EN_SampleForward
[v2_CN_SampleRealtime]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleRealtime [v2_CN_SampleRealtime]: https://github.com/ossrs/srs/wiki/v2_CN_SampleRealtime
[v2_EN_SampleRealtime]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleRealtime [v2_EN_SampleRealtime]: https://github.com/ossrs/srs/wiki/v2_EN_SampleRealtime
[v1_CN_SampleARM]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleARM [v1_CN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_CN_SampleARM
[v1_EN_SampleARM]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleARM [v1_EN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_EN_SampleARM
[v1_CN_SampleIngest]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleIngest [v1_CN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest
[v1_EN_SampleIngest]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleIngest [v1_EN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_EN_SampleIngest
[v1_CN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHTTP [v1_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleHTTP
[v1_EN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleHTTP [v1_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleHTTP
[v1_CN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
[v1_EN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleDemo [v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo
[v2_CN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data [v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data
[v2_EN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data [v2_EN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data
[v1_CN_Sample]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Sample [v1_CN_Sample]: https://github.com/ossrs/srs/wiki/v1_CN_Sample
[v1_EN_Sample]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Sample [v1_EN_Sample]: https://github.com/ossrs/srs/wiki/v1_EN_Sample
[v1_CN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product [v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product
[v1_EN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Product [v1_EN_Product]: https://github.com/ossrs/srs/wiki/v1_EN_Product
[v1_CN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Home [v1_CN_Home]: https://github.com/ossrs/srs/wiki/v1_CN_Home
[v1_EN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Home [v1_EN_Home]: https://github.com/ossrs/srs/wiki/v1_EN_Home
[v2_CN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Home [v2_CN_Home]: https://github.com/ossrs/srs/wiki/v2_CN_Home
[v2_EN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home [v2_EN_Home]: https://github.com/ossrs/srs/wiki/v2_EN_Home
[donation0]: http://winlinvip.github.io/srs.release/donation/index.html [donation0]: http://winlinvip.github.io/srs.release/donation/index.html
[donation1]: http://www.ossrs.net/srs.release/donation/index.html [donation1]: http://www.ossrs.net/srs.release/donation/index.html
[donations]: https://github.com/simple-rtmp-server/srs/blob/develop/DONATIONS.txt [donations]: https://github.com/ossrs/srs/blob/develop/DONATIONS.txt
[v2_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Build [v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build
[v2_EN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Build [v2_EN_Build]: https://github.com/ossrs/srs/wiki/v2_EN_Build
[v1_CN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance [v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance
[v1_EN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Performance [v1_EN_Performance]: https://github.com/ossrs/srs/wiki/v1_EN_Performance
[v1_CN_DeliveryRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryRTMP [v1_CN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryRTMP
[v1_EN_DeliveryRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryRTMP [v1_EN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryRTMP
[v1_CN_Edge]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Edge [v1_CN_Edge]: https://github.com/ossrs/srs/wiki/v1_CN_Edge
[v1_EN_Edge]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Edge [v1_EN_Edge]: https://github.com/ossrs/srs/wiki/v1_EN_Edge
[v1_CN_RtmpUrlVhost]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RtmpUrlVhost [v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost
[v1_EN_RtmpUrlVhost]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_RtmpUrlVhost [v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost
[v1_CN_DeliveryHLS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHLS [v1_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS
[v1_EN_DeliveryHLS]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHLS [v1_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS
[v1_CN_DeliveryHLS2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly [v1_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly
[v1_EN_DeliveryHLS2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly [v1_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly
[v1_CN_Reload]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Reload [v1_CN_Reload]: https://github.com/ossrs/srs/wiki/v1_CN_Reload
[v1_EN_Reload]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Reload [v1_EN_Reload]: https://github.com/ossrs/srs/wiki/v1_EN_Reload
[v1_CN_LowLatency2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency#gop-cache [v1_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency#gop-cache
[v1_EN_LowLatency2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_LowLatency#gop-cache [v1_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_EN_LowLatency#gop-cache
[v1_CN_Forward]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Forward [v1_CN_Forward]: https://github.com/ossrs/srs/wiki/v1_CN_Forward
[v1_EN_Forward]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Forward [v1_EN_Forward]: https://github.com/ossrs/srs/wiki/v1_EN_Forward
[v1_CN_FFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_FFMPEG [v1_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG
[v1_EN_FFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_FFMPEG [v1_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_EN_FFMPEG
[v1_CN_HTTPCallback]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HTTPCallback [v1_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPCallback
[v1_EN_HTTPCallback]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_HTTPCallback [v1_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPCallback
[v1_CN_BandwidthTestTool]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_BandwidthTestTool [v1_CN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_CN_BandwidthTestTool
[v1_EN_BandwidthTestTool]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_BandwidthTestTool [v1_EN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_EN_BandwidthTestTool
[v1_CN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo [v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
[v1_EN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleDemo [v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo
[v2_CN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp [v2_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp
[v2_EN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SrsLibrtmp [v2_EN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_EN_SrsLibrtmp
[v1_CN_SrsLinuxArm]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm [v1_CN_SrsLinuxArm]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm
[v1_EN_SrsLinuxArm]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SrsLinuxArm [v1_EN_SrsLinuxArm]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLinuxArm
[v1_CN_LinuxService]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LinuxService [v1_CN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService
[v1_EN_LinuxService]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_LinuxService [v1_EN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_EN_LinuxService
[v1_CN_RTMP-ATC]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RTMP-ATC [v1_CN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_CN_RTMP-ATC
[v1_EN_RTMP-ATC]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_RTMP-ATC [v1_EN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_EN_RTMP-ATC
[v1_CN_HTTPApi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HTTPApi [v1_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPApi
[v1_EN_HTTPApi]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_HTTPApi [v1_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPApi
[v1_CN_Ingest]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Ingest [v1_CN_Ingest]: https://github.com/ossrs/srs/wiki/v1_CN_Ingest
[v1_EN_Ingest]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Ingest [v1_EN_Ingest]: https://github.com/ossrs/srs/wiki/v1_EN_Ingest
[v1_CN_DVR]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DVR [v1_CN_DVR]: https://github.com/ossrs/srs/wiki/v1_CN_DVR
[v1_EN_DVR]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DVR [v1_EN_DVR]: https://github.com/ossrs/srs/wiki/v1_EN_DVR
[v1_CN_SrsLog]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLog [v1_CN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog
[v1_EN_SrsLog]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SrsLog [v1_EN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLog
[v1_CN_DRM2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse [v1_CN_DRM2]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse
[v1_EN_DRM2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DRM#tokentraverse [v1_EN_DRM2]: https://github.com/ossrs/srs/wiki/v1_EN_DRM#tokentraverse
[v2_CN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHTTP [v2_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHTTP
[v2_EN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHTTP [v2_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHTTP
[v2_CN_FlvVodStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_FlvVodStream [v2_CN_FlvVodStream]: https://github.com/ossrs/srs/wiki/v2_CN_FlvVodStream
[v2_EN_FlvVodStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_FlvVodStream [v2_EN_FlvVodStream]: https://github.com/ossrs/srs/wiki/v2_EN_FlvVodStream
[v2_CN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data [v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-h264-raw-data
[v2_EN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data [v2_EN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_EN_SrsLibrtmp#publish-h264-raw-data
[v2_CN_SrsLibrtmp3]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#publish-audio-raw-stream [v2_CN_SrsLibrtmp3]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#publish-audio-raw-stream
[v2_EN_SrsLibrtmp3]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SrsLibrtmp#publish-audio-raw-stream [v2_EN_SrsLibrtmp3]: https://github.com/ossrs/srs/wiki/v2_EN_SrsLibrtmp#publish-audio-raw-stream
[v2_CN_Security]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Security [v2_CN_Security]: https://github.com/ossrs/srs/wiki/v2_CN_Security
[v2_EN_Security]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Security [v2_EN_Security]: https://github.com/ossrs/srs/wiki/v2_EN_Security
[v2_CN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream [v2_CN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
[v2_EN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHttpStream [v2_EN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHttpStream
[v1_CN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHDS [v1_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHDS
[v1_EN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHDS [v1_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHDS
[v2_CN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs [v2_CN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs
[v2_EN_Streamer2]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs [v2_EN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_EN_Streamer#push-http-flv-to-srs
[v2_CN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlv [v2_CN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlv
[v2_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv [v2_EN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHttpFlv
[v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster [v2_CN_SampleHttpFlvCluster]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlvCluster
[v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster [v2_EN_SampleHttpFlvCluster]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHttpFlvCluster
[v2_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency [v2_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency
[v2_EN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency [v2_EN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency
[v2_EN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-read [v2_EN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-read
[v1_CN_Performance#performancereport4k]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance#performancereport4k [v1_CN_Performance#performancereport4k]: https://github.com/ossrs/srs/wiki/v1_CN_Performance#performancereport4k
[v1_CN_DRM#tokentraverse]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse [v1_CN_DRM#tokentraverse]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse
[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi
[v1_CN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLibrtmp [v1_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp
[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build [v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build
[v1_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency [v1_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency
[v1_CN_HowToAskQuestion]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HowToAskQuestion [v1_CN_HowToAskQuestion]: https://github.com/ossrs/srs/wiki/v1_CN_HowToAskQuestion
[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build [v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build
[v1_CN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance [v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance
[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi [v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi
[v2_CN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-read [v2_CN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-read
[v1_CN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product [v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product
[v1_CN_ServerSideScript]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_ServerSideScript [v1_CN_ServerSideScript]: https://github.com/ossrs/srs/wiki/v1_CN_ServerSideScript
[v2_EN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write [v2_EN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-write
[v1_CN_IDE]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE [v1_CN_IDE]: https://github.com/ossrs/srs/wiki/v1_CN_IDE
[v2_CN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write [v2_CN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-write
[bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 [bug #213]: https://github.com/ossrs/srs/issues/213
[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 [bug #194]: https://github.com/ossrs/srs/issues/194
[bug #182]: https://github.com/simple-rtmp-server/srs/issues/182 [bug #182]: https://github.com/ossrs/srs/issues/182
[bug #257]: https://github.com/simple-rtmp-server/srs/issues/257 [bug #257]: https://github.com/ossrs/srs/issues/257
[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 [bug #179]: https://github.com/ossrs/srs/issues/179
[bug #224]: https://github.com/simple-rtmp-server/srs/issues/224 [bug #224]: https://github.com/ossrs/srs/issues/224
[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 [bug #251]: https://github.com/ossrs/srs/issues/251
[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 [bug #293]: https://github.com/ossrs/srs/issues/293
[bug #250]: https://github.com/simple-rtmp-server/srs/issues/250 [bug #250]: https://github.com/ossrs/srs/issues/250
[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 [bug #301]: https://github.com/ossrs/srs/issues/301
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #133]: https://github.com/simple-rtmp-server/srs/issues/133 [bug #133]: https://github.com/ossrs/srs/issues/133
[bug #92]: https://github.com/simple-rtmp-server/srs/issues/92 [bug #92]: https://github.com/ossrs/srs/issues/92
[bug #380]: https://github.com/simple-rtmp-server/srs/issues/380 [bug #380]: https://github.com/ossrs/srs/issues/380
[bug #474]: https://github.com/simple-rtmp-server/srs/issues/474 [bug #474]: https://github.com/ossrs/srs/issues/474
[bug #484]: https://github.com/simple-rtmp-server/srs/issues/484 [bug #484]: https://github.com/ossrs/srs/issues/484
[bug #485]: https://github.com/simple-rtmp-server/srs/issues/485 [bug #485]: https://github.com/ossrs/srs/issues/485
[bug #495]: https://github.com/simple-rtmp-server/srs/issues/495 [bug #495]: https://github.com/ossrs/srs/issues/495
[bug #497]: https://github.com/simple-rtmp-server/srs/issues/497 [bug #497]: https://github.com/ossrs/srs/issues/497
[bug #448]: https://github.com/simple-rtmp-server/srs/issues/448 [bug #448]: https://github.com/ossrs/srs/issues/448
[bug #475]: https://github.com/simple-rtmp-server/srs/issues/475 [bug #475]: https://github.com/ossrs/srs/issues/475
[bug #458]: https://github.com/simple-rtmp-server/srs/issues/458 [bug #458]: https://github.com/ossrs/srs/issues/458
[bug #454]: https://github.com/simple-rtmp-server/srs/issues/454 [bug #454]: https://github.com/ossrs/srs/issues/454
[bug #442]: https://github.com/simple-rtmp-server/srs/issues/442 [bug #442]: https://github.com/ossrs/srs/issues/442
[bug #169]: https://github.com/simple-rtmp-server/srs/issues/169 [bug #169]: https://github.com/ossrs/srs/issues/169
[bug #441]: https://github.com/simple-rtmp-server/srs/issues/441 [bug #441]: https://github.com/ossrs/srs/issues/441
[bug #433]: https://github.com/simple-rtmp-server/srs/issues/433 [bug #433]: https://github.com/ossrs/srs/issues/433
[bug #425]: https://github.com/simple-rtmp-server/srs/issues/425 [bug #425]: https://github.com/ossrs/srs/issues/425
[bug #424]: https://github.com/simple-rtmp-server/srs/issues/424 [bug #424]: https://github.com/ossrs/srs/issues/424
[bug #421]: https://github.com/simple-rtmp-server/srs/issues/421 [bug #421]: https://github.com/ossrs/srs/issues/421
[bug #435]: https://github.com/simple-rtmp-server/srs/issues/435 [bug #435]: https://github.com/ossrs/srs/issues/435
[bug #420]: https://github.com/simple-rtmp-server/srs/issues/420 [bug #420]: https://github.com/ossrs/srs/issues/420
[bug #209]: https://github.com/simple-rtmp-server/srs/issues/209 [bug #209]: https://github.com/ossrs/srs/issues/209
[bug #409]: https://github.com/simple-rtmp-server/srs/issues/409 [bug #409]: https://github.com/ossrs/srs/issues/409
[bug #404]: https://github.com/simple-rtmp-server/srs/issues/404 [bug #404]: https://github.com/ossrs/srs/issues/404
[bug #391]: https://github.com/simple-rtmp-server/srs/issues/391 [bug #391]: https://github.com/ossrs/srs/issues/391
[bug #397]: https://github.com/simple-rtmp-server/srs/issues/397 [bug #397]: https://github.com/ossrs/srs/issues/397
[bug #400]: https://github.com/simple-rtmp-server/srs/issues/400 [bug #400]: https://github.com/ossrs/srs/issues/400
[bug #383]: https://github.com/simple-rtmp-server/srs/issues/383 [bug #383]: https://github.com/ossrs/srs/issues/383
[bug #381]: https://github.com/simple-rtmp-server/srs/issues/381 [bug #381]: https://github.com/ossrs/srs/issues/381
[bug #375]: https://github.com/simple-rtmp-server/srs/issues/375 [bug #375]: https://github.com/ossrs/srs/issues/375
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #372]: https://github.com/simple-rtmp-server/srs/issues/372 [bug #372]: https://github.com/ossrs/srs/issues/372
[bug #366]: https://github.com/simple-rtmp-server/srs/issues/366 [bug #366]: https://github.com/ossrs/srs/issues/366
[bug #351]: https://github.com/simple-rtmp-server/srs/issues/351 [bug #351]: https://github.com/ossrs/srs/issues/351
[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 [bug #155]: https://github.com/ossrs/srs/issues/155
[bug #324]: https://github.com/simple-rtmp-server/srs/issues/324 [bug #324]: https://github.com/ossrs/srs/issues/324
[bug #324]: https://github.com/simple-rtmp-server/srs/issues/324 [bug #324]: https://github.com/ossrs/srs/issues/324
[bug #328]: https://github.com/simple-rtmp-server/srs/issues/328 [bug #328]: https://github.com/ossrs/srs/issues/328
[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 [bug #155]: https://github.com/ossrs/srs/issues/155
[bug #316]: https://github.com/simple-rtmp-server/srs/issues/316 [bug #316]: https://github.com/ossrs/srs/issues/316
[bug #310]: https://github.com/simple-rtmp-server/srs/issues/310 [bug #310]: https://github.com/ossrs/srs/issues/310
[bug #322]: https://github.com/simple-rtmp-server/srs/issues/322 [bug #322]: https://github.com/ossrs/srs/issues/322
[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 [bug #179]: https://github.com/ossrs/srs/issues/179
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #133]: https://github.com/simple-rtmp-server/srs/issues/133 [bug #133]: https://github.com/ossrs/srs/issues/133
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 [bug #304]: https://github.com/ossrs/srs/issues/304
[bug #311]: https://github.com/simple-rtmp-server/srs/issues/311 [bug #311]: https://github.com/ossrs/srs/issues/311
[bug #310]: https://github.com/simple-rtmp-server/srs/issues/310 [bug #310]: https://github.com/ossrs/srs/issues/310
[bug #136]: https://github.com/simple-rtmp-server/srs/issues/136 [bug #136]: https://github.com/ossrs/srs/issues/136
[bug #250]: https://github.com/simple-rtmp-server/srs/issues/250 [bug #250]: https://github.com/ossrs/srs/issues/250
[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 [bug #301]: https://github.com/ossrs/srs/issues/301
[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 [bug #301]: https://github.com/ossrs/srs/issues/301
[bug #268]: https://github.com/simple-rtmp-server/srs/issues/268 [bug #268]: https://github.com/ossrs/srs/issues/268
[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 [bug #151]: https://github.com/ossrs/srs/issues/151
[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 [bug #151]: https://github.com/ossrs/srs/issues/151
[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 [bug #293]: https://github.com/ossrs/srs/issues/293
[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 [bug #293]: https://github.com/ossrs/srs/issues/293
[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 [bug #293]: https://github.com/ossrs/srs/issues/293
[bug #277]: https://github.com/simple-rtmp-server/srs/issues/277 [bug #277]: https://github.com/ossrs/srs/issues/277
[bug #277]: https://github.com/simple-rtmp-server/srs/issues/277 [bug #277]: https://github.com/ossrs/srs/issues/277
[bug #290]: https://github.com/simple-rtmp-server/srs/issues/290 [bug #290]: https://github.com/ossrs/srs/issues/290
[bug #281]: https://github.com/simple-rtmp-server/srs/issues/281 [bug #281]: https://github.com/ossrs/srs/issues/281
[bug #274]: https://github.com/simple-rtmp-server/srs/issues/274 [bug #274]: https://github.com/ossrs/srs/issues/274
[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 [bug #179]: https://github.com/ossrs/srs/issues/179
[bug #211]: https://github.com/simple-rtmp-server/srs/issues/211 [bug #211]: https://github.com/ossrs/srs/issues/211
[bug #207]: https://github.com/simple-rtmp-server/srs/issues/207 [bug #207]: https://github.com/ossrs/srs/issues/207
[bug #158]: https://github.com/simple-rtmp-server/srs/issues/158 [bug #158]: https://github.com/ossrs/srs/issues/158
[bug #216]: https://github.com/simple-rtmp-server/srs/issues/216 [bug #216]: https://github.com/ossrs/srs/issues/216
[bug #263]: https://github.com/simple-rtmp-server/srs/issues/263 [bug #263]: https://github.com/ossrs/srs/issues/263
[bug #270]: https://github.com/simple-rtmp-server/srs/issues/270 [bug #270]: https://github.com/ossrs/srs/issues/270
[bug #266]: https://github.com/simple-rtmp-server/srs/issues/266 [bug #266]: https://github.com/ossrs/srs/issues/266
[bug #267]: https://github.com/simple-rtmp-server/srs/issues/267 [bug #267]: https://github.com/ossrs/srs/issues/267
[bug #268]: https://github.com/simple-rtmp-server/srs/issues/268 [bug #268]: https://github.com/ossrs/srs/issues/268
[bug #264]: https://github.com/simple-rtmp-server/srs/issues/264 [bug #264]: https://github.com/ossrs/srs/issues/264
[bug #264]: https://github.com/simple-rtmp-server/srs/issues/264 [bug #264]: https://github.com/ossrs/srs/issues/264
[bug #257]: https://github.com/simple-rtmp-server/srs/issues/257 [bug #257]: https://github.com/ossrs/srs/issues/257
[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 [bug #251]: https://github.com/ossrs/srs/issues/251
[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 [bug #251]: https://github.com/ossrs/srs/issues/251
[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 [bug #241]: https://github.com/ossrs/srs/issues/241
[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 [bug #241]: https://github.com/ossrs/srs/issues/241
[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 [bug #241]: https://github.com/ossrs/srs/issues/241
[bug #248]: https://github.com/simple-rtmp-server/srs/issues/248 [bug #248]: https://github.com/ossrs/srs/issues/248
[bug #244]: https://github.com/simple-rtmp-server/srs/issues/244 [bug #244]: https://github.com/ossrs/srs/issues/244
[bug #237]: https://github.com/simple-rtmp-server/srs/issues/237 [bug #237]: https://github.com/ossrs/srs/issues/237
[bug #235]: https://github.com/simple-rtmp-server/srs/issues/235 [bug #235]: https://github.com/ossrs/srs/issues/235
[bug #215]: https://github.com/simple-rtmp-server/srs/issues/215 [bug #215]: https://github.com/ossrs/srs/issues/215
[bug #212]: https://github.com/simple-rtmp-server/srs/issues/212 [bug #212]: https://github.com/ossrs/srs/issues/212
[bug #217]: https://github.com/simple-rtmp-server/srs/issues/217 [bug #217]: https://github.com/ossrs/srs/issues/217
[bug #212]: https://github.com/simple-rtmp-server/srs/issues/212 [bug #212]: https://github.com/ossrs/srs/issues/212
[bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 [bug #213]: https://github.com/ossrs/srs/issues/213
[bug #204]: https://github.com/simple-rtmp-server/srs/issues/204 [bug #204]: https://github.com/ossrs/srs/issues/204
[bug #203]: https://github.com/simple-rtmp-server/srs/issues/203 [bug #203]: https://github.com/ossrs/srs/issues/203
[bug #202]: https://github.com/simple-rtmp-server/srs/issues/202 [bug #202]: https://github.com/ossrs/srs/issues/202
[bug #200]: https://github.com/simple-rtmp-server/srs/issues/200 [bug #200]: https://github.com/ossrs/srs/issues/200
[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 [bug #194]: https://github.com/ossrs/srs/issues/194
[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 [bug #194]: https://github.com/ossrs/srs/issues/194
[bug #195]: https://github.com/simple-rtmp-server/srs/issues/195 [bug #195]: https://github.com/ossrs/srs/issues/195
[bug #191]: https://github.com/simple-rtmp-server/srs/issues/191 [bug #191]: https://github.com/ossrs/srs/issues/191
[bug #66]: https://github.com/simple-rtmp-server/srs/issues/66 [bug #66]: https://github.com/ossrs/srs/issues/66
[bug #185]: https://github.com/simple-rtmp-server/srs/issues/185 [bug #185]: https://github.com/ossrs/srs/issues/185
[bug #186]: https://github.com/simple-rtmp-server/srs/issues/186 [bug #186]: https://github.com/ossrs/srs/issues/186
[bug #184]: https://github.com/simple-rtmp-server/srs/issues/184 [bug #184]: https://github.com/ossrs/srs/issues/184
[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 [bug #151]: https://github.com/ossrs/srs/issues/151
[bug #162]: https://github.com/simple-rtmp-server/srs/issues/162 [bug #162]: https://github.com/ossrs/srs/issues/162
[bug #180]: https://github.com/simple-rtmp-server/srs/issues/180 [bug #180]: https://github.com/ossrs/srs/issues/180
[bug #177]: https://github.com/simple-rtmp-server/srs/issues/177 [bug #177]: https://github.com/ossrs/srs/issues/177
[bug #167]: https://github.com/simple-rtmp-server/srs/issues/167 [bug #167]: https://github.com/ossrs/srs/issues/167
[bug #150]: https://github.com/simple-rtmp-server/srs/issues/150 [bug #150]: https://github.com/ossrs/srs/issues/150
[bug #165]: https://github.com/simple-rtmp-server/srs/issues/165 [bug #165]: https://github.com/ossrs/srs/issues/165
[bug #160]: https://github.com/simple-rtmp-server/srs/issues/160 [bug #160]: https://github.com/ossrs/srs/issues/160
[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 [bug #155]: https://github.com/ossrs/srs/issues/155
[bug #148]: https://github.com/simple-rtmp-server/srs/issues/148 [bug #148]: https://github.com/ossrs/srs/issues/148
[bug #147]: https://github.com/simple-rtmp-server/srs/issues/147 [bug #147]: https://github.com/ossrs/srs/issues/147
[bug #79]: https://github.com/simple-rtmp-server/srs/issues/79 [bug #79]: https://github.com/ossrs/srs/issues/79
[bug #57]: https://github.com/simple-rtmp-server/srs/issues/57 [bug #57]: https://github.com/ossrs/srs/issues/57
[bug #85]: https://github.com/simple-rtmp-server/srs/issues/85 [bug #85]: https://github.com/ossrs/srs/issues/85
[bug #145]: https://github.com/simple-rtmp-server/srs/issues/145 [bug #145]: https://github.com/ossrs/srs/issues/145
[bug #143]: https://github.com/simple-rtmp-server/srs/issues/143 [bug #143]: https://github.com/ossrs/srs/issues/143
[bug #138]: https://github.com/simple-rtmp-server/srs/issues/138 [bug #138]: https://github.com/ossrs/srs/issues/138
[bug #142]: https://github.com/simple-rtmp-server/srs/issues/142 [bug #142]: https://github.com/ossrs/srs/issues/142
[bug #141]: https://github.com/simple-rtmp-server/srs/issues/141 [bug #141]: https://github.com/ossrs/srs/issues/141
[bug #124]: https://github.com/simple-rtmp-server/srs/issues/124 [bug #124]: https://github.com/ossrs/srs/issues/124
[bug #121]: https://github.com/simple-rtmp-server/srs/issues/121 [bug #121]: https://github.com/ossrs/srs/issues/121
[bug #119]: https://github.com/simple-rtmp-server/srs/issues/119 [bug #119]: https://github.com/ossrs/srs/issues/119
[bug #81]: https://github.com/simple-rtmp-server/srs/issues/81 [bug #81]: https://github.com/ossrs/srs/issues/81
[bug #103]: https://github.com/simple-rtmp-server/srs/issues/103 [bug #103]: https://github.com/ossrs/srs/issues/103
[bug #111]: https://github.com/simple-rtmp-server/srs/issues/111 [bug #111]: https://github.com/ossrs/srs/issues/111
[bug #110]: https://github.com/simple-rtmp-server/srs/issues/110 [bug #110]: https://github.com/ossrs/srs/issues/110
[bug #109]: https://github.com/simple-rtmp-server/srs/issues/109 [bug #109]: https://github.com/ossrs/srs/issues/109
[bug #108]: https://github.com/simple-rtmp-server/srs/issues/108 [bug #108]: https://github.com/ossrs/srs/issues/108
[bug #98]: https://github.com/simple-rtmp-server/srs/issues/98 [bug #98]: https://github.com/ossrs/srs/issues/98
[bug #87]: https://github.com/simple-rtmp-server/srs/issues/87 [bug #87]: https://github.com/ossrs/srs/issues/87
[bug #84]: https://github.com/simple-rtmp-server/srs/issues/84 [bug #84]: https://github.com/ossrs/srs/issues/84
[bug #89]: https://github.com/simple-rtmp-server/srs/issues/89 [bug #89]: https://github.com/ossrs/srs/issues/89
[bug #76]: https://github.com/simple-rtmp-server/srs/issues/76 [bug #76]: https://github.com/ossrs/srs/issues/76
[bug #78]: https://github.com/simple-rtmp-server/srs/issues/78 [bug #78]: https://github.com/ossrs/srs/issues/78
[bug #74]: https://github.com/simple-rtmp-server/srs/issues/74 [bug #74]: https://github.com/ossrs/srs/issues/74
[bug #72]: https://github.com/simple-rtmp-server/srs/issues/72 [bug #72]: https://github.com/ossrs/srs/issues/72
[bug #67]: https://github.com/simple-rtmp-server/srs/issues/67 [bug #67]: https://github.com/ossrs/srs/issues/67
[bug #64]: https://github.com/simple-rtmp-server/srs/issues/64 [bug #64]: https://github.com/ossrs/srs/issues/64
[bug #36]: https://github.com/simple-rtmp-server/srs/issues/36 [bug #36]: https://github.com/ossrs/srs/issues/36
[bug #60]: https://github.com/simple-rtmp-server/srs/issues/60 [bug #60]: https://github.com/ossrs/srs/issues/60
[bug #59]: https://github.com/simple-rtmp-server/srs/issues/59 [bug #59]: https://github.com/ossrs/srs/issues/59
[bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 [bug #50]: https://github.com/ossrs/srs/issues/50
[bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 [bug #34]: https://github.com/ossrs/srs/issues/34
[bug #257-c0]: https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413 [bug #257-c0]: https://github.com/ossrs/srs/issues/257#issuecomment-66864413
[bug #110]: https://github.com/simple-rtmp-server/srs/issues/110 [bug #110]: https://github.com/ossrs/srs/issues/110
[bug #109]: https://github.com/simple-rtmp-server/srs/issues/109 [bug #109]: https://github.com/ossrs/srs/issues/109
[bug #108]: https://github.com/simple-rtmp-server/srs/issues/108 [bug #108]: https://github.com/ossrs/srs/issues/108
[bug #104]: https://github.com/simple-rtmp-server/srs/issues/104 [bug #104]: https://github.com/ossrs/srs/issues/104
[bug #98]: https://github.com/simple-rtmp-server/srs/issues/98 [bug #98]: https://github.com/ossrs/srs/issues/98
[bug #87]: https://github.com/simple-rtmp-server/srs/issues/87 [bug #87]: https://github.com/ossrs/srs/issues/87
[bug #84]: https://github.com/simple-rtmp-server/srs/issues/84 [bug #84]: https://github.com/ossrs/srs/issues/84
[bug #89]: https://github.com/simple-rtmp-server/srs/issues/89 [bug #89]: https://github.com/ossrs/srs/issues/89
[bug #76]: https://github.com/simple-rtmp-server/srs/issues/76 [bug #76]: https://github.com/ossrs/srs/issues/76
[bug #78]: https://github.com/simple-rtmp-server/srs/issues/78 [bug #78]: https://github.com/ossrs/srs/issues/78
[bug #74]: https://github.com/simple-rtmp-server/srs/issues/74 [bug #74]: https://github.com/ossrs/srs/issues/74
[bug #72]: https://github.com/simple-rtmp-server/srs/issues/72 [bug #72]: https://github.com/ossrs/srs/issues/72
[bug #67]: https://github.com/simple-rtmp-server/srs/issues/67 [bug #67]: https://github.com/ossrs/srs/issues/67
[bug #64]: https://github.com/simple-rtmp-server/srs/issues/64 [bug #64]: https://github.com/ossrs/srs/issues/64
[bug #36]: https://github.com/simple-rtmp-server/srs/issues/36 [bug #36]: https://github.com/ossrs/srs/issues/36
[bug #60]: https://github.com/simple-rtmp-server/srs/issues/60 [bug #60]: https://github.com/ossrs/srs/issues/60
[bug #59]: https://github.com/simple-rtmp-server/srs/issues/59 [bug #59]: https://github.com/ossrs/srs/issues/59
[bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 [bug #50]: https://github.com/ossrs/srs/issues/50
[bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 [bug #34]: https://github.com/ossrs/srs/issues/34
[bug #512]: https://github.com/simple-rtmp-server/srs/issues/512 [bug #512]: https://github.com/ossrs/srs/issues/512
[bug #515]: https://github.com/simple-rtmp-server/srs/issues/515 [bug #515]: https://github.com/ossrs/srs/issues/515
[bug #511]: https://github.com/simple-rtmp-server/srs/issues/511 [bug #511]: https://github.com/ossrs/srs/issues/511
[bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
[exo #828]: https://github.com/google/ExoPlayer/pull/828 [exo #828]: https://github.com/google/ExoPlayer/pull/828
[r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2 [r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2
[r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1 [r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1
[r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0 [r2.0a0]: https://github.com/ossrs/srs/releases/tag/2.0a0
[r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4 [r1.0r4]: https://github.com/ossrs/srs/releases/tag/1.0r4
[r1.0r3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3 [r1.0r3]: https://github.com/ossrs/srs/releases/tag/1.0r3
[r1.0r2]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r2 [r1.0r2]: https://github.com/ossrs/srs/releases/tag/1.0r2
[r1.0r1]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r1 [r1.0r1]: https://github.com/ossrs/srs/releases/tag/1.0r1
[r1.0r0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r0 [r1.0r0]: https://github.com/ossrs/srs/releases/tag/1.0r0
[r1.0b0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.beta [r1.0b0]: https://github.com/ossrs/srs/releases/tag/1.0.beta
[r1.0a7]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline7 [r1.0a7]: https://github.com/ossrs/srs/releases/tag/1.0.mainline7
[r1.0a6]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline6 [r1.0a6]: https://github.com/ossrs/srs/releases/tag/1.0.mainline6
[r1.0a5]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline5 [r1.0a5]: https://github.com/ossrs/srs/releases/tag/1.0.mainline5
[r1.0a4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline4 [r1.0a4]: https://github.com/ossrs/srs/releases/tag/1.0.mainline4
[r1.0a3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline3 [r1.0a3]: https://github.com/ossrs/srs/releases/tag/1.0.mainline3
[r1.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline2 [r1.0a2]: https://github.com/ossrs/srs/releases/tag/1.0.mainline2
[r1.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline [r1.0a0]: https://github.com/ossrs/srs/releases/tag/1.0.mainline
[r0.9]: https://github.com/simple-rtmp-server/srs/releases/tag/0.9 [r0.9]: https://github.com/ossrs/srs/releases/tag/0.9
[r0.8]: https://github.com/simple-rtmp-server/srs/releases/tag/0.8 [r0.8]: https://github.com/ossrs/srs/releases/tag/0.8
[r0.7]: https://github.com/simple-rtmp-server/srs/releases/tag/0.7 [r0.7]: https://github.com/ossrs/srs/releases/tag/0.7
[r0.6]: https://github.com/simple-rtmp-server/srs/releases/tag/0.6 [r0.6]: https://github.com/ossrs/srs/releases/tag/0.6
[r0.5]: https://github.com/simple-rtmp-server/srs/releases/tag/0.5 [r0.5]: https://github.com/ossrs/srs/releases/tag/0.5
[r0.4]: https://github.com/simple-rtmp-server/srs/releases/tag/0.4 [r0.4]: https://github.com/ossrs/srs/releases/tag/0.4
[r0.3]: https://github.com/simple-rtmp-server/srs/releases/tag/0.3 [r0.3]: https://github.com/ossrs/srs/releases/tag/0.3
[r0.2]: https://github.com/simple-rtmp-server/srs/releases/tag/0.2 [r0.2]: https://github.com/ossrs/srs/releases/tag/0.2
[r0.1]: https://github.com/simple-rtmp-server/srs/releases/tag/0.1 [r0.1]: https://github.com/ossrs/srs/releases/tag/0.1
[contact]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Contact [contact]: https://github.com/ossrs/srs/wiki/v1_CN_Contact
[more0]: http://winlinvip.github.io/srs.release/releases/ [more0]: http://winlinvip.github.io/srs.release/releases/
[more1]: http://www.ossrs.net/srs.release/releases/ [more1]: http://www.ossrs.net/srs.release/releases/
[branch1]: https://github.com/simple-rtmp-server/srs/tree/1.0release [branch1]: https://github.com/ossrs/srs/tree/1.0release
[branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release [branch2]: https://github.com/ossrs/srs/tree/2.0release
[release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 [release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20
[release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30 [release3]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release30
[centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip [centos0]: http://winlinvip.github.io/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip
[centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip [centos1]: http://www.ossrs.net/srs.release/releases/files/SRS-CentOS6-x86_64-2.0.195.zip
[srs_CN]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Home [srs_CN]: https://github.com/ossrs/srs/wiki/v2_CN_Home
[srs_EN]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home [srs_EN]: https://github.com/ossrs/srs/wiki/v2_EN_Home

6
trunk/auto/depends.sh
View file

@ -391,14 +391,14 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
_ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="EXTRA_CFLAGS=-DMD_HAVE_KQUEUE" _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="EXTRA_CFLAGS=-DMD_HAVE_KQUEUE"
fi fi
# memory leak for linux-optimized # memory leak for linux-optimized
# @see: https://github.com/simple-rtmp-server/srs/issues/197 # @see: https://github.com/ossrs/srs/issues/197
if [ $SRS_CROSS_BUILD = YES ]; then if [ $SRS_CROSS_BUILD = YES ]; then
# ok, arm specified, if the flag filed does not exists, need to rebuild. # ok, arm specified, if the flag filed does not exists, need to rebuild.
if [[ -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then if [[ -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
echo "st-1.9t for arm is ok."; echo "st-1.9t for arm is ok.";
else else
# TODO: FIXME: patch the bug. # TODO: FIXME: patch the bug.
# patch st for arm, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix
echo "build st-1.9t for arm"; echo "build st-1.9t for arm";
( (
rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&
@ -415,7 +415,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then if [[ ! -f ${SRS_OBJS}/_flag.st.cross.build.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
echo "st-1.9t is ok."; echo "st-1.9t is ok.";
else else
# patch st for arm, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix # patch st for arm, @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm#st-arm-bug-fix
echo "build st-1.9t"; echo "build st-1.9t";
( (
rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} &&

6
trunk/auto/generate-srs-librtmp-single.sh
View file

@ -30,7 +30,7 @@ cat << END >$FILE
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -104,7 +104,7 @@ SRS_SINGLE_LIBRTMP_COMPILE='gcc example.c srs_librtmp.cpp -g -O0 -lstdc++ -o exa
cat << END >$FILE cat << END >$FILE
/** /**
# Example to use srs-librtmp # Example to use srs-librtmp
# see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp # see: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp
${SRS_SINGLE_LIBRTMP_COMPILE} ${SRS_SINGLE_LIBRTMP_COMPILE}
*/ */
#include <stdio.h> #include <stdio.h>
@ -115,7 +115,7 @@ int main(int argc, char** argv)
srs_rtmp_t rtmp; srs_rtmp_t rtmp;
printf("Example for srs-librtmp\n"); printf("Example for srs-librtmp\n");
printf("SRS(simple-rtmp-server) client librtmp library.\n"); printf("SRS(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
rtmp = srs_rtmp_create("rtmp://ossrs.net/live/livestream"); rtmp = srs_rtmp_create("rtmp://ossrs.net/live/livestream");

4
trunk/auto/options.sh
View file

@ -82,7 +82,7 @@ SRS_MIPS_UBUNTU12=NO
SRS_DEV=NO SRS_DEV=NO
# dev, open main server feature for dev, no utest/research/librtmp # dev, open main server feature for dev, no utest/research/librtmp
SRS_FAST_DEV=NO SRS_FAST_DEV=NO
# demo, for the demo of srs, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo # demo, for the demo of srs, @see: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
SRS_DEMO=NO SRS_DEMO=NO
# raspberry-pi, open hls/ssl/static # raspberry-pi, open hls/ssl/static
SRS_PI=NO SRS_PI=NO
@ -184,7 +184,7 @@ Presets:
--disable-all disable all features, only support vp6 RTMP. --disable-all disable all features, only support vp6 RTMP.
--dev for dev, open all features, no nginx/gperf/gprof/arm. --dev for dev, open all features, no nginx/gperf/gprof/arm.
--fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research. --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research.
--demo for srs demo, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo --demo for srs demo, @see: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
--full enable all features, no gperf/gprof/arm. --full enable all features, no gperf/gprof/arm.
Conflicts: Conflicts:

36
trunk/auto/summary.sh
View file

@ -35,7 +35,7 @@ BLACK="\\${BLACK}"
echo -e "\${GREEN}build summary:\${BLACK}" echo -e "\${GREEN}build summary:\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_GPERF\${BLACK}" echo -e " |${SrsGperfSummaryColor}gperf @see: https://github.com/ossrs/srs/wiki/v1_CN_GPERF\${BLACK}"
echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}" echo -e " | ${SrsGperfMCSummaryColor}gmc @see: http://google-perftools.googlecode.com/svn/trunk/doc/heap_checker.html\${BLACK}"
echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check, or memory leak detect\${BLACK}" echo -e " | ${SrsGperfMCSummaryColor}gmc: gperf memory check, or memory leak detect\${BLACK}"
echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf 2>gmc.log # start gmc\${BLACK}" echo -e " | ${SrsGperfMCSummaryColor}env PPROF_PATH=./objs/pprof HEAPCHECK=normal ./objs/srs -c conf/console.conf 2>gmc.log # start gmc\${BLACK}"
@ -52,7 +52,7 @@ echo -e " | ${SrsGperfCPSummaryColor}rm -f gperf.srs.gcp*; ./obj
echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}" echo -e " | ${SrsGperfCPSummaryColor}killall -2 srs # or CTRL+C to stop gcp\${BLACK}"
echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}" echo -e " | ${SrsGperfCPSummaryColor}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_GPROF\${BLACK}" echo -e " |${SrsGprofSummaryColor}gprof @see: https://github.com/ossrs/srs/wiki/v1_CN_GPROF\${BLACK}"
echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}" echo -e " |${SrsGprofSummaryColor}gprof: GNU profile tool, @see: http://www.cs.utah.edu/dept/old/texinfo/as/gprof.html\${BLACK}"
echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}" echo -e " | ${SrsGprofSummaryColor}rm -f gmon.out; ./objs/srs -c conf/console.conf # start gprof\${BLACK}"
echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}" echo -e " | ${SrsGprofSummaryColor}killall -2 srs # or CTRL+C to stop gprof\${BLACK}"
@ -60,7 +60,7 @@ echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof.
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}" echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLibrtmp\${BLACK}" echo -e " |${SrsLibrtmpSummaryColor}librtmp @see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp\${BLACK}"
echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}" echo -e " |${SrsLibrtmpSummaryColor}librtmp: ./objs/include, ./objs/lib, the srs-librtmp library\${BLACK}"
echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}" echo -e " | ${SrsLibrtmpSummaryColor}simple handshake: publish/play stream with simple handshake to server\${BLACK}"
echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}" echo -e " | ${SrsLibrtmpSSLSummaryColor}complex handshake: it's not required for client, recommend disable it\${BLACK}"
@ -71,38 +71,38 @@ echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/
echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}" echo -e " | ${SrsLibrtmpSummaryColor}librtmp-sample: ./research/librtmp/objs/srs_bandwidth_check\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}" echo -e " |${SrsResearchSummaryColor}research: ./objs/research, api server, players, ts info, librtmp.\${BLACK}"
echo -e " | ${SrsResearchSummaryColor} @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}" echo -e " | ${SrsResearchSummaryColor} @see https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |\${GREEN}tools: important tool, others @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}" echo -e " |\${GREEN}tools: important tool, others @see https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"
echo -e " | \${GREEN}./objs/srs_ingest_hls -i http://ossrs.net/live/livestream.m3u8 -y rtmp://127.0.0.1/live/livestream\${BLACK}" echo -e " | \${GREEN}./objs/srs_ingest_hls -i http://ossrs.net/live/livestream.m3u8 -y rtmp://127.0.0.1/live/livestream\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}" echo -e " |\${GREEN}server: ./objs/srs -c conf/srs.conf, start the srs server\${BLACK}"
echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHLS\${BLACK}" echo -e " | ${SrsHlsSummaryColor}hls @see: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"
echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}" echo -e " | ${SrsHlsSummaryColor}hls: generate m3u8 and ts from rtmp stream\${BLACK}"
echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR\${BLACK}" echo -e " | ${SrsDvrSummaryColor}dvr @see: https://github.com/ossrs/srs/wiki/v2_CN_DVR\${BLACK}"
echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}" echo -e " | ${SrsDvrSummaryColor}dvr: record RTMP stream to flv files.\${BLACK}"
echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHLS\${BLACK}" echo -e " | ${SrsNginxSummaryColor}nginx @see: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS\${BLACK}"
echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}" echo -e " | ${SrsNginxSummaryColor}nginx: delivery HLS stream by nginx\${BLACK}"
echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}" echo -e " | ${SrsNginxSummaryColor}nginx: sudo ./objs/nginx/sbin/nginx\${BLACK}"
echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RTMPHandshake\${BLACK}" echo -e " | ${SrsSslSummaryColor}ssl @see: https://github.com/ossrs/srs/wiki/v1_CN_RTMPHandshake\${BLACK}"
echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}" echo -e " | ${SrsSslSummaryColor}ssl: support RTMP complex handshake for client required, for instance, flash\${BLACK}"
echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_FFMPEG\${BLACK}" echo -e " | ${SrsFfmpegSummaryColor}ffmpeg @see: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"
echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}" echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: transcode, mux, ingest tool\${BLACK}"
echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}" echo -e " | ${SrsFfmpegSummaryColor}ffmpeg: ./objs/ffmpeg/bin/ffmpeg\${BLACK}"
echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_FFMPEG\${BLACK}" echo -e " | ${SrsTranscodeSummaryColor}transcode @see: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG\${BLACK}"
echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}" echo -e " | ${SrsTranscodeSummaryColor}transcode: support transcoding RTMP stream\${BLACK}"
echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Ingest\${BLACK}" echo -e " | ${SrsIngestSummaryColor}ingest @see: https://github.com/ossrs/srs/wiki/v1_CN_Ingest\${BLACK}"
echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}" echo -e " | ${SrsIngestSummaryColor}ingest: support ingest file/stream/device then push to SRS by RTMP stream\${BLACK}"
echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_HTTPCallback\${BLACK}" echo -e " | ${SrsHttpCallbackSummaryColor}http-callback @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPCallback\${BLACK}"
echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}" echo -e " | ${SrsHttpCallbackSummaryColor}http-callback: support http callback for authentication and event injection\${BLACK}"
echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_HTTPServer\${BLACK}" echo -e " | ${SrsHttpServerSummaryColor}http-server @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPServer\${BLACK}"
echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}" echo -e " | ${SrsHttpServerSummaryColor}http-server: support http server to delivery http stream\${BLACK}"
echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_HTTPApi\${BLACK}" echo -e " | ${SrsHttpApiSummaryColor}http-api @see: https://github.com/ossrs/srs/wiki/v2_CN_HTTPApi\${BLACK}"
echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}" echo -e " | ${SrsHttpApiSummaryColor}http-api: support http api to manage server\${BLACK}"
echo -e " | ${SrsStreamCasterSummaryColor}stream-caster @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer\${BLACK}" echo -e " | ${SrsStreamCasterSummaryColor}stream-caster @see: https://github.com/ossrs/srs/wiki/v2_CN_Streamer\${BLACK}"
echo -e " | ${SrsStreamCasterSummaryColor}stream-caster: start server to cast stream over other protocols.\${BLACK}" echo -e " | ${SrsStreamCasterSummaryColor}stream-caster: start server to cast stream over other protocols.\${BLACK}"
echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}"
echo -e "\${GREEN}binaries @see: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Build\${BLACK}" echo -e "\${GREEN}binaries @see: https://github.com/ossrs/srs/wiki/v2_CN_Build\${BLACK}"
echo "You can:" echo "You can:"
echo " ./objs/srs -c conf/srs.conf" echo " ./objs/srs -c conf/srs.conf"
@ -124,6 +124,6 @@ echo -e "\${GREEN} objs/include/srs_librtmp.h\${BLACK}"
echo -e "\${GREEN} objs/lib/srs_librtmp.a\${BLACK}" echo -e "\${GREEN} objs/lib/srs_librtmp.a\${BLACK}"
echo -e "\${BLACK}Examples for srs-librtmp at:\${BLACK}" echo -e "\${BLACK}Examples for srs-librtmp at:\${BLACK}"
echo -e "\${GREEN} objs/research/librtmp\${BLACK}" echo -e "\${GREEN} objs/research/librtmp\${BLACK}"
echo -e "\${GREEN} Examples: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}" echo -e "\${GREEN} Examples: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp#srs-librtmp-examples\${BLACK}"
END END
fi fi

2
trunk/conf/demo.19350.conf
View file

@ -1,5 +1,5 @@
# the config for srs demo # the config for srs demo
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
# @see full.conf for detail config. # @see full.conf for detail config.
listen 19350; listen 19350;

2
trunk/conf/demo.conf
View file

@ -1,5 +1,5 @@
# the config for srs demo # the config for srs demo
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

4
trunk/conf/dvr.path.conf
View file

@ -1,6 +1,6 @@
# the config for srs to dvr in custom path. # the config for srs to dvr in custom path.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR#custom-path # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DVR#custom-path # @see https://github.com/ossrs/srs/wiki/v2_EN_DVR#custom-path
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/dvr.segment.conf
View file

@ -1,5 +1,5 @@
# the config for srs to dvr in segment mode # the config for srs to dvr in segment mode
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/dvr.session.conf
View file

@ -1,5 +1,5 @@
# the config for srs to dvr in session mode # the config for srs to dvr in session mode
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/edge.conf
View file

@ -1,5 +1,5 @@
# the config for srs origin-edge cluster # the config for srs origin-edge cluster
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Edge # @see https://github.com/ossrs/srs/wiki/v1_CN_Edge
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/edge.token.traverse.conf
View file

@ -1,5 +1,5 @@
# the config for srs for token traverse authentication # the config for srs for token traverse authentication
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM # @see https://github.com/ossrs/srs/wiki/v1_CN_DRM
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935 listen 1935

2
trunk/conf/ffmpeg.transcode.conf
View file

@ -1,5 +1,5 @@
# the config for srs use ffmpeg to transcode # the config for srs use ffmpeg to transcode
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleFFMPEG # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleFFMPEG
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/forward.master.conf
View file

@ -1,5 +1,5 @@
# the config for srs to forward # the config for srs to forward
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleForward # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleForward
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/forward.slave.conf
View file

@ -1,5 +1,5 @@
# the config for srs to forward # the config for srs to forward
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleForward # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleForward
# @see full.conf for detail config. # @see full.conf for detail config.
listen 19350; listen 19350;

34
trunk/conf/full.conf
View file

@ -151,7 +151,7 @@ http_server {
# Streamer sections # Streamer sections
############################################################################################# #############################################################################################
# the streamer cast stream from other protocol to SRS over RTMP. # the streamer cast stream from other protocol to SRS over RTMP.
# @see https://github.com/simple-rtmp-server/srs/tree/develop#stream-architecture # @see https://github.com/ossrs/srs/tree/develop#stream-architecture
stream_caster { stream_caster {
# whether stream caster is enabled. # whether stream caster is enabled.
# default: off # default: off
@ -216,7 +216,7 @@ vhost __defaultVhost__ {
# the security to allow or deny clients. # the security to allow or deny clients.
vhost security.srs.com { vhost security.srs.com {
# security for host to allow or deny clients. # security for host to allow or deny clients.
# @see https://github.com/simple-rtmp-server/srs/issues/211 # @see https://github.com/ossrs/srs/issues/211
security { security {
# whether enable the security for vhost. # whether enable the security for vhost.
# default: off # default: off
@ -249,10 +249,10 @@ vhost mrw.srs.com {
# for min latence mode: # for min latence mode:
# 1. disable the mr for vhost. # 1. disable the mr for vhost.
# 2. use timeout for cond wait for consumer queue. # 2. use timeout for cond wait for consumer queue.
# @see https://github.com/simple-rtmp-server/srs/issues/257 # @see https://github.com/ossrs/srs/issues/257
# default: off # default: off
min_latency off; min_latency off;
# about MR, read https://github.com/simple-rtmp-server/srs/issues/241 # about MR, read https://github.com/ossrs/srs/issues/241
mr { mr {
# whether enable the MR(merged-read) # whether enable the MR(merged-read)
# default: off # default: off
@ -354,8 +354,8 @@ vhost dvr.srs.com {
# dvr_path /data/[vhost]/[app]/[2006]/[01]/[stream]-[02]-[15].[04].[05].[999].flv; # dvr_path /data/[vhost]/[app]/[2006]/[01]/[stream]-[02]-[15].[04].[05].[999].flv;
# => # =>
# dvr_path /data/ossrs.net/live/2015/01/livestream-03-10.57.30.776.flv; # dvr_path /data/ossrs.net/live/2015/01/livestream-03-10.57.30.776.flv;
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR#custom-path # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DVR#custom-path # @see https://github.com/ossrs/srs/wiki/v2_EN_DVR#custom-path
# segment,session apply it. # segment,session apply it.
# default: ./objs/nginx/html/[app]/[stream].[timestamp].flv # default: ./objs/nginx/html/[app]/[stream].[timestamp].flv
dvr_path ./objs/nginx/html/[app]/[stream].[timestamp].flv; dvr_path ./objs/nginx/html/[app]/[stream].[timestamp].flv;
@ -387,8 +387,8 @@ vhost dvr.srs.com {
# on_dvr, never config in here, should config in http_hooks. # on_dvr, never config in here, should config in http_hooks.
# for the dvr http callback, @see http_hooks.on_dvr of vhost hooks.callback.srs.com # for the dvr http callback, @see http_hooks.on_dvr of vhost hooks.callback.srs.com
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR#http-callback # @read https://github.com/ossrs/srs/wiki/v2_CN_DVR#http-callback
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DVR#http-callback # @read https://github.com/ossrs/srs/wiki/v2_EN_DVR#http-callback
} }
} }
@ -526,7 +526,7 @@ vhost with-hls.srs.com {
# the hls m3u8 target duration ratio, # the hls m3u8 target duration ratio,
# EXT-X-TARGETDURATION = hls_td_ratio * hls_fragment // init # EXT-X-TARGETDURATION = hls_td_ratio * hls_fragment // init
# EXT-X-TARGETDURATION = max(ts_duration, EXT-X-TARGETDURATION) // for each ts # EXT-X-TARGETDURATION = max(ts_duration, EXT-X-TARGETDURATION) // for each ts
# @see https://github.com/simple-rtmp-server/srs/issues/304#issuecomment-74000081 # @see https://github.com/ossrs/srs/issues/304#issuecomment-74000081
# default: 1.5 # default: 1.5
hls_td_ratio 1.5; hls_td_ratio 1.5;
# the audio overflow ratio. # the audio overflow ratio.
@ -542,7 +542,7 @@ vhost with-hls.srs.com {
# ignore, when error ignore and disable hls. # ignore, when error ignore and disable hls.
# disconnect, when error disconnect the publish connection. # disconnect, when error disconnect the publish connection.
# continue, when error ignore and continue output hls. # continue, when error ignore and continue output hls.
# @see https://github.com/simple-rtmp-server/srs/issues/264 # @see https://github.com/ossrs/srs/issues/264
# default: ignore # default: ignore
hls_on_error ignore; hls_on_error ignore;
# the hls storage: disk, ram or both. # the hls storage: disk, ram or both.
@ -580,8 +580,8 @@ vhost with-hls.srs.com {
# [999], repleace this const to current millisecond. # [999], repleace this const to current millisecond.
# [timestamp],replace this const to current UNIX timestamp in ms. # [timestamp],replace this const to current UNIX timestamp in ms.
# [seq], the sequence number of ts. # [seq], the sequence number of ts.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DVR#custom-path # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHLS#hls-config # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#hls-config
# default: [app]/[stream]-[seq].ts # default: [app]/[stream]-[seq].ts
hls_ts_file [app]/[stream]-[seq].ts; hls_ts_file [app]/[stream]-[seq].ts;
# whether use floor for the hls_ts_file path generation. # whether use floor for the hls_ts_file path generation.
@ -641,8 +641,8 @@ vhost with-hls.srs.com {
# on_hls, never config in here, should config in http_hooks. # on_hls, never config in here, should config in http_hooks.
# for the hls http callback, @see http_hooks.on_hls of vhost hooks.callback.srs.com # for the hls http callback, @see http_hooks.on_hls of vhost hooks.callback.srs.com
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHLS#http-callback # @read https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#http-callback
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHLS#http-callback # @read https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS#http-callback
# on_hls_notify, never config in here, should config in http_hooks. # on_hls_notify, never config in here, should config in http_hooks.
# we support the variables to generate the notify url: # we support the variables to generate the notify url:
@ -650,8 +650,8 @@ vhost with-hls.srs.com {
# [stream], replace with the stream. # [stream], replace with the stream.
# [ts_url], replace with the ts url. # [ts_url], replace with the ts url.
# for the hls http callback, @see http_hooks.on_hls_notify of vhost hooks.callback.srs.com # for the hls http callback, @see http_hooks.on_hls_notify of vhost hooks.callback.srs.com
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHLS#on-hls-notify # @read https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#on-hls-notify
# @read https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHLS#on-hls-notify # @read https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS#on-hls-notify
} }
} }
# the vhost with hls disabled. # the vhost with hls disabled.
@ -825,7 +825,7 @@ vhost debug.srs.com {
# it's strongly recommend to open the debug_srs_upnode, # it's strongly recommend to open the debug_srs_upnode,
# when connect to upnode, it will take the debug info, # when connect to upnode, it will take the debug info,
# for example, the id, source id, pid. # for example, the id, source id, pid.
# please see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLog # please see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog
# default: on # default: on
debug_srs_upnode on; debug_srs_upnode on;
} }

2
trunk/conf/hds.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery hds # the config for srs to delivery hds
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHDS # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHDS
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/hls.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery hls # the config for srs to delivery hls
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHLS # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHLS
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.aac.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to aac live stream. # the config for srs to remux rtmp to aac live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.flv.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to flv live stream. # the config for srs to remux rtmp to flv live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.flv.live.edge1.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to flv live stream. # the config for srs to remux rtmp to flv live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 19351; listen 19351;

2
trunk/conf/http.flv.live.edge2.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to flv live stream. # the config for srs to remux rtmp to flv live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 19352; listen 19352;

2
trunk/conf/http.hls.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery hls # the config for srs to delivery hls
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHLS # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHLS
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.mp3.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to mp3 live stream. # the config for srs to remux rtmp to mp3 live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/http.ts.live.conf
View file

@ -1,5 +1,5 @@
# the config for srs to remux rtmp to ts live stream. # the config for srs to remux rtmp to ts live stream.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/ingest.conf
View file

@ -1,5 +1,5 @@
# use ffmpeg to ingest file/stream/device to SRS # use ffmpeg to ingest file/stream/device to SRS
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleIngest # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/origin.conf
View file

@ -1,5 +1,5 @@
# the config for srs origin-edge cluster # the config for srs origin-edge cluster
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Edge # @see https://github.com/ossrs/srs/wiki/v1_CN_Edge
# @see full.conf for detail config. # @see full.conf for detail config.
listen 19350; listen 19350;

2
trunk/conf/push.flv.conf
View file

@ -1,5 +1,5 @@
# push HTTP FLV to SRS. # push HTTP FLV to SRS.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs # @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

4
trunk/conf/push.mpegts.over.udp.conf
View file

@ -1,6 +1,6 @@
# push MPEG-TS over UDP to SRS. # push MPEG-TS over UDP to SRS.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp # @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp
# @see https://github.com/simple-rtmp-server/srs/issues/250#issuecomment-72321769 # @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

4
trunk/conf/push.rtsp.conf
View file

@ -1,6 +1,6 @@
# push MPEG-TS over UDP to SRS. # push MPEG-TS over UDP to SRS.
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp # @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp
# @see https://github.com/simple-rtmp-server/srs/issues/250#issuecomment-72321769 # @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/ram.hls.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery hls # the config for srs to delivery hls
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHLS # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHLS
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/realtime.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery realtime RTMP stream # the config for srs to delivery realtime RTMP stream
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleRealtime # @see https://github.com/ossrs/srs/wiki/v2_CN_SampleRealtime
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/rtmp.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery RTMP # the config for srs to delivery RTMP
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMP # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleRTMP
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/security.deny.publish.conf
View file

@ -1,5 +1,5 @@
# security config for srs, allow play and deny publish. # security config for srs, allow play and deny publish.
# @see https://github.com/simple-rtmp-server/srs/issues/211#issuecomment-68507035 # @see https://github.com/ossrs/srs/issues/211#issuecomment-68507035
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/transcode2hls.audio.only.conf
View file

@ -1,5 +1,5 @@
# the config for srs to delivery hls # the config for srs to delivery hls
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHLS # @see https://github.com/ossrs/srs/wiki/v1_CN_SampleHLS
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

2
trunk/conf/transform.edge.conf
View file

@ -1,5 +1,5 @@
# the config for srs origin-edge cluster # the config for srs origin-edge cluster
# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Edge#transform-vhost # @see https://github.com/ossrs/srs/wiki/v2_CN_Edge#transform-vhost
# @see full.conf for detail config. # @see full.conf for detail config.
listen 1935; listen 1935;

4
trunk/configure vendored
View file

@ -416,7 +416,7 @@ install-api: install
@echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api"
@echo " /etc/init.d/srs-api start" @echo " /etc/init.d/srs-api start"
@echo " http://\$(shell bash auto/local_ip.sh):8085" @echo " http://\$(shell bash auto/local_ip.sh):8085"
@echo "@see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LinuxService" @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService"
install: install:
@echo "mkdir \$(__REAL_INSTALL)" @echo "mkdir \$(__REAL_INSTALL)"
@ -438,7 +438,7 @@ install:
@echo "srs installed, to link and start srs:" @echo "srs installed, to link and start srs:"
@echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs"
@echo " /etc/init.d/srs start" @echo " /etc/init.d/srs start"
@echo "@see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LinuxService" @echo "@see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService"
END END
fi fi

8
trunk/etc/init.d/srs
View file

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: simple-rtmp-server(srs) # Provides: ossrs(srs)
# RequiRED-Start: $all # RequiRED-Start: $all
# RequiRED-Stop: $all # RequiRED-Stop: $all
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: simple-rtmp-server(srs) # Short-Description: ossrs(srs)
# Description: https://github.com/simple-rtmp-server/srs # Description: https://github.com/ossrs/srs
### END INIT INFO ### END INIT INFO
# the config of ROOT, user must modify it when start srs from other directory, # the config of ROOT, user must modify it when start srs from other directory,
# it's ok to use the script by command ./etc/init.d/simple-rtmp-server # it's ok to use the script by command ./etc/init.d/ossrs
ROOT="./" ROOT="./"
APP="./objs/srs" APP="./objs/srs"
CONFIG="./conf/srs.conf" CONFIG="./conf/srs.conf"

8
trunk/etc/init.d/srs-api
View file

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: simple-rtmp-server-api(srs-api) # Provides: ossrs-api(srs-api)
# RequiRED-Start: $all # RequiRED-Start: $all
# RequiRED-Stop: $all # RequiRED-Stop: $all
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: simple-rtmp-server-api(srs-api) # Short-Description: ossrs-api(srs-api)
# Description: https://github.com/simple-rtmp-server/srs # Description: https://github.com/ossrs/srs
### END INIT INFO ### END INIT INFO
# the config of ROOT, user must modify it when start srs from other directory, # the config of ROOT, user must modify it when start srs from other directory,
# it's ok to use the script by command ./etc/init.d/simple-rtmp-server # it's ok to use the script by command ./etc/init.d/ossrs
ROOT="./" ROOT="./"
APP="python ./research/api-server/server.py" APP="python ./research/api-server/server.py"
CONFIG="8085" CONFIG="8085"

8
trunk/etc/init.d/srs-demo
View file

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: simple-rtmp-server(srs) # Provides: ossrs(srs)
# RequiRED-Start: $all # RequiRED-Start: $all
# RequiRED-Stop: $all # RequiRED-Stop: $all
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: simple-rtmp-server(srs) # Short-Description: ossrs(srs)
# Description: https://github.com/simple-rtmp-server/srs # Description: https://github.com/ossrs/srs
### END INIT INFO ### END INIT INFO
# the config of ROOT, user must modify it when start srs from other directory, # the config of ROOT, user must modify it when start srs from other directory,
# it's ok to use the script by command ./etc/init.d/simple-rtmp-server # it's ok to use the script by command ./etc/init.d/ossrs
ROOT="./" ROOT="./"
APP="./objs/srs" APP="./objs/srs"
CONFIG="./conf/demo.conf" CONFIG="./conf/demo.conf"

8
trunk/etc/init.d/srs-demo-19350
View file

@ -1,17 +1,17 @@
#!/bin/bash #!/bin/bash
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: simple-rtmp-server(srs) # Provides: ossrs(srs)
# RequiRED-Start: $all # RequiRED-Start: $all
# RequiRED-Stop: $all # RequiRED-Stop: $all
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: simple-rtmp-server(srs) # Short-Description: ossrs(srs)
# Description: https://github.com/simple-rtmp-server/srs # Description: https://github.com/ossrs/srs
### END INIT INFO ### END INIT INFO
# the config of ROOT, user must modify it when start srs from other directory, # the config of ROOT, user must modify it when start srs from other directory,
# it's ok to use the script by command ./etc/init.d/simple-rtmp-server # it's ok to use the script by command ./etc/init.d/ossrs
ROOT="./" ROOT="./"
APP="./objs/srs" APP="./objs/srs"
CONFIG="./conf/demo.19350.conf" CONFIG="./conf/demo.19350.conf"

54
trunk/ide/srs_clion/CMakeLists.txt
View file

@ -28,31 +28,31 @@ ELSE(NOT EXISTS ${PROJECT_SOURCE_DIR}/../../objs/st/libst.a)
MESSAGE("srs_libs is ok") MESSAGE("srs_libs is ok")
ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/../../objs/st/libst.a) ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/../../objs/st/libst.a)
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") MESSAGE(STATUS "only for jetbrains IDE, @see https://github.com/ossrs/srs/wiki/v1_CN_IDE#jetbrains")
MESSAGE(STATUS "use ./configure && make, @see https://github.com/simple-rtmp-server/srs#usage") MESSAGE(STATUS "use ./configure && make, @see https://github.com/ossrs/srs#usage")

6
trunk/ide/srs_qt/srs-qt.pro.user
View file

@ -61,7 +61,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/winlin/git/simple-rtmp-server/trunk/ide/build-srs-qt-Desktop-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/winlin/git/ossrs/trunk/ide/build-srs-qt-Desktop-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -120,7 +120,7 @@
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap> </valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/winlin/git/simple-rtmp-server/trunk/ide/build-srs-qt-Desktop-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/winlin/git/ossrs/trunk/ide/build-srs-qt-Desktop-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@ -232,7 +232,7 @@
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">srs-qt</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">srs-qt</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/simple-rtmp-server/trunk/ide/srs_qt/srs-qt.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/ossrs/trunk/ide/srs_qt/srs-qt.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">srs-qt.pro</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">srs-qt.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>

4
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj
View file

@ -1038,7 +1038,7 @@
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"../../objs/**", "../../objs/**",
"/Users/winlin/Desktop/git/simple-rtmp-server/trunk/objs/http-parser-2.1", "/Users/winlin/Desktop/git/ossrs/trunk/objs/http-parser-2.1",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
"USER_HEADER_SEARCH_PATHS[arch=*]" = "../../src/** ../../objs ../../objs/st ../../objs/hp ../../objs/openssl"; "USER_HEADER_SEARCH_PATHS[arch=*]" = "../../src/** ../../objs ../../objs/st ../../objs/hp ../../objs/openssl";
@ -1053,7 +1053,7 @@
CLANG_CXX_LIBRARY = "libstdc++"; CLANG_CXX_LIBRARY = "libstdc++";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"../../objs/**", "../../objs/**",
"/Users/winlin/Desktop/git/simple-rtmp-server/trunk/objs/http-parser-2.1", "/Users/winlin/Desktop/git/ossrs/trunk/objs/http-parser-2.1",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };

6
trunk/research/api-server/server.py
View file

@ -2,7 +2,7 @@
''' '''
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -840,13 +840,13 @@ if __name__ != "__main__":
# check the user options # check the user options
if len(sys.argv) <= 1: if len(sys.argv) <= 1:
print "SRS api callback server, Copyright (c) 2013-2015 SRS(simple-rtmp-server)" print "SRS api callback server, Copyright (c) 2013-2015 SRS(ossrs)"
print "Usage: python %s <port>"%(sys.argv[0]) print "Usage: python %s <port>"%(sys.argv[0])
print " port: the port to listen at." print " port: the port to listen at."
print "For example:" print "For example:"
print " python %s 8085"%(sys.argv[0]) print " python %s 8085"%(sys.argv[0])
print "" print ""
print "See also: https://github.com/simple-rtmp-server/srs" print "See also: https://github.com/ossrs/srs"
sys.exit(1) sys.exit(1)
# parse port from user options. # parse port from user options.

2
trunk/research/api-server/static-dir/index.html
View file

@ -44,7 +44,7 @@
<div class="container"> <div class="container">
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/arm/jmp.cpp
View file

@ -1,5 +1,5 @@
/* /*
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm # see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm
g++ -g -O0 -o jmp jmp.cpp g++ -g -O0 -o jmp jmp.cpp
arm-linux-gnueabi-g++ -o jmp jmp.cpp -static arm-linux-gnueabi-g++ -o jmp jmp.cpp -static
arm-linux-gnueabi-strip jmp arm-linux-gnueabi-strip jmp

4
trunk/research/arm/jmp_sp.cpp
View file

@ -1,6 +1,6 @@
/* /*
# see: https://github.com/simple-rtmp-server/srs/issues/190 # see: https://github.com/ossrs/srs/issues/190
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm # see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm
g++ -g -O0 -o jmp_sp jmp_sp.cpp g++ -g -O0 -o jmp_sp jmp_sp.cpp
arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static
arm-linux-gnueabi-strip jmp_sp arm-linux-gnueabi-strip jmp_sp

2
trunk/research/arm/test.cpp
View file

@ -1,5 +1,5 @@
/* /*
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm # see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm
arm-linux-gnueabi-g++ -o test test.cpp -static arm-linux-gnueabi-g++ -o test test.cpp -static
arm-linux-gnueabi-strip test arm-linux-gnueabi-strip test
*/ */

2
trunk/research/code-statistic/cs.py
View file

@ -2,7 +2,7 @@
''' '''
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/code-statistic/csr.py
View file

@ -2,7 +2,7 @@
''' '''
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/ffempty/ffempty.cc
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/gperftools/cpu-profiler/cpu_profiler.cc
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/gperftools/heap-checker/heap_checker.cc
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/gperftools/heap-profiler/heap_profiler.cc
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/hls/ts_info.cc
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/librtmp/Makefile
View file

@ -38,7 +38,7 @@ help:
@echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, " @echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, "
@echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'" @echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'"
@echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'" @echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'"
@echo " see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_v1_Build" @echo " see: https://github.com/ossrs/srs/wiki/v1_CN_v1_Build"
@echo "Remark: before make this sample, user must make the srs, with/without ssl" @echo "Remark: before make this sample, user must make the srs, with/without ssl"
clean: clean:

8
trunk/research/librtmp/srs_aac_raw_publish.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -35,7 +35,7 @@ gcc srs_aac_raw_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_aa
#include "../../objs/include/srs_librtmp.h" #include "../../objs/include/srs_librtmp.h"
// https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-64145910 // https://github.com/ossrs/srs/issues/212#issuecomment-64145910
int read_audio_frame(char* data, int size, char** pp, char** frame, int* frame_size) int read_audio_frame(char* data, int size, char** pp, char** frame, int* frame_size)
{ {
char* p = *pp; char* p = *pp;
@ -69,7 +69,7 @@ int read_audio_frame(char* data, int size, char** pp, char** frame, int* frame_s
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
printf("publish raw audio as rtmp stream to server like FMLE/FFMPEG/Encoder\n"); printf("publish raw audio as rtmp stream to server like FMLE/FFMPEG/Encoder\n");
printf("SRS(simple-rtmp-server) client librtmp library.\n"); printf("SRS(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {
@ -79,7 +79,7 @@ int main(int argc, char** argv)
printf("For example:\n"); printf("For example:\n");
printf(" %s ./audio.raw.aac rtmp://127.0.0.1:1935/live/livestream\n", argv[0]); printf(" %s ./audio.raw.aac rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.aac\n"); printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.aac\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/212\n"); printf("See: https://github.com/ossrs/srs/issues/212\n");
exit(-1); exit(-1);
} }

8
trunk/research/librtmp/srs_audio_raw_publish.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -35,7 +35,7 @@ gcc srs_audio_raw_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_
#include "../../objs/include/srs_librtmp.h" #include "../../objs/include/srs_librtmp.h"
// https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-63648892 // https://github.com/ossrs/srs/issues/212#issuecomment-63648892
// allspace: // allspace:
// Take this file as an example: https://github.com/allspace/files/blob/master/srs.pcm // Take this file as an example: https://github.com/allspace/files/blob/master/srs.pcm
// It's captured using SDK callback method. I have filtered out h264 video, so it's audio only now. // It's captured using SDK callback method. I have filtered out h264 video, so it's audio only now.
@ -67,7 +67,7 @@ int read_audio_frame(char* audio_raw, int file_size, char** pp, char** pdata, in
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
printf("publish raw audio as rtmp stream to server like FMLE/FFMPEG/Encoder\n"); printf("publish raw audio as rtmp stream to server like FMLE/FFMPEG/Encoder\n");
printf("SRS(simple-rtmp-server) client librtmp library.\n"); printf("SRS(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {
@ -77,7 +77,7 @@ int main(int argc, char** argv)
printf("For example:\n"); printf("For example:\n");
printf(" %s ./audio.raw.pcm rtmp://127.0.0.1:1935/live/livestream\n", argv[0]); printf(" %s ./audio.raw.pcm rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.pcm\n"); printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.pcm\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/212\n"); printf("See: https://github.com/ossrs/srs/issues/212\n");
exit(-1); exit(-1);
} }

4
trunk/research/librtmp/srs_bandwidth_check.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -66,7 +66,7 @@ int main(int argc, char** argv)
srs_version[0] = 0; srs_version[0] = 0;
printf("RTMP bandwidth check/test with server.\n"); printf("RTMP bandwidth check/test with server.\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 1) { if (argc <= 1) {

4
trunk/research/librtmp/srs_detect_rtmp.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -61,7 +61,7 @@ int main(int argc, char** argv)
int timeout = 0; int timeout = 0;
printf("detect rtmp stream\n"); printf("detect rtmp stream\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 3) { if (argc <= 3) {

4
trunk/research/librtmp/srs_flv_injecter.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -57,7 +57,7 @@ int main(int argc, char** argv)
char* tmp_file; char* tmp_file;
printf("inject flv file keyframes to metadata.\n"); printf("inject flv file keyframes to metadata.\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {

4
trunk/research/librtmp/srs_flv_parser.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -46,7 +46,7 @@ int main(int argc, char** argv)
srs_flv_t flv; srs_flv_t flv;
printf("parse and show flv file detail.\n"); printf("parse and show flv file detail.\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 1) { if (argc <= 1) {

6
trunk/research/librtmp/srs_h264_raw_publish.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -79,7 +79,7 @@ int read_h264_frame(char* data, int size, char** pp, int* pnb_start_code, int fp
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
printf("publish raw h.264 as rtmp stream to server like FMLE/FFMPEG/Encoder\n"); printf("publish raw h.264 as rtmp stream to server like FMLE/FFMPEG/Encoder\n");
printf("SRS(simple-rtmp-server) client librtmp library.\n"); printf("SRS(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {
@ -89,7 +89,7 @@ int main(int argc, char** argv)
printf("For example:\n"); printf("For example:\n");
printf(" %s ./720p.h264.raw rtmp://127.0.0.1:1935/live/livestream\n", argv[0]); printf(" %s ./720p.h264.raw rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/720p.h264.raw\n"); printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/720p.h264.raw\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/66\n"); printf("See: https://github.com/ossrs/srs/issues/66\n");
exit(-1); exit(-1);
} }

4
trunk/research/librtmp/srs_ingest_flv.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -62,7 +62,7 @@ int main(int argc, char** argv)
srs_flv_t flv; srs_flv_t flv;
printf("ingest flv file and publish to RTMP server like FFMPEG.\n"); printf("ingest flv file and publish to RTMP server like FFMPEG.\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {

4
trunk/research/librtmp/srs_ingest_rtmp.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -47,7 +47,7 @@ int main(int argc, char** argv)
srs_rtmp_t irtmp, ortmp; srs_rtmp_t irtmp, ortmp;
printf("ingest RTMP and publish to RTMP server like edge.\n"); printf("ingest RTMP and publish to RTMP server like edge.\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 2) { if (argc <= 2) {

4
trunk/research/librtmp/srs_play.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -32,7 +32,7 @@ gcc srs_play.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_play
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
printf("suck rtmp stream like rtmpdump\n"); printf("suck rtmp stream like rtmpdump\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 1) { if (argc <= 1) {

8
trunk/research/librtmp/srs_publish.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -33,7 +33,7 @@ gcc srs_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_publish
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
printf("publish rtmp stream to server like FMLE/FFMPEG/Encoder\n"); printf("publish rtmp stream to server like FMLE/FFMPEG/Encoder\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
if (argc <= 1) { if (argc <= 1) {
@ -46,12 +46,12 @@ int main(int argc, char** argv)
} }
// warn it . // warn it .
// @see: https://github.com/simple-rtmp-server/srs/issues/126 // @see: https://github.com/ossrs/srs/issues/126
srs_human_trace("\033[33m%s\033[0m", srs_human_trace("\033[33m%s\033[0m",
"[warning] it's only a sample to use librtmp. " "[warning] it's only a sample to use librtmp. "
"please never use it to publish and test forward/transcode/edge/HLS whatever. " "please never use it to publish and test forward/transcode/edge/HLS whatever. "
"you should refer to this tool to use the srs-librtmp to publish the real media stream." "you should refer to this tool to use the srs-librtmp to publish the real media stream."
"read about: https://github.com/simple-rtmp-server/srs/issues/126"); "read about: https://github.com/ossrs/srs/issues/126");
srs_human_trace("rtmp url: %s", argv[1]); srs_human_trace("rtmp url: %s", argv[1]);
srs_rtmp_t rtmp = srs_rtmp_create(argv[1]); srs_rtmp_t rtmp = srs_rtmp_create(argv[1]);

4
trunk/research/librtmp/srs_rtmp_dump.c
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -84,7 +84,7 @@ int main(int argc, char** argv)
srs_rtmp_t rtmp = NULL; srs_rtmp_t rtmp = NULL;
printf("dump rtmp stream to flv file\n"); printf("dump rtmp stream to flv file\n");
printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("srs(ossrs) client librtmp library.\n");
printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision());
printf("@refer to http://rtmpdump.mplayerhq.hu/rtmpdump.1.html\n"); printf("@refer to http://rtmpdump.mplayerhq.hu/rtmpdump.1.html\n");

2
trunk/research/players/index.html
View file

@ -32,7 +32,7 @@
<div class="container"> <div class="container">
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
<script type="text/javascript" src="js/jquery-1.10.2.min.js"></script> <script type="text/javascript" src="js/jquery-1.10.2.min.js"></script>

2
trunk/research/players/jwplayer6.html
View file

@ -127,7 +127,7 @@
</div> </div>
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/players/osmf.html
View file

@ -56,7 +56,7 @@
</div> </div>
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/players/srs_bwt.html
View file

@ -67,7 +67,7 @@
</div> </div>
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
<div class="container"> <div class="container">
<div id="player"></div> <div id="player"></div>

2
trunk/research/players/srs_bwt/src/SrsBandwidth.as
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/players/srs_bwt/src/srs.bandwidth.js
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/players/srs_bwt/src/srs_bwt.as
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/research/players/srs_chat.html
View file

@ -246,7 +246,7 @@
</div> </div>
<hr/> <hr/>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

8
trunk/research/players/srs_player.html
View file

@ -54,7 +54,7 @@
<div id="link_modal" class="modal hide fade"> <div id="link_modal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3><a href="https://github.com/simple-rtmp-server/srs">SRS Link Generator</a></h3> <h3><a href="https://github.com/ossrs/srs">SRS Link Generator</a></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-horizontal"> <div class="form-horizontal">
@ -107,7 +107,7 @@
<div class="container"> <div class="container">
<hr/> <hr/>
<span> <span>
注意：必须按照<a href="https://github.com/simple-rtmp-server/srs/wiki/SampleDemo">SRS DEMO</a> 注意：必须按照<a href="https://github.com/ossrs/srs/wiki/SampleDemo">SRS DEMO</a>
启动和设置服务器，下面所有的链接才能观看。 启动和设置服务器，下面所有的链接才能观看。
</span> </span>
<div class="accordion" id="main_accordion"> <div class="accordion" id="main_accordion">
@ -272,7 +272,7 @@
<div id="main_modal" class="modal hide fade"> <div id="main_modal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3><a href="https://github.com/simple-rtmp-server/srs">SrsPlayer</a></h3> <h3><a href="https://github.com/ossrs/srs">SrsPlayer</a></h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div id="player"></div> <div id="player"></div>
@ -368,7 +368,7 @@
</div> </div>
</div> </div>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/players/srs_publisher.html
View file

@ -258,7 +258,7 @@
</div> </div>
</div> </div>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/players/vlc.html
View file

@ -35,7 +35,7 @@
<div class="container"> <div class="container">
<hr> <hr>
<footer> <footer>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p> <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013</a></p>
</footer> </footer>
</div> </div>
</body> </body>

2
trunk/research/st/event.c
View file

@ -310,7 +310,7 @@ ST_HIDDEN void _st_epoll_dispatch(void)
if (_st_epoll_data->pid != getpid()) { if (_st_epoll_data->pid != getpid()) {
// WINLIN: remove it for bug introduced. // WINLIN: remove it for bug introduced.
// @see: https://github.com/simple-rtmp-server/srs/issues/193 // @see: https://github.com/ossrs/srs/issues/193
exit(-1); exit(-1);
} }

2
trunk/scripts/install.sh
View file

@ -108,7 +108,7 @@ else
fi fi
echo "" echo ""
echo "see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LinuxService" echo "see: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService"
echo "install success, you can:" echo "install success, you can:"
echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}" echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}"
echo "srs root is ${INSTALL}" echo "srs root is ${INSTALL}"

2
trunk/scripts/package.sh
View file

@ -108,7 +108,7 @@ fi
ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}" ok_msg "real os is ${os_name}-${os_major_version} ${os_release} ${os_machine}"
# build srs # build srs
# @see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build # @see https://github.com/ossrs/srs/wiki/v1_CN_Build
ok_msg "start build srs" ok_msg "start build srs"
if [ $ARM = YES ]; then if [ $ARM = YES ]; then
( (

2
trunk/scripts/run.sh
View file

@ -52,4 +52,4 @@ echo -e "${GREEN}请在hosts中添加一行：${BLACK}"
echo -e "${RED} $ip demo.srs.com${BLACK}" echo -e "${RED} $ip demo.srs.com${BLACK}"
echo -e "${GREEN}演示地址：${BLACK}" echo -e "${GREEN}演示地址：${BLACK}"
echo -e "${RED} http://$ip:$port${BLACK}" echo -e "${RED} http://$ip:$port${BLACK}"
echo -e "@see https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo" echo -e "@see https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo"

2
trunk/src/app/srs_app_async_call.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_async_call.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

4
trunk/src/app/srs_app_bandwidth.cpp
View file

@ -1,8 +1,8 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

4
trunk/src/app/srs_app_bandwidth.hpp
View file

@ -1,8 +1,8 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

6
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -329,7 +329,7 @@ int SrsDynamicHttpConn::connect_app(string ep_server, string ep_port)
} }
// notify server the edge identity, // notify server the edge identity,
// @see https://github.com/simple-rtmp-server/srs/issues/147 // @see https://github.com/ossrs/srs/issues/147
SrsAmf0Object* data = req->args; SrsAmf0Object* data = req->args;
data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")")); data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_KEY" "RTMP_SIG_SRS_VERSION" ("RTMP_SIG_SRS_URL_SHORT")"));
@ -357,7 +357,7 @@ int SrsDynamicHttpConn::connect_app(string ep_server, string ep_port)
std::string tc_url = srs_generate_tc_url(ep_server, req->vhost, req->app, ep_port, param); std::string tc_url = srs_generate_tc_url(ep_server, req->vhost, req->app, ep_port, param);
// upnode server identity will show in the connect_app of client. // upnode server identity will show in the connect_app of client.
// @see https://github.com/simple-rtmp-server/srs/issues/160 // @see https://github.com/ossrs/srs/issues/160
// the debug_srs_upnode is config in vhost and default to true. // the debug_srs_upnode is config in vhost and default to true.
bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {

2
trunk/src/app/srs_app_caster_flv.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

6
trunk/src/app/srs_app_config.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -49,7 +49,7 @@ using namespace std;
using namespace _srs_internal; using namespace _srs_internal;
#define SRS_WIKI_URL_LOG "https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLog" #define SRS_WIKI_URL_LOG "https://github.com/ossrs/srs/wiki/v1_CN_SrsLog"
// when user config an invalid value, macros to perfer true or false. // when user config an invalid value, macros to perfer true or false.
#define SRS_CONF_PERFER_FALSE(conf_arg) conf_arg == "on" #define SRS_CONF_PERFER_FALSE(conf_arg) conf_arg == "on"
@ -1667,7 +1667,7 @@ int SrsConfig::check_config()
int nb_canbe = max_open_files - nb_consumed_fds - 1; int nb_canbe = max_open_files - nb_consumed_fds - 1;
// for each play connections, we open a pipe(2fds) to convert SrsConsumver to io, // for each play connections, we open a pipe(2fds) to convert SrsConsumver to io,
// refine performance, @see: https://github.com/simple-rtmp-server/srs/issues/194 // refine performance, @see: https://github.com/ossrs/srs/issues/194
if (nb_total >= max_open_files) { if (nb_total >= max_open_files) {
ret = ERROR_SYSTEM_CONFIG_INVALID; ret = ERROR_SYSTEM_CONFIG_INVALID;
srs_error("invalid max_connections=%d, required=%d, system limit to %d, " srs_error("invalid max_connections=%d, required=%d, system limit to %d, "

10
trunk/src/app/srs_app_config.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -181,7 +181,7 @@ class SrsConfig
private: private:
/** /**
* whether srs is run in dolphin mode. * whether srs is run in dolphin mode.
* @see https://github.com/simple-rtmp-server/srs-dolphin * @see https://github.com/ossrs/srs-dolphin
*/ */
bool dolphin; bool dolphin;
std::string dolphin_rtmp_port; std::string dolphin_rtmp_port;
@ -438,7 +438,7 @@ public:
* whether debug_srs_upnode is enabled of vhost. * whether debug_srs_upnode is enabled of vhost.
* debug_srs_upnode is very important feature for tracable log, * debug_srs_upnode is very important feature for tracable log,
* but some server, for instance, flussonic donot support it. * but some server, for instance, flussonic donot support it.
* @see https://github.com/simple-rtmp-server/srs/issues/160 * @see https://github.com/ossrs/srs/issues/160
* @return true when debug_srs_upnode is ok; otherwise, false. * @return true when debug_srs_upnode is ok; otherwise, false.
* @remark, default true. * @remark, default true.
*/ */
@ -667,7 +667,7 @@ public:
virtual bool get_vhost_edge_token_traverse(std::string vhost); virtual bool get_vhost_edge_token_traverse(std::string vhost);
/** /**
* get the transformed vhost for edge, * get the transformed vhost for edge,
* @see https://github.com/simple-rtmp-server/srs/issues/372 * @see https://github.com/ossrs/srs/issues/372
*/ */
virtual std::string get_vhost_edge_transform_vhost(std::string vhost); virtual std::string get_vhost_edge_transform_vhost(std::string vhost);
// vhost security section // vhost security section
@ -899,7 +899,7 @@ public:
* get the hls hls_on_error config. * get the hls hls_on_error config.
* the ignore will ignore error and disable hls. * the ignore will ignore error and disable hls.
* the disconnect will disconnect publish connection. * the disconnect will disconnect publish connection.
* @see https://github.com/simple-rtmp-server/srs/issues/264 * @see https://github.com/ossrs/srs/issues/264
*/ */
virtual std::string get_hls_on_error(std::string vhost); virtual std::string get_hls_on_error(std::string vhost);
/** /**

4
trunk/src/app/srs_app_conn.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -46,7 +46,7 @@ SrsConnection::SrsConnection(IConnectionManager* cm, st_netfd_t c)
// the client thread should reap itself, // the client thread should reap itself,
// so we never use joinable. // so we never use joinable.
// TODO: FIXME: maybe other thread need to stop it. // TODO: FIXME: maybe other thread need to stop it.
// @see: https://github.com/simple-rtmp-server/srs/issues/78 // @see: https://github.com/ossrs/srs/issues/78
pthread = new SrsOneCycleThread("conn", this); pthread = new SrsOneCycleThread("conn", this);
} }

2
trunk/src/app/srs_app_conn.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

6
trunk/src/app/srs_app_dvr.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -519,7 +519,7 @@ int SrsDvrAsyncCallOnDvr::call()
// the http hooks will cause context switch, // the http hooks will cause context switch,
// so we must copy all hooks for the on_connect may freed. // so we must copy all hooks for the on_connect may freed.
// @see https://github.com/simple-rtmp-server/srs/issues/475 // @see https://github.com/ossrs/srs/issues/475
vector<string> hooks; vector<string> hooks;
if (true) { if (true) {
@ -928,7 +928,7 @@ int SrsDvrSegmentPlan::update_duration(SrsSharedPtrMessage* msg)
} }
// when wait keyframe, ignore if no frame arrived. // when wait keyframe, ignore if no frame arrived.
// @see https://github.com/simple-rtmp-server/srs/issues/177 // @see https://github.com/ossrs/srs/issues/177
if (_srs_config->get_dvr_wait_keyframe(req->vhost)) { if (_srs_config->get_dvr_wait_keyframe(req->vhost)) {
if (!msg->is_video()) { if (!msg->is_video()) {
return ret; return ret;

2
trunk/src/app/srs_app_dvr.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

20
trunk/src/app/srs_app_edge.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in
@ -222,7 +222,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
} }
// notify server the edge identity, // notify server the edge identity,
// @see https://github.com/simple-rtmp-server/srs/issues/147 // @see https://github.com/ossrs/srs/issues/147
SrsAmf0Object* data = req->args; SrsAmf0Object* data = req->args;
data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
@ -246,7 +246,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
data->set("srs_server_ip", SrsAmf0Any::str(local_ip.c_str())); data->set("srs_server_ip", SrsAmf0Any::str(local_ip.c_str()));
// support vhost tranform for edge, // support vhost tranform for edge,
// @see https://github.com/simple-rtmp-server/srs/issues/372 // @see https://github.com/ossrs/srs/issues/372
std::string vhost = _srs_config->get_vhost_edge_transform_vhost(req->vhost); std::string vhost = _srs_config->get_vhost_edge_transform_vhost(req->vhost);
vhost = srs_string_replace(vhost, "[vhost]", req->vhost); vhost = srs_string_replace(vhost, "[vhost]", req->vhost);
// generate the tcUrl // generate the tcUrl
@ -259,7 +259,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
req->tcUrl = tc_url; req->tcUrl = tc_url;
// upnode server identity will show in the connect_app of client. // upnode server identity will show in the connect_app of client.
// @see https://github.com/simple-rtmp-server/srs/issues/160 // @see https://github.com/ossrs/srs/issues/160
// the debug_srs_upnode is config in vhost and default to true. // the debug_srs_upnode is config in vhost and default to true.
bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {
@ -342,7 +342,7 @@ int SrsEdgeIngester::connect_server(string& ep_server, string& ep_port)
SrsConfDirective* conf = _srs_config->get_vhost_edge_origin(_req->vhost); SrsConfDirective* conf = _srs_config->get_vhost_edge_origin(_req->vhost);
// @see https://github.com/simple-rtmp-server/srs/issues/79 // @see https://github.com/ossrs/srs/issues/79
// when origin is error, for instance, server is shutdown, // when origin is error, for instance, server is shutdown,
// then user remove the vhost then reload, the conf is empty. // then user remove the vhost then reload, the conf is empty.
if (!conf) { if (!conf) {
@ -655,7 +655,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
} }
// notify server the edge identity, // notify server the edge identity,
// @see https://github.com/simple-rtmp-server/srs/issues/147 // @see https://github.com/ossrs/srs/issues/147
SrsAmf0Object* data = req->args; SrsAmf0Object* data = req->args;
data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY)); data->set("srs_sig", SrsAmf0Any::str(RTMP_SIG_SRS_KEY));
data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER)); data->set("srs_server", SrsAmf0Any::str(RTMP_SIG_SRS_SERVER));
@ -679,7 +679,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
data->set("srs_server_ip", SrsAmf0Any::str(local_ip.c_str())); data->set("srs_server_ip", SrsAmf0Any::str(local_ip.c_str()));
// support vhost tranform for edge, // support vhost tranform for edge,
// @see https://github.com/simple-rtmp-server/srs/issues/372 // @see https://github.com/ossrs/srs/issues/372
std::string vhost = _srs_config->get_vhost_edge_transform_vhost(req->vhost); std::string vhost = _srs_config->get_vhost_edge_transform_vhost(req->vhost);
vhost = srs_string_replace(vhost, "[vhost]", req->vhost); vhost = srs_string_replace(vhost, "[vhost]", req->vhost);
// generate the tcUrl // generate the tcUrl
@ -692,7 +692,7 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
req->tcUrl = tc_url; req->tcUrl = tc_url;
// upnode server identity will show in the connect_app of client. // upnode server identity will show in the connect_app of client.
// @see https://github.com/simple-rtmp-server/srs/issues/160 // @see https://github.com/ossrs/srs/issues/160
// the debug_srs_upnode is config in vhost and default to true. // the debug_srs_upnode is config in vhost and default to true.
bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost); bool debug_srs_upnode = _srs_config->get_debug_srs_upnode(req->vhost);
if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) { if ((ret = client->connect_app(req->app, tc_url, req, debug_srs_upnode)) != ERROR_SUCCESS) {
@ -816,7 +816,7 @@ int SrsPublishEdge::on_client_publish()
return ret; return ret;
} }
// @see https://github.com/simple-rtmp-server/srs/issues/180 // @see https://github.com/ossrs/srs/issues/180
// to avoid multiple publish the same stream on the same edge, // to avoid multiple publish the same stream on the same edge,
// directly enter the publish stage. // directly enter the publish stage.
if (true) { if (true) {
@ -828,7 +828,7 @@ int SrsPublishEdge::on_client_publish()
// start to forward stream to origin. // start to forward stream to origin.
ret = forwarder->start(); ret = forwarder->start();
// @see https://github.com/simple-rtmp-server/srs/issues/180 // @see https://github.com/ossrs/srs/issues/180
// when failed, revert to init // when failed, revert to init
if (ret != ERROR_SUCCESS) { if (ret != ERROR_SUCCESS) {
SrsEdgeState pstate = state; SrsEdgeState pstate = state;

2
trunk/src/app/srs_app_edge.hpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

2
trunk/src/app/srs_app_empty.cpp
View file

@ -1,7 +1,7 @@
/* /*
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013-2015 SRS(simple-rtmp-server) Copyright (c) 2013-2015 SRS(ossrs)
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

Some files were not shown because too many files have changed in this diff Show more