diff --git a/LICENSE b/LICENSE index 67b63a159..ce79e6ca5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ 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 this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 256a1095f..d78973425 100755 --- a/README.md +++ b/README.md @@ -68,10 +68,10 @@ A big THANK YOU goes to: ## 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]) @@ -97,7 +97,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git Step 1: get SRS 
-git clone https://github.com/simple-rtmp-server/srs &&
+git clone https://github.com/ossrs/srs &&
 cd srs/trunk
@@ -152,7 +152,7 @@ Donation:
[http://www.ossrs.net/srs.release/donation/index.html][donation1] Donations:
-[https://github.com/simple-rtmp-server/srs/blob/develop/DONATIONS.txt][donations] +[https://github.com/ossrs/srs/blob/develop/DONATIONS.txt][donations] ## System Requirements Supported operating systems and hardware: @@ -846,40 +846,40 @@ Remark: (1) Encoder: encoder must push RTMP stream to SRS server. (2) MediaSource: any media source, which can be ingest by ffmpeg. (3) Ingester: SRS will fork a process to run ffmpeg(or your application) -to ingest any input to rtmp, push to SRS. Read Ingest. +to ingest any input to rtmp, push to SRS. Read Ingest. (4) Streamer: SRS will listen for some protocol and accept stream push -over some protocol and remux to rtmp to SRS. Read Streamer. +over some protocol and remux to rtmp to SRS. Read Streamer. Beijing, 2013.10
Winlin -[p1]: https://github.com/simple-rtmp-server/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8 -[p2]: https://github.com/simple-rtmp-server/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf -[p3]: https://github.com/simple-rtmp-server/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff -[p4]: https://github.com/simple-rtmp-server/srs/commit/f57801eb46c16755b173984b915a4166922df6a6 -[p5]: https://github.com/simple-rtmp-server/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da -[p6]: https://github.com/simple-rtmp-server/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be -[p7]: https://github.com/simple-rtmp-server/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247 -[p8]: https://github.com/simple-rtmp-server/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1 -[p9]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 -[p10]: https://github.com/simple-rtmp-server/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 -[p11]: https://github.com/simple-rtmp-server/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004 -[p12]: https://github.com/simple-rtmp-server/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8 -[p13]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 -[p14]: https://github.com/simple-rtmp-server/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 -[p15]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc -[p16]: https://github.com/simple-rtmp-server/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc -[p17]: https://github.com/simple-rtmp-server/srs/commit/fc995473eb02c7cf64b5b212b456e11f34aa7984 -[p18]: https://github.com/simple-rtmp-server/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73 -[p19]: https://github.com/simple-rtmp-server/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9 -[p20]: https://github.com/simple-rtmp-server/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a -[p21]: https://github.com/simple-rtmp-server/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c -[p22]: https://github.com/simple-rtmp-server/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa -[p23]: https://github.com/simple-rtmp-server/srs/pull/239 - -[authors]: https://github.com/simple-rtmp-server/srs/blob/develop/AUTHORS.txt -[bigthanks]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#bigthanks +[p1]: https://github.com/ossrs/srs/commit/787ab674e38734ea8e0678101614fdcd84645dc8 +[p2]: https://github.com/ossrs/srs/commit/f35ec2155b1408d528a9f37da7904c9625186bcf +[p3]: https://github.com/ossrs/srs/commit/29324fab469e0f7cef9ad04ffdbce832ac7dd9ff +[p4]: https://github.com/ossrs/srs/commit/f57801eb46c16755b173984b915a4166922df6a6 +[p5]: https://github.com/ossrs/srs/commit/5589b13d2e216b91f97afb78ee0c011b2fccf7da +[p6]: https://github.com/ossrs/srs/commit/1ae3e6c64cc5cee90e6050c26968ebc3c18281be +[p7]: https://github.com/ossrs/srs/commit/8acd143a7a152885b815999162660fd4e7a3f247 +[p8]: https://github.com/ossrs/srs/commit/cc6aca9ad55342a06440ce7f3b38453776b2b2d1 +[p9]: https://github.com/ossrs/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 +[p10]: https://github.com/ossrs/srs/commit/58136ec178e3d47db6c90a59875d7e40946936e5 +[p11]: https://github.com/ossrs/srs/commit/9ee138746f83adc26f0e236ec017f4d68a300004 +[p12]: https://github.com/ossrs/srs/commit/1311b6fe6576fd7b9c6d299b0f8f2e8d202f4bf8 +[p13]: https://github.com/ossrs/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 +[p14]: https://github.com/ossrs/srs/commit/10297fab519811845b549a8af40a6bcbd23411e8 +[p15]: https://github.com/ossrs/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc +[p16]: https://github.com/ossrs/srs/commit/0d6b91039d408328caab31a1077d56a809b6bebc +[p17]: https://github.com/ossrs/srs/commit/fc995473eb02c7cf64b5b212b456e11f34aa7984 +[p18]: https://github.com/ossrs/srs/commit/960341b9b2b9646270ccfd113b4dd784d9826c73 +[p19]: https://github.com/ossrs/srs/commit/4df19ba99a4e4d80cd89b304f9298d343497bec9 +[p20]: https://github.com/ossrs/srs/commit/d12fc7fcc5b2e9e3c8ee5c7da01d0e41c8f8ca4a +[p21]: https://github.com/ossrs/srs/commit/87519aaae835199e5adb60c0ae2c1cd24939448c +[p22]: https://github.com/ossrs/srs/commit/5a4373d4835758188b9a1f03005cea0b6ddc62aa +[p23]: https://github.com/ossrs/srs/pull/239 + +[authors]: https://github.com/ossrs/srs/blob/develop/AUTHORS.txt +[bigthanks]: https://github.com/ossrs/srs/wiki/v1_CN_Product#bigthanks [st]: https://github.com/winlinvip/state-threads [st2]: http://sourceforge.net/projects/state-threads/ [state-threads]: http://sourceforge.net/projects/state-threads/ @@ -888,362 +888,362 @@ Winlin [nginx]: http://nginx.org/ [FFMPEG]: http://ffmpeg.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 [oschina]: http://git.oschina.net/winlinvip/srs.oschina -[srs-dolphin]: https://github.com/simple-rtmp-server/srs-dolphin -[srs-bench]: https://github.com/simple-rtmp-server/srs-bench -[srs-ngb]: https://github.com/simple-rtmp-server/srs-ngb -[srs-librtmp]: https://github.com/simple-rtmp-server/srs-librtmp +[srs-dolphin]: https://github.com/ossrs/srs-dolphin +[srs-bench]: https://github.com/ossrs/srs-bench +[srs-ngb]: https://github.com/ossrs/srs-ngb +[srs-librtmp]: https://github.com/ossrs/srs-librtmp [gitlab]: https://gitlab.com/winlinvip/srs-gitlab [console]: http://ossrs.net:1985/console -[v1_CN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Git -[v1_EN_Git]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Git -[v1_CN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMP -[v1_EN_SampleRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleRTMP -[v1_CN_SampleRTMPCluster]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleRTMPCluster -[v1_EN_SampleRTMPCluster]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleRTMPCluster -[v2_CN_SampleHLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHLS -[v2_EN_SampleHLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHLS -[v2_CN_SampleTranscode2HLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleTranscode2HLS -[v2_EN_SampleTranscode2HLS]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleTranscode2HLS -[v2_CN_SampleFFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleFFMPEG -[v2_EN_SampleFFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleFFMPEG -[v1_CN_SampleForward]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleForward -[v1_EN_SampleForward]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleForward -[v2_CN_SampleRealtime]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleRealtime -[v2_EN_SampleRealtime]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleRealtime -[v1_CN_SampleARM]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleARM -[v1_EN_SampleARM]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleARM -[v1_CN_SampleIngest]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleIngest -[v1_EN_SampleIngest]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleIngest -[v1_CN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleHTTP -[v1_EN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleHTTP -[v1_CN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo -[v1_EN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleDemo -[v2_CN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/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 -[v1_CN_Sample]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Sample -[v1_EN_Sample]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Sample -[v1_CN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product -[v1_EN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Product -[v1_CN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Home -[v1_EN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Home -[v2_CN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Home -[v2_EN_Home]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home +[v1_CN_Git]: https://github.com/ossrs/srs/wiki/v1_CN_Git +[v1_EN_Git]: https://github.com/ossrs/srs/wiki/v1_EN_Git +[v1_CN_SampleRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleRTMP +[v1_EN_SampleRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleRTMP +[v1_CN_SampleRTMPCluster]: https://github.com/ossrs/srs/wiki/v1_CN_SampleRTMPCluster +[v1_EN_SampleRTMPCluster]: https://github.com/ossrs/srs/wiki/v1_EN_SampleRTMPCluster +[v2_CN_SampleHLS]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHLS +[v2_EN_SampleHLS]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHLS +[v2_CN_SampleTranscode2HLS]: https://github.com/ossrs/srs/wiki/v2_CN_SampleTranscode2HLS +[v2_EN_SampleTranscode2HLS]: https://github.com/ossrs/srs/wiki/v2_EN_SampleTranscode2HLS +[v2_CN_SampleFFMPEG]: https://github.com/ossrs/srs/wiki/v2_CN_SampleFFMPEG +[v2_EN_SampleFFMPEG]: https://github.com/ossrs/srs/wiki/v2_EN_SampleFFMPEG +[v1_CN_SampleForward]: https://github.com/ossrs/srs/wiki/v1_CN_SampleForward +[v1_EN_SampleForward]: https://github.com/ossrs/srs/wiki/v1_EN_SampleForward +[v2_CN_SampleRealtime]: https://github.com/ossrs/srs/wiki/v2_CN_SampleRealtime +[v2_EN_SampleRealtime]: https://github.com/ossrs/srs/wiki/v2_EN_SampleRealtime +[v1_CN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_CN_SampleARM +[v1_EN_SampleARM]: https://github.com/ossrs/srs/wiki/v1_EN_SampleARM +[v1_CN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_CN_SampleIngest +[v1_EN_SampleIngest]: https://github.com/ossrs/srs/wiki/v1_EN_SampleIngest +[v1_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_CN_SampleHTTP +[v1_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v1_EN_SampleHTTP +[v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo +[v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo +[v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_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/ossrs/srs/wiki/v1_CN_Sample +[v1_EN_Sample]: https://github.com/ossrs/srs/wiki/v1_EN_Sample +[v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product +[v1_EN_Product]: https://github.com/ossrs/srs/wiki/v1_EN_Product +[v1_CN_Home]: https://github.com/ossrs/srs/wiki/v1_CN_Home +[v1_EN_Home]: https://github.com/ossrs/srs/wiki/v1_EN_Home +[v2_CN_Home]: https://github.com/ossrs/srs/wiki/v2_CN_Home +[v2_EN_Home]: https://github.com/ossrs/srs/wiki/v2_EN_Home [donation0]: http://winlinvip.github.io/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 - -[v2_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Build -[v2_EN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Build -[v1_CN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance -[v1_EN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Performance -[v1_CN_DeliveryRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryRTMP -[v1_EN_DeliveryRTMP]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryRTMP -[v1_CN_Edge]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Edge -[v1_EN_Edge]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Edge -[v1_CN_RtmpUrlVhost]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RtmpUrlVhost -[v1_EN_RtmpUrlVhost]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_RtmpUrlVhost -[v1_CN_DeliveryHLS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHLS -[v1_EN_DeliveryHLS]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHLS -[v1_CN_DeliveryHLS2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly -[v1_EN_DeliveryHLS2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly -[v1_CN_Reload]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Reload -[v1_EN_Reload]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Reload -[v1_CN_LowLatency2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency#gop-cache -[v1_EN_LowLatency2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_LowLatency#gop-cache -[v1_CN_Forward]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Forward -[v1_EN_Forward]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Forward -[v1_CN_FFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_FFMPEG -[v1_EN_FFMPEG]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_FFMPEG -[v1_CN_HTTPCallback]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HTTPCallback -[v1_EN_HTTPCallback]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_HTTPCallback -[v1_CN_BandwidthTestTool]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_BandwidthTestTool -[v1_EN_BandwidthTestTool]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_BandwidthTestTool -[v1_CN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo -[v1_EN_SampleDemo]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SampleDemo -[v2_CN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SrsLibrtmp -[v2_EN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SrsLibrtmp -[v1_CN_SrsLinuxArm]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm -[v1_EN_SrsLinuxArm]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SrsLinuxArm -[v1_CN_LinuxService]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LinuxService -[v1_EN_LinuxService]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_LinuxService -[v1_CN_RTMP-ATC]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RTMP-ATC -[v1_EN_RTMP-ATC]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_RTMP-ATC -[v1_CN_HTTPApi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HTTPApi -[v1_EN_HTTPApi]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_HTTPApi -[v1_CN_Ingest]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Ingest -[v1_EN_Ingest]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_Ingest -[v1_CN_DVR]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DVR -[v1_EN_DVR]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DVR -[v1_CN_SrsLog]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLog -[v1_EN_SrsLog]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_SrsLog -[v1_CN_DRM2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse -[v1_EN_DRM2]: https://github.com/simple-rtmp-server/srs/wiki/v1_EN_DRM#tokentraverse -[v2_CN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHTTP -[v2_EN_SampleHTTP]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHTTP -[v2_CN_FlvVodStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_FlvVodStream -[v2_EN_FlvVodStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_FlvVodStream -[v2_CN_SrsLibrtmp2]: https://github.com/simple-rtmp-server/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_CN_SrsLibrtmp3]: https://github.com/simple-rtmp-server/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_CN_Security]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Security -[v2_EN_Security]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Security -[v2_CN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_DeliveryHttpStream -[v2_EN_DeliveryHttpStream]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHttpStream -[v1_CN_DeliveryHDS]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DeliveryHDS -[v1_EN_DeliveryHDS]: https://github.com/simple-rtmp-server/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_EN_Streamer2]: https://github.com/simple-rtmp-server/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_EN_SampleHttpFlv]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlv -[v2_CN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_SampleHttpFlvCluster -[v2_EN_SampleHttpFlvCluster]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_SampleHttpFlvCluster -[v2_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency -[v2_EN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency -[v2_EN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/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_DRM#tokentraverse]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_DRM#tokentraverse -[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi -[v1_CN_SrsLibrtmp]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLibrtmp -[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build -[v1_CN_LowLatency]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_LowLatency -[v1_CN_HowToAskQuestion]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_HowToAskQuestion -[v1_CN_Build]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Build -[v1_CN_Performance]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Performance -[v1_CN_RaspberryPi]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_RaspberryPi -[v2_CN_LowLatency#merged-read]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-read -[v1_CN_Product]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product -[v1_CN_ServerSideScript]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_ServerSideScript -[v2_EN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_LowLatency#merged-write -[v1_CN_IDE]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_IDE -[v2_CN_LowLatency#merged-write]: https://github.com/simple-rtmp-server/srs/wiki/v2_CN_LowLatency#merged-write - -[bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 -[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 -[bug #182]: https://github.com/simple-rtmp-server/srs/issues/182 -[bug #257]: https://github.com/simple-rtmp-server/srs/issues/257 -[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 -[bug #224]: https://github.com/simple-rtmp-server/srs/issues/224 -[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 -[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 -[bug #250]: https://github.com/simple-rtmp-server/srs/issues/250 -[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #133]: https://github.com/simple-rtmp-server/srs/issues/133 -[bug #92]: https://github.com/simple-rtmp-server/srs/issues/92 -[bug #380]: https://github.com/simple-rtmp-server/srs/issues/380 -[bug #474]: https://github.com/simple-rtmp-server/srs/issues/474 -[bug #484]: https://github.com/simple-rtmp-server/srs/issues/484 -[bug #485]: https://github.com/simple-rtmp-server/srs/issues/485 -[bug #495]: https://github.com/simple-rtmp-server/srs/issues/495 -[bug #497]: https://github.com/simple-rtmp-server/srs/issues/497 -[bug #448]: https://github.com/simple-rtmp-server/srs/issues/448 -[bug #475]: https://github.com/simple-rtmp-server/srs/issues/475 -[bug #458]: https://github.com/simple-rtmp-server/srs/issues/458 -[bug #454]: https://github.com/simple-rtmp-server/srs/issues/454 -[bug #442]: https://github.com/simple-rtmp-server/srs/issues/442 -[bug #169]: https://github.com/simple-rtmp-server/srs/issues/169 -[bug #441]: https://github.com/simple-rtmp-server/srs/issues/441 -[bug #433]: https://github.com/simple-rtmp-server/srs/issues/433 -[bug #425]: https://github.com/simple-rtmp-server/srs/issues/425 -[bug #424]: https://github.com/simple-rtmp-server/srs/issues/424 -[bug #421]: https://github.com/simple-rtmp-server/srs/issues/421 -[bug #435]: https://github.com/simple-rtmp-server/srs/issues/435 -[bug #420]: https://github.com/simple-rtmp-server/srs/issues/420 -[bug #209]: https://github.com/simple-rtmp-server/srs/issues/209 -[bug #409]: https://github.com/simple-rtmp-server/srs/issues/409 -[bug #404]: https://github.com/simple-rtmp-server/srs/issues/404 -[bug #391]: https://github.com/simple-rtmp-server/srs/issues/391 -[bug #397]: https://github.com/simple-rtmp-server/srs/issues/397 -[bug #400]: https://github.com/simple-rtmp-server/srs/issues/400 -[bug #383]: https://github.com/simple-rtmp-server/srs/issues/383 -[bug #381]: https://github.com/simple-rtmp-server/srs/issues/381 -[bug #375]: https://github.com/simple-rtmp-server/srs/issues/375 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #372]: https://github.com/simple-rtmp-server/srs/issues/372 -[bug #366]: https://github.com/simple-rtmp-server/srs/issues/366 -[bug #351]: https://github.com/simple-rtmp-server/srs/issues/351 -[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 -[bug #324]: https://github.com/simple-rtmp-server/srs/issues/324 -[bug #324]: https://github.com/simple-rtmp-server/srs/issues/324 -[bug #328]: https://github.com/simple-rtmp-server/srs/issues/328 -[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 -[bug #316]: https://github.com/simple-rtmp-server/srs/issues/316 -[bug #310]: https://github.com/simple-rtmp-server/srs/issues/310 -[bug #322]: https://github.com/simple-rtmp-server/srs/issues/322 -[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #133]: https://github.com/simple-rtmp-server/srs/issues/133 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #304]: https://github.com/simple-rtmp-server/srs/issues/304 -[bug #311]: https://github.com/simple-rtmp-server/srs/issues/311 -[bug #310]: https://github.com/simple-rtmp-server/srs/issues/310 -[bug #136]: https://github.com/simple-rtmp-server/srs/issues/136 -[bug #250]: https://github.com/simple-rtmp-server/srs/issues/250 -[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 -[bug #301]: https://github.com/simple-rtmp-server/srs/issues/301 -[bug #268]: https://github.com/simple-rtmp-server/srs/issues/268 -[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 -[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 -[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 -[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 -[bug #293]: https://github.com/simple-rtmp-server/srs/issues/293 -[bug #277]: https://github.com/simple-rtmp-server/srs/issues/277 -[bug #277]: https://github.com/simple-rtmp-server/srs/issues/277 -[bug #290]: https://github.com/simple-rtmp-server/srs/issues/290 -[bug #281]: https://github.com/simple-rtmp-server/srs/issues/281 -[bug #274]: https://github.com/simple-rtmp-server/srs/issues/274 -[bug #179]: https://github.com/simple-rtmp-server/srs/issues/179 -[bug #211]: https://github.com/simple-rtmp-server/srs/issues/211 -[bug #207]: https://github.com/simple-rtmp-server/srs/issues/207 -[bug #158]: https://github.com/simple-rtmp-server/srs/issues/158 -[bug #216]: https://github.com/simple-rtmp-server/srs/issues/216 -[bug #263]: https://github.com/simple-rtmp-server/srs/issues/263 -[bug #270]: https://github.com/simple-rtmp-server/srs/issues/270 -[bug #266]: https://github.com/simple-rtmp-server/srs/issues/266 -[bug #267]: https://github.com/simple-rtmp-server/srs/issues/267 -[bug #268]: https://github.com/simple-rtmp-server/srs/issues/268 -[bug #264]: https://github.com/simple-rtmp-server/srs/issues/264 -[bug #264]: https://github.com/simple-rtmp-server/srs/issues/264 -[bug #257]: https://github.com/simple-rtmp-server/srs/issues/257 -[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 -[bug #251]: https://github.com/simple-rtmp-server/srs/issues/251 -[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 -[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 -[bug #241]: https://github.com/simple-rtmp-server/srs/issues/241 -[bug #248]: https://github.com/simple-rtmp-server/srs/issues/248 -[bug #244]: https://github.com/simple-rtmp-server/srs/issues/244 -[bug #237]: https://github.com/simple-rtmp-server/srs/issues/237 -[bug #235]: https://github.com/simple-rtmp-server/srs/issues/235 -[bug #215]: https://github.com/simple-rtmp-server/srs/issues/215 -[bug #212]: https://github.com/simple-rtmp-server/srs/issues/212 -[bug #217]: https://github.com/simple-rtmp-server/srs/issues/217 -[bug #212]: https://github.com/simple-rtmp-server/srs/issues/212 -[bug #213]: https://github.com/simple-rtmp-server/srs/issues/213 -[bug #204]: https://github.com/simple-rtmp-server/srs/issues/204 -[bug #203]: https://github.com/simple-rtmp-server/srs/issues/203 -[bug #202]: https://github.com/simple-rtmp-server/srs/issues/202 -[bug #200]: https://github.com/simple-rtmp-server/srs/issues/200 -[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 -[bug #194]: https://github.com/simple-rtmp-server/srs/issues/194 -[bug #195]: https://github.com/simple-rtmp-server/srs/issues/195 -[bug #191]: https://github.com/simple-rtmp-server/srs/issues/191 -[bug #66]: https://github.com/simple-rtmp-server/srs/issues/66 -[bug #185]: https://github.com/simple-rtmp-server/srs/issues/185 -[bug #186]: https://github.com/simple-rtmp-server/srs/issues/186 -[bug #184]: https://github.com/simple-rtmp-server/srs/issues/184 -[bug #151]: https://github.com/simple-rtmp-server/srs/issues/151 -[bug #162]: https://github.com/simple-rtmp-server/srs/issues/162 -[bug #180]: https://github.com/simple-rtmp-server/srs/issues/180 -[bug #177]: https://github.com/simple-rtmp-server/srs/issues/177 -[bug #167]: https://github.com/simple-rtmp-server/srs/issues/167 -[bug #150]: https://github.com/simple-rtmp-server/srs/issues/150 -[bug #165]: https://github.com/simple-rtmp-server/srs/issues/165 -[bug #160]: https://github.com/simple-rtmp-server/srs/issues/160 -[bug #155]: https://github.com/simple-rtmp-server/srs/issues/155 -[bug #148]: https://github.com/simple-rtmp-server/srs/issues/148 -[bug #147]: https://github.com/simple-rtmp-server/srs/issues/147 -[bug #79]: https://github.com/simple-rtmp-server/srs/issues/79 -[bug #57]: https://github.com/simple-rtmp-server/srs/issues/57 -[bug #85]: https://github.com/simple-rtmp-server/srs/issues/85 -[bug #145]: https://github.com/simple-rtmp-server/srs/issues/145 -[bug #143]: https://github.com/simple-rtmp-server/srs/issues/143 -[bug #138]: https://github.com/simple-rtmp-server/srs/issues/138 -[bug #142]: https://github.com/simple-rtmp-server/srs/issues/142 -[bug #141]: https://github.com/simple-rtmp-server/srs/issues/141 -[bug #124]: https://github.com/simple-rtmp-server/srs/issues/124 -[bug #121]: https://github.com/simple-rtmp-server/srs/issues/121 -[bug #119]: https://github.com/simple-rtmp-server/srs/issues/119 -[bug #81]: https://github.com/simple-rtmp-server/srs/issues/81 -[bug #103]: https://github.com/simple-rtmp-server/srs/issues/103 -[bug #111]: https://github.com/simple-rtmp-server/srs/issues/111 -[bug #110]: https://github.com/simple-rtmp-server/srs/issues/110 -[bug #109]: https://github.com/simple-rtmp-server/srs/issues/109 -[bug #108]: https://github.com/simple-rtmp-server/srs/issues/108 -[bug #98]: https://github.com/simple-rtmp-server/srs/issues/98 -[bug #87]: https://github.com/simple-rtmp-server/srs/issues/87 -[bug #84]: https://github.com/simple-rtmp-server/srs/issues/84 -[bug #89]: https://github.com/simple-rtmp-server/srs/issues/89 -[bug #76]: https://github.com/simple-rtmp-server/srs/issues/76 -[bug #78]: https://github.com/simple-rtmp-server/srs/issues/78 -[bug #74]: https://github.com/simple-rtmp-server/srs/issues/74 -[bug #72]: https://github.com/simple-rtmp-server/srs/issues/72 -[bug #67]: https://github.com/simple-rtmp-server/srs/issues/67 -[bug #64]: https://github.com/simple-rtmp-server/srs/issues/64 -[bug #36]: https://github.com/simple-rtmp-server/srs/issues/36 -[bug #60]: https://github.com/simple-rtmp-server/srs/issues/60 -[bug #59]: https://github.com/simple-rtmp-server/srs/issues/59 -[bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 -[bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 -[bug #257-c0]: https://github.com/simple-rtmp-server/srs/issues/257#issuecomment-66864413 -[bug #110]: https://github.com/simple-rtmp-server/srs/issues/110 -[bug #109]: https://github.com/simple-rtmp-server/srs/issues/109 -[bug #108]: https://github.com/simple-rtmp-server/srs/issues/108 -[bug #104]: https://github.com/simple-rtmp-server/srs/issues/104 -[bug #98]: https://github.com/simple-rtmp-server/srs/issues/98 -[bug #87]: https://github.com/simple-rtmp-server/srs/issues/87 -[bug #84]: https://github.com/simple-rtmp-server/srs/issues/84 -[bug #89]: https://github.com/simple-rtmp-server/srs/issues/89 -[bug #76]: https://github.com/simple-rtmp-server/srs/issues/76 -[bug #78]: https://github.com/simple-rtmp-server/srs/issues/78 -[bug #74]: https://github.com/simple-rtmp-server/srs/issues/74 -[bug #72]: https://github.com/simple-rtmp-server/srs/issues/72 -[bug #67]: https://github.com/simple-rtmp-server/srs/issues/67 -[bug #64]: https://github.com/simple-rtmp-server/srs/issues/64 -[bug #36]: https://github.com/simple-rtmp-server/srs/issues/36 -[bug #60]: https://github.com/simple-rtmp-server/srs/issues/60 -[bug #59]: https://github.com/simple-rtmp-server/srs/issues/59 -[bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 -[bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 -[bug #512]: https://github.com/simple-rtmp-server/srs/issues/512 -[bug #515]: https://github.com/simple-rtmp-server/srs/issues/515 -[bug #511]: https://github.com/simple-rtmp-server/srs/issues/511 -[bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx +[donations]: https://github.com/ossrs/srs/blob/develop/DONATIONS.txt + +[v2_CN_Build]: https://github.com/ossrs/srs/wiki/v2_CN_Build +[v2_EN_Build]: https://github.com/ossrs/srs/wiki/v2_EN_Build +[v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance +[v1_EN_Performance]: https://github.com/ossrs/srs/wiki/v1_EN_Performance +[v1_CN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryRTMP +[v1_EN_DeliveryRTMP]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryRTMP +[v1_CN_Edge]: https://github.com/ossrs/srs/wiki/v1_CN_Edge +[v1_EN_Edge]: https://github.com/ossrs/srs/wiki/v1_EN_Edge +[v1_CN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_CN_RtmpUrlVhost +[v1_EN_RtmpUrlVhost]: https://github.com/ossrs/srs/wiki/v1_EN_RtmpUrlVhost +[v1_CN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS +[v1_EN_DeliveryHLS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS +[v1_CN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHLS#hlsaudioonly +[v1_EN_DeliveryHLS2]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHLS#hlsaudioonly +[v1_CN_Reload]: https://github.com/ossrs/srs/wiki/v1_CN_Reload +[v1_EN_Reload]: https://github.com/ossrs/srs/wiki/v1_EN_Reload +[v1_CN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency#gop-cache +[v1_EN_LowLatency2]: https://github.com/ossrs/srs/wiki/v1_EN_LowLatency#gop-cache +[v1_CN_Forward]: https://github.com/ossrs/srs/wiki/v1_CN_Forward +[v1_EN_Forward]: https://github.com/ossrs/srs/wiki/v1_EN_Forward +[v1_CN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_CN_FFMPEG +[v1_EN_FFMPEG]: https://github.com/ossrs/srs/wiki/v1_EN_FFMPEG +[v1_CN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPCallback +[v1_EN_HTTPCallback]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPCallback +[v1_CN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_CN_BandwidthTestTool +[v1_EN_BandwidthTestTool]: https://github.com/ossrs/srs/wiki/v1_EN_BandwidthTestTool +[v1_CN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_CN_SampleDemo +[v1_EN_SampleDemo]: https://github.com/ossrs/srs/wiki/v1_EN_SampleDemo +[v2_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_CN_SrsLibrtmp +[v2_EN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v2_EN_SrsLibrtmp +[v1_CN_SrsLinuxArm]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm +[v1_EN_SrsLinuxArm]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLinuxArm +[v1_CN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_CN_LinuxService +[v1_EN_LinuxService]: https://github.com/ossrs/srs/wiki/v1_EN_LinuxService +[v1_CN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_CN_RTMP-ATC +[v1_EN_RTMP-ATC]: https://github.com/ossrs/srs/wiki/v1_EN_RTMP-ATC +[v1_CN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_CN_HTTPApi +[v1_EN_HTTPApi]: https://github.com/ossrs/srs/wiki/v1_EN_HTTPApi +[v1_CN_Ingest]: https://github.com/ossrs/srs/wiki/v1_CN_Ingest +[v1_EN_Ingest]: https://github.com/ossrs/srs/wiki/v1_EN_Ingest +[v1_CN_DVR]: https://github.com/ossrs/srs/wiki/v1_CN_DVR +[v1_EN_DVR]: https://github.com/ossrs/srs/wiki/v1_EN_DVR +[v1_CN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLog +[v1_EN_SrsLog]: https://github.com/ossrs/srs/wiki/v1_EN_SrsLog +[v1_CN_DRM2]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse +[v1_EN_DRM2]: https://github.com/ossrs/srs/wiki/v1_EN_DRM#tokentraverse +[v2_CN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHTTP +[v2_EN_SampleHTTP]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHTTP +[v2_CN_FlvVodStream]: https://github.com/ossrs/srs/wiki/v2_CN_FlvVodStream +[v2_EN_FlvVodStream]: https://github.com/ossrs/srs/wiki/v2_EN_FlvVodStream +[v2_CN_SrsLibrtmp2]: https://github.com/ossrs/srs/wiki/v2_CN_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/ossrs/srs/wiki/v2_CN_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/ossrs/srs/wiki/v2_CN_Security +[v2_EN_Security]: https://github.com/ossrs/srs/wiki/v2_EN_Security +[v2_CN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHttpStream +[v2_EN_DeliveryHttpStream]: https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHttpStream +[v1_CN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_CN_DeliveryHDS +[v1_EN_DeliveryHDS]: https://github.com/ossrs/srs/wiki/v1_EN_DeliveryHDS +[v2_CN_Streamer2]: https://github.com/ossrs/srs/wiki/v2_CN_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/ossrs/srs/wiki/v2_CN_SampleHttpFlv +[v2_EN_SampleHttpFlv]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHttpFlv +[v2_CN_SampleHttpFlvCluster]: https://github.com/ossrs/srs/wiki/v2_CN_SampleHttpFlvCluster +[v2_EN_SampleHttpFlvCluster]: https://github.com/ossrs/srs/wiki/v2_EN_SampleHttpFlvCluster +[v2_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency +[v2_EN_LowLatency]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency +[v2_EN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-read +[v1_CN_Performance#performancereport4k]: https://github.com/ossrs/srs/wiki/v1_CN_Performance#performancereport4k +[v1_CN_DRM#tokentraverse]: https://github.com/ossrs/srs/wiki/v1_CN_DRM#tokentraverse +[v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi +[v1_CN_SrsLibrtmp]: https://github.com/ossrs/srs/wiki/v1_CN_SrsLibrtmp +[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build +[v1_CN_LowLatency]: https://github.com/ossrs/srs/wiki/v1_CN_LowLatency +[v1_CN_HowToAskQuestion]: https://github.com/ossrs/srs/wiki/v1_CN_HowToAskQuestion +[v1_CN_Build]: https://github.com/ossrs/srs/wiki/v1_CN_Build +[v1_CN_Performance]: https://github.com/ossrs/srs/wiki/v1_CN_Performance +[v1_CN_RaspberryPi]: https://github.com/ossrs/srs/wiki/v1_CN_RaspberryPi +[v2_CN_LowLatency#merged-read]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-read +[v1_CN_Product]: https://github.com/ossrs/srs/wiki/v1_CN_Product +[v1_CN_ServerSideScript]: https://github.com/ossrs/srs/wiki/v1_CN_ServerSideScript +[v2_EN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_EN_LowLatency#merged-write +[v1_CN_IDE]: https://github.com/ossrs/srs/wiki/v1_CN_IDE +[v2_CN_LowLatency#merged-write]: https://github.com/ossrs/srs/wiki/v2_CN_LowLatency#merged-write + +[bug #213]: https://github.com/ossrs/srs/issues/213 +[bug #194]: https://github.com/ossrs/srs/issues/194 +[bug #182]: https://github.com/ossrs/srs/issues/182 +[bug #257]: https://github.com/ossrs/srs/issues/257 +[bug #179]: https://github.com/ossrs/srs/issues/179 +[bug #224]: https://github.com/ossrs/srs/issues/224 +[bug #251]: https://github.com/ossrs/srs/issues/251 +[bug #293]: https://github.com/ossrs/srs/issues/293 +[bug #250]: https://github.com/ossrs/srs/issues/250 +[bug #301]: https://github.com/ossrs/srs/issues/301 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #133]: https://github.com/ossrs/srs/issues/133 +[bug #92]: https://github.com/ossrs/srs/issues/92 +[bug #380]: https://github.com/ossrs/srs/issues/380 +[bug #474]: https://github.com/ossrs/srs/issues/474 +[bug #484]: https://github.com/ossrs/srs/issues/484 +[bug #485]: https://github.com/ossrs/srs/issues/485 +[bug #495]: https://github.com/ossrs/srs/issues/495 +[bug #497]: https://github.com/ossrs/srs/issues/497 +[bug #448]: https://github.com/ossrs/srs/issues/448 +[bug #475]: https://github.com/ossrs/srs/issues/475 +[bug #458]: https://github.com/ossrs/srs/issues/458 +[bug #454]: https://github.com/ossrs/srs/issues/454 +[bug #442]: https://github.com/ossrs/srs/issues/442 +[bug #169]: https://github.com/ossrs/srs/issues/169 +[bug #441]: https://github.com/ossrs/srs/issues/441 +[bug #433]: https://github.com/ossrs/srs/issues/433 +[bug #425]: https://github.com/ossrs/srs/issues/425 +[bug #424]: https://github.com/ossrs/srs/issues/424 +[bug #421]: https://github.com/ossrs/srs/issues/421 +[bug #435]: https://github.com/ossrs/srs/issues/435 +[bug #420]: https://github.com/ossrs/srs/issues/420 +[bug #209]: https://github.com/ossrs/srs/issues/209 +[bug #409]: https://github.com/ossrs/srs/issues/409 +[bug #404]: https://github.com/ossrs/srs/issues/404 +[bug #391]: https://github.com/ossrs/srs/issues/391 +[bug #397]: https://github.com/ossrs/srs/issues/397 +[bug #400]: https://github.com/ossrs/srs/issues/400 +[bug #383]: https://github.com/ossrs/srs/issues/383 +[bug #381]: https://github.com/ossrs/srs/issues/381 +[bug #375]: https://github.com/ossrs/srs/issues/375 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #372]: https://github.com/ossrs/srs/issues/372 +[bug #366]: https://github.com/ossrs/srs/issues/366 +[bug #351]: https://github.com/ossrs/srs/issues/351 +[bug #155]: https://github.com/ossrs/srs/issues/155 +[bug #324]: https://github.com/ossrs/srs/issues/324 +[bug #324]: https://github.com/ossrs/srs/issues/324 +[bug #328]: https://github.com/ossrs/srs/issues/328 +[bug #155]: https://github.com/ossrs/srs/issues/155 +[bug #316]: https://github.com/ossrs/srs/issues/316 +[bug #310]: https://github.com/ossrs/srs/issues/310 +[bug #322]: https://github.com/ossrs/srs/issues/322 +[bug #179]: https://github.com/ossrs/srs/issues/179 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #133]: https://github.com/ossrs/srs/issues/133 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #304]: https://github.com/ossrs/srs/issues/304 +[bug #311]: https://github.com/ossrs/srs/issues/311 +[bug #310]: https://github.com/ossrs/srs/issues/310 +[bug #136]: https://github.com/ossrs/srs/issues/136 +[bug #250]: https://github.com/ossrs/srs/issues/250 +[bug #301]: https://github.com/ossrs/srs/issues/301 +[bug #301]: https://github.com/ossrs/srs/issues/301 +[bug #268]: https://github.com/ossrs/srs/issues/268 +[bug #151]: https://github.com/ossrs/srs/issues/151 +[bug #151]: https://github.com/ossrs/srs/issues/151 +[bug #293]: https://github.com/ossrs/srs/issues/293 +[bug #293]: https://github.com/ossrs/srs/issues/293 +[bug #293]: https://github.com/ossrs/srs/issues/293 +[bug #277]: https://github.com/ossrs/srs/issues/277 +[bug #277]: https://github.com/ossrs/srs/issues/277 +[bug #290]: https://github.com/ossrs/srs/issues/290 +[bug #281]: https://github.com/ossrs/srs/issues/281 +[bug #274]: https://github.com/ossrs/srs/issues/274 +[bug #179]: https://github.com/ossrs/srs/issues/179 +[bug #211]: https://github.com/ossrs/srs/issues/211 +[bug #207]: https://github.com/ossrs/srs/issues/207 +[bug #158]: https://github.com/ossrs/srs/issues/158 +[bug #216]: https://github.com/ossrs/srs/issues/216 +[bug #263]: https://github.com/ossrs/srs/issues/263 +[bug #270]: https://github.com/ossrs/srs/issues/270 +[bug #266]: https://github.com/ossrs/srs/issues/266 +[bug #267]: https://github.com/ossrs/srs/issues/267 +[bug #268]: https://github.com/ossrs/srs/issues/268 +[bug #264]: https://github.com/ossrs/srs/issues/264 +[bug #264]: https://github.com/ossrs/srs/issues/264 +[bug #257]: https://github.com/ossrs/srs/issues/257 +[bug #251]: https://github.com/ossrs/srs/issues/251 +[bug #251]: https://github.com/ossrs/srs/issues/251 +[bug #241]: https://github.com/ossrs/srs/issues/241 +[bug #241]: https://github.com/ossrs/srs/issues/241 +[bug #241]: https://github.com/ossrs/srs/issues/241 +[bug #248]: https://github.com/ossrs/srs/issues/248 +[bug #244]: https://github.com/ossrs/srs/issues/244 +[bug #237]: https://github.com/ossrs/srs/issues/237 +[bug #235]: https://github.com/ossrs/srs/issues/235 +[bug #215]: https://github.com/ossrs/srs/issues/215 +[bug #212]: https://github.com/ossrs/srs/issues/212 +[bug #217]: https://github.com/ossrs/srs/issues/217 +[bug #212]: https://github.com/ossrs/srs/issues/212 +[bug #213]: https://github.com/ossrs/srs/issues/213 +[bug #204]: https://github.com/ossrs/srs/issues/204 +[bug #203]: https://github.com/ossrs/srs/issues/203 +[bug #202]: https://github.com/ossrs/srs/issues/202 +[bug #200]: https://github.com/ossrs/srs/issues/200 +[bug #194]: https://github.com/ossrs/srs/issues/194 +[bug #194]: https://github.com/ossrs/srs/issues/194 +[bug #195]: https://github.com/ossrs/srs/issues/195 +[bug #191]: https://github.com/ossrs/srs/issues/191 +[bug #66]: https://github.com/ossrs/srs/issues/66 +[bug #185]: https://github.com/ossrs/srs/issues/185 +[bug #186]: https://github.com/ossrs/srs/issues/186 +[bug #184]: https://github.com/ossrs/srs/issues/184 +[bug #151]: https://github.com/ossrs/srs/issues/151 +[bug #162]: https://github.com/ossrs/srs/issues/162 +[bug #180]: https://github.com/ossrs/srs/issues/180 +[bug #177]: https://github.com/ossrs/srs/issues/177 +[bug #167]: https://github.com/ossrs/srs/issues/167 +[bug #150]: https://github.com/ossrs/srs/issues/150 +[bug #165]: https://github.com/ossrs/srs/issues/165 +[bug #160]: https://github.com/ossrs/srs/issues/160 +[bug #155]: https://github.com/ossrs/srs/issues/155 +[bug #148]: https://github.com/ossrs/srs/issues/148 +[bug #147]: https://github.com/ossrs/srs/issues/147 +[bug #79]: https://github.com/ossrs/srs/issues/79 +[bug #57]: https://github.com/ossrs/srs/issues/57 +[bug #85]: https://github.com/ossrs/srs/issues/85 +[bug #145]: https://github.com/ossrs/srs/issues/145 +[bug #143]: https://github.com/ossrs/srs/issues/143 +[bug #138]: https://github.com/ossrs/srs/issues/138 +[bug #142]: https://github.com/ossrs/srs/issues/142 +[bug #141]: https://github.com/ossrs/srs/issues/141 +[bug #124]: https://github.com/ossrs/srs/issues/124 +[bug #121]: https://github.com/ossrs/srs/issues/121 +[bug #119]: https://github.com/ossrs/srs/issues/119 +[bug #81]: https://github.com/ossrs/srs/issues/81 +[bug #103]: https://github.com/ossrs/srs/issues/103 +[bug #111]: https://github.com/ossrs/srs/issues/111 +[bug #110]: https://github.com/ossrs/srs/issues/110 +[bug #109]: https://github.com/ossrs/srs/issues/109 +[bug #108]: https://github.com/ossrs/srs/issues/108 +[bug #98]: https://github.com/ossrs/srs/issues/98 +[bug #87]: https://github.com/ossrs/srs/issues/87 +[bug #84]: https://github.com/ossrs/srs/issues/84 +[bug #89]: https://github.com/ossrs/srs/issues/89 +[bug #76]: https://github.com/ossrs/srs/issues/76 +[bug #78]: https://github.com/ossrs/srs/issues/78 +[bug #74]: https://github.com/ossrs/srs/issues/74 +[bug #72]: https://github.com/ossrs/srs/issues/72 +[bug #67]: https://github.com/ossrs/srs/issues/67 +[bug #64]: https://github.com/ossrs/srs/issues/64 +[bug #36]: https://github.com/ossrs/srs/issues/36 +[bug #60]: https://github.com/ossrs/srs/issues/60 +[bug #59]: https://github.com/ossrs/srs/issues/59 +[bug #50]: https://github.com/ossrs/srs/issues/50 +[bug #34]: https://github.com/ossrs/srs/issues/34 +[bug #257-c0]: https://github.com/ossrs/srs/issues/257#issuecomment-66864413 +[bug #110]: https://github.com/ossrs/srs/issues/110 +[bug #109]: https://github.com/ossrs/srs/issues/109 +[bug #108]: https://github.com/ossrs/srs/issues/108 +[bug #104]: https://github.com/ossrs/srs/issues/104 +[bug #98]: https://github.com/ossrs/srs/issues/98 +[bug #87]: https://github.com/ossrs/srs/issues/87 +[bug #84]: https://github.com/ossrs/srs/issues/84 +[bug #89]: https://github.com/ossrs/srs/issues/89 +[bug #76]: https://github.com/ossrs/srs/issues/76 +[bug #78]: https://github.com/ossrs/srs/issues/78 +[bug #74]: https://github.com/ossrs/srs/issues/74 +[bug #72]: https://github.com/ossrs/srs/issues/72 +[bug #67]: https://github.com/ossrs/srs/issues/67 +[bug #64]: https://github.com/ossrs/srs/issues/64 +[bug #36]: https://github.com/ossrs/srs/issues/36 +[bug #60]: https://github.com/ossrs/srs/issues/60 +[bug #59]: https://github.com/ossrs/srs/issues/59 +[bug #50]: https://github.com/ossrs/srs/issues/50 +[bug #34]: https://github.com/ossrs/srs/issues/34 +[bug #512]: https://github.com/ossrs/srs/issues/512 +[bug #515]: https://github.com/ossrs/srs/issues/515 +[bug #511]: https://github.com/ossrs/srs/issues/511 +[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 -[r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2 -[r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1 -[r2.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a0 -[r1.0r4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4 -[r1.0r3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r3 -[r1.0r2]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r2 -[r1.0r1]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r1 -[r1.0r0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0r0 -[r1.0b0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.beta -[r1.0a7]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline7 -[r1.0a6]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline6 -[r1.0a5]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline5 -[r1.0a4]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline4 -[r1.0a3]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline3 -[r1.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline2 -[r1.0a0]: https://github.com/simple-rtmp-server/srs/releases/tag/1.0.mainline -[r0.9]: https://github.com/simple-rtmp-server/srs/releases/tag/0.9 -[r0.8]: https://github.com/simple-rtmp-server/srs/releases/tag/0.8 -[r0.7]: https://github.com/simple-rtmp-server/srs/releases/tag/0.7 -[r0.6]: https://github.com/simple-rtmp-server/srs/releases/tag/0.6 -[r0.5]: https://github.com/simple-rtmp-server/srs/releases/tag/0.5 -[r0.4]: https://github.com/simple-rtmp-server/srs/releases/tag/0.4 -[r0.3]: https://github.com/simple-rtmp-server/srs/releases/tag/0.3 -[r0.2]: https://github.com/simple-rtmp-server/srs/releases/tag/0.2 -[r0.1]: https://github.com/simple-rtmp-server/srs/releases/tag/0.1 - - -[contact]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Contact +[r2.0a2]: https://github.com/ossrs/srs/releases/tag/v2.0-a2 +[r2.0a1]: https://github.com/ossrs/srs/releases/tag/2.0a1 +[r2.0a0]: https://github.com/ossrs/srs/releases/tag/2.0a0 +[r1.0r4]: https://github.com/ossrs/srs/releases/tag/1.0r4 +[r1.0r3]: https://github.com/ossrs/srs/releases/tag/1.0r3 +[r1.0r2]: https://github.com/ossrs/srs/releases/tag/1.0r2 +[r1.0r1]: https://github.com/ossrs/srs/releases/tag/1.0r1 +[r1.0r0]: https://github.com/ossrs/srs/releases/tag/1.0r0 +[r1.0b0]: https://github.com/ossrs/srs/releases/tag/1.0.beta +[r1.0a7]: https://github.com/ossrs/srs/releases/tag/1.0.mainline7 +[r1.0a6]: https://github.com/ossrs/srs/releases/tag/1.0.mainline6 +[r1.0a5]: https://github.com/ossrs/srs/releases/tag/1.0.mainline5 +[r1.0a4]: https://github.com/ossrs/srs/releases/tag/1.0.mainline4 +[r1.0a3]: https://github.com/ossrs/srs/releases/tag/1.0.mainline3 +[r1.0a2]: https://github.com/ossrs/srs/releases/tag/1.0.mainline2 +[r1.0a0]: https://github.com/ossrs/srs/releases/tag/1.0.mainline +[r0.9]: https://github.com/ossrs/srs/releases/tag/0.9 +[r0.8]: https://github.com/ossrs/srs/releases/tag/0.8 +[r0.7]: https://github.com/ossrs/srs/releases/tag/0.7 +[r0.6]: https://github.com/ossrs/srs/releases/tag/0.6 +[r0.5]: https://github.com/ossrs/srs/releases/tag/0.5 +[r0.4]: https://github.com/ossrs/srs/releases/tag/0.4 +[r0.3]: https://github.com/ossrs/srs/releases/tag/0.3 +[r0.2]: https://github.com/ossrs/srs/releases/tag/0.2 +[r0.1]: https://github.com/ossrs/srs/releases/tag/0.1 + + +[contact]: https://github.com/ossrs/srs/wiki/v1_CN_Contact [more0]: http://winlinvip.github.io/srs.release/releases/ [more1]: http://www.ossrs.net/srs.release/releases/ -[branch1]: https://github.com/simple-rtmp-server/srs/tree/1.0release -[branch2]: https://github.com/simple-rtmp-server/srs/tree/2.0release -[release2]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release20 -[release3]: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_Product#release30 +[branch1]: https://github.com/ossrs/srs/tree/1.0release +[branch2]: https://github.com/ossrs/srs/tree/2.0release +[release2]: https://github.com/ossrs/srs/wiki/v1_CN_Product#release20 +[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 [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_EN]: https://github.com/simple-rtmp-server/srs/wiki/v2_EN_Home +[srs_CN]: https://github.com/ossrs/srs/wiki/v2_CN_Home +[srs_EN]: https://github.com/ossrs/srs/wiki/v2_EN_Home diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index e3d9e5f94..47ba862f0 100644 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -391,14 +391,14 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="EXTRA_CFLAGS=-DMD_HAVE_KQUEUE" fi # 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 # 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 echo "st-1.9t for arm is ok."; else # 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"; ( 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 echo "st-1.9t is ok."; 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"; ( rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && diff --git a/trunk/auto/generate-srs-librtmp-single.sh b/trunk/auto/generate-srs-librtmp-single.sh index 191d33d0f..46511927e 100755 --- a/trunk/auto/generate-srs-librtmp-single.sh +++ b/trunk/auto/generate-srs-librtmp-single.sh @@ -30,7 +30,7 @@ cat << END >$FILE /* 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 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 /** # 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} */ #include @@ -115,7 +115,7 @@ int main(int argc, char** argv) srs_rtmp_t rtmp; 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()); rtmp = srs_rtmp_create("rtmp://ossrs.net/live/livestream"); diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 0692290a9..9fca2a141 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -82,7 +82,7 @@ SRS_MIPS_UBUNTU12=NO SRS_DEV=NO # dev, open main server feature for dev, no utest/research/librtmp 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 # raspberry-pi, open hls/ssl/static SRS_PI=NO @@ -184,7 +184,7 @@ Presets: --disable-all disable all features, only support vp6 RTMP. --dev for dev, open all features, no nginx/gperf/gprof/arm. --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. Conflicts: diff --git a/trunk/auto/summary.sh b/trunk/auto/summary.sh index b1c3c2683..f9884a562 100755 --- a/trunk/auto/summary.sh +++ b/trunk/auto/summary.sh @@ -35,7 +35,7 @@ BLACK="\\${BLACK}" echo -e "\${GREEN}build summary:\${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: 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}" @@ -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}./objs/pprof --text objs/srs gperf.srs.gcp* # to analysis cpu profile\${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}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}" @@ -60,7 +60,7 @@ echo -e " | ${SrsGprofSummaryColor}gprof -b ./objs/srs gmon.out > gprof. echo -e " \${BLACK}+------------------------------------------------------------------------------------\${BLACK}" echo -e " |${SrsUtestSummaryColor}utest: ./objs/srs_utest, the utest for srs\${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}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}" @@ -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 " \${BLACK}+------------------------------------------------------------------------------------\${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 " |\${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 " \${BLACK}+------------------------------------------------------------------------------------\${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 " | ${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 " | ${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: 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 " | ${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: ./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 " | ${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 " | ${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 " | ${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 " | ${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 " | ${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 " \${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 " ./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 "\${BLACK}Examples for srs-librtmp at:\${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 fi diff --git a/trunk/conf/demo.19350.conf b/trunk/conf/demo.19350.conf index e85579c7e..a6dd3ef98 100644 --- a/trunk/conf/demo.19350.conf +++ b/trunk/conf/demo.19350.conf @@ -1,5 +1,5 @@ # 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. listen 19350; diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf index 60b80f5b6..b6fb87aa1 100644 --- a/trunk/conf/demo.conf +++ b/trunk/conf/demo.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/dvr.path.conf b/trunk/conf/dvr.path.conf index 9dcbb20ec..8ba6614a1 100644 --- a/trunk/conf/dvr.path.conf +++ b/trunk/conf/dvr.path.conf @@ -1,6 +1,6 @@ # 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/simple-rtmp-server/srs/wiki/v2_EN_DVR#custom-path +# @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path +# @see https://github.com/ossrs/srs/wiki/v2_EN_DVR#custom-path # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/dvr.segment.conf b/trunk/conf/dvr.segment.conf index 44af9dd5e..1612597a4 100644 --- a/trunk/conf/dvr.segment.conf +++ b/trunk/conf/dvr.segment.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/dvr.session.conf b/trunk/conf/dvr.session.conf index 1eb5dad4d..dff8648ca 100644 --- a/trunk/conf/dvr.session.conf +++ b/trunk/conf/dvr.session.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/edge.conf b/trunk/conf/edge.conf index c018dfc11..f23203005 100644 --- a/trunk/conf/edge.conf +++ b/trunk/conf/edge.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/edge.token.traverse.conf b/trunk/conf/edge.token.traverse.conf index f17324013..f3e529e66 100644 --- a/trunk/conf/edge.token.traverse.conf +++ b/trunk/conf/edge.token.traverse.conf @@ -1,5 +1,5 @@ # 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. listen 1935 diff --git a/trunk/conf/ffmpeg.transcode.conf b/trunk/conf/ffmpeg.transcode.conf index 8b8ce4ef0..1bb505556 100644 --- a/trunk/conf/ffmpeg.transcode.conf +++ b/trunk/conf/ffmpeg.transcode.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/forward.master.conf b/trunk/conf/forward.master.conf index 18d9bc16f..8283aac17 100644 --- a/trunk/conf/forward.master.conf +++ b/trunk/conf/forward.master.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/forward.slave.conf b/trunk/conf/forward.slave.conf index 67a746214..37316c2f5 100644 --- a/trunk/conf/forward.slave.conf +++ b/trunk/conf/forward.slave.conf @@ -1,5 +1,5 @@ # 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. listen 19350; diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 623a4d298..e9e5789dd 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -151,7 +151,7 @@ http_server { # Streamer sections ############################################################################################# # 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 { # whether stream caster is enabled. # default: off @@ -216,7 +216,7 @@ vhost __defaultVhost__ { # the security to allow or deny clients. vhost security.srs.com { # 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 { # whether enable the security for vhost. # default: off @@ -249,10 +249,10 @@ vhost mrw.srs.com { # for min latence mode: # 1. disable the mr for vhost. # 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 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 { # whether enable the MR(merged-read) # 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/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/simple-rtmp-server/srs/wiki/v2_EN_DVR#custom-path + # @see https://github.com/ossrs/srs/wiki/v2_CN_DVR#custom-path + # @see https://github.com/ossrs/srs/wiki/v2_EN_DVR#custom-path # segment,session apply it. # default: ./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. # 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/simple-rtmp-server/srs/wiki/v2_EN_DVR#http-callback + # @read https://github.com/ossrs/srs/wiki/v2_CN_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, # EXT-X-TARGETDURATION = hls_td_ratio * hls_fragment // init # 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 hls_td_ratio 1.5; # the audio overflow ratio. @@ -542,7 +542,7 @@ vhost with-hls.srs.com { # ignore, when error ignore and disable hls. # disconnect, when error disconnect the publish connection. # 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 hls_on_error ignore; # the hls storage: disk, ram or both. @@ -580,8 +580,8 @@ vhost with-hls.srs.com { # [999], repleace this const to current millisecond. # [timestamp],replace this const to current UNIX timestamp in ms. # [seq], the sequence number of ts. - # @see https://github.com/simple-rtmp-server/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_DVR#custom-path + # @see https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#hls-config # default: [app]/[stream]-[seq].ts hls_ts_file [app]/[stream]-[seq].ts; # 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. # 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/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHLS#http-callback + # @read https://github.com/ossrs/srs/wiki/v2_CN_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. # we support the variables to generate the notify url: @@ -650,8 +650,8 @@ vhost with-hls.srs.com { # [stream], replace with the stream. # [ts_url], replace with the ts url. # 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/simple-rtmp-server/srs/wiki/v2_EN_DeliveryHLS#on-hls-notify + # @read https://github.com/ossrs/srs/wiki/v2_CN_DeliveryHLS#on-hls-notify + # @read https://github.com/ossrs/srs/wiki/v2_EN_DeliveryHLS#on-hls-notify } } # the vhost with hls disabled. @@ -825,7 +825,7 @@ vhost debug.srs.com { # it's strongly recommend to open the debug_srs_upnode, # when connect to upnode, it will take the debug info, # 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 debug_srs_upnode on; } diff --git a/trunk/conf/hds.conf b/trunk/conf/hds.conf index cae629118..47811bcb7 100644 --- a/trunk/conf/hds.conf +++ b/trunk/conf/hds.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/hls.conf b/trunk/conf/hls.conf index 2787fe523..8e1a09b65 100644 --- a/trunk/conf/hls.conf +++ b/trunk/conf/hls.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/http.aac.live.conf b/trunk/conf/http.aac.live.conf index f59669055..e3fdce78f 100644 --- a/trunk/conf/http.aac.live.conf +++ b/trunk/conf/http.aac.live.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/http.flv.live.conf b/trunk/conf/http.flv.live.conf index f8c56b2f2..9b24ef0d3 100644 --- a/trunk/conf/http.flv.live.conf +++ b/trunk/conf/http.flv.live.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf index a9000d25f..4cc0de374 100644 --- a/trunk/conf/http.flv.live.edge1.conf +++ b/trunk/conf/http.flv.live.edge1.conf @@ -1,5 +1,5 @@ # 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. listen 19351; diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf index 98c877b90..c5ccef9b3 100644 --- a/trunk/conf/http.flv.live.edge2.conf +++ b/trunk/conf/http.flv.live.edge2.conf @@ -1,5 +1,5 @@ # 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. listen 19352; diff --git a/trunk/conf/http.hls.conf b/trunk/conf/http.hls.conf index 4cd6d8adf..0b098779f 100644 --- a/trunk/conf/http.hls.conf +++ b/trunk/conf/http.hls.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/http.mp3.live.conf b/trunk/conf/http.mp3.live.conf index a8047f4f0..4962f8552 100644 --- a/trunk/conf/http.mp3.live.conf +++ b/trunk/conf/http.mp3.live.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/http.ts.live.conf b/trunk/conf/http.ts.live.conf index e83800ec2..dd1b2be8e 100644 --- a/trunk/conf/http.ts.live.conf +++ b/trunk/conf/http.ts.live.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/ingest.conf b/trunk/conf/ingest.conf index c9c5ae4c1..7b3d1c2ed 100644 --- a/trunk/conf/ingest.conf +++ b/trunk/conf/ingest.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf index 268e94799..121624611 100644 --- a/trunk/conf/origin.conf +++ b/trunk/conf/origin.conf @@ -1,5 +1,5 @@ # 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. listen 19350; diff --git a/trunk/conf/push.flv.conf b/trunk/conf/push.flv.conf index cc68b38f3..63357df55 100644 --- a/trunk/conf/push.flv.conf +++ b/trunk/conf/push.flv.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/push.mpegts.over.udp.conf b/trunk/conf/push.mpegts.over.udp.conf index b3bcbc1d1..65e6df358 100644 --- a/trunk/conf/push.mpegts.over.udp.conf +++ b/trunk/conf/push.mpegts.over.udp.conf @@ -1,6 +1,6 @@ # 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/simple-rtmp-server/srs/issues/250#issuecomment-72321769 +# @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp +# @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769 # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/push.rtsp.conf b/trunk/conf/push.rtsp.conf index b9f497646..619f74d90 100644 --- a/trunk/conf/push.rtsp.conf +++ b/trunk/conf/push.rtsp.conf @@ -1,6 +1,6 @@ # 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/simple-rtmp-server/srs/issues/250#issuecomment-72321769 +# @see https://github.com/ossrs/srs/wiki/v2_CN_Streamer#push-mpeg-ts-over-udp +# @see https://github.com/ossrs/srs/issues/250#issuecomment-72321769 # @see full.conf for detail config. listen 1935; diff --git a/trunk/conf/ram.hls.conf b/trunk/conf/ram.hls.conf index 61f1e6075..e2a9b1042 100644 --- a/trunk/conf/ram.hls.conf +++ b/trunk/conf/ram.hls.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/realtime.conf b/trunk/conf/realtime.conf index a87f293f4..ac039c8e2 100644 --- a/trunk/conf/realtime.conf +++ b/trunk/conf/realtime.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/rtmp.conf b/trunk/conf/rtmp.conf index 934c65266..94c740c50 100644 --- a/trunk/conf/rtmp.conf +++ b/trunk/conf/rtmp.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/security.deny.publish.conf b/trunk/conf/security.deny.publish.conf index abefd029c..0c71bb9b2 100644 --- a/trunk/conf/security.deny.publish.conf +++ b/trunk/conf/security.deny.publish.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/transcode2hls.audio.only.conf b/trunk/conf/transcode2hls.audio.only.conf index 41fdbcb6c..21a1e42b8 100644 --- a/trunk/conf/transcode2hls.audio.only.conf +++ b/trunk/conf/transcode2hls.audio.only.conf @@ -1,5 +1,5 @@ # 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. listen 1935; diff --git a/trunk/conf/transform.edge.conf b/trunk/conf/transform.edge.conf index 964c796dd..970af01c2 100644 --- a/trunk/conf/transform.edge.conf +++ b/trunk/conf/transform.edge.conf @@ -1,5 +1,5 @@ # 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. listen 1935; @@ -24,4 +24,4 @@ vhost transform.srs.edge.com { mode remote; origin 127.0.0.1:1935; vhost source.srs.com; -} \ No newline at end of file +} diff --git a/trunk/configure b/trunk/configure index 654706d0f..4a5e7b5b2 100755 --- a/trunk/configure +++ b/trunk/configure @@ -416,7 +416,7 @@ install-api: install @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs-api /etc/init.d/srs-api" @echo " /etc/init.d/srs-api start" @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: @echo "mkdir \$(__REAL_INSTALL)" @@ -438,7 +438,7 @@ install: @echo "srs installed, to link and start srs:" @echo " sudo ln -sf \$(SRS_PREFIX)/etc/init.d/srs /etc/init.d/srs" @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 fi diff --git a/trunk/etc/init.d/srs b/trunk/etc/init.d/srs index 3efcda350..d5dfcb1cd 100755 --- a/trunk/etc/init.d/srs +++ b/trunk/etc/init.d/srs @@ -1,17 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: simple-rtmp-server(srs) +# Provides: ossrs(srs) # RequiRED-Start: $all # RequiRED-Stop: $all # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: simple-rtmp-server(srs) -# Description: https://github.com/simple-rtmp-server/srs +# Short-Description: ossrs(srs) +# Description: https://github.com/ossrs/srs ### END INIT INFO # 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="./" APP="./objs/srs" CONFIG="./conf/srs.conf" diff --git a/trunk/etc/init.d/srs-api b/trunk/etc/init.d/srs-api index 94e0a57d5..593c8a11e 100755 --- a/trunk/etc/init.d/srs-api +++ b/trunk/etc/init.d/srs-api @@ -1,17 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: simple-rtmp-server-api(srs-api) +# Provides: ossrs-api(srs-api) # RequiRED-Start: $all # RequiRED-Stop: $all # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: simple-rtmp-server-api(srs-api) -# Description: https://github.com/simple-rtmp-server/srs +# Short-Description: ossrs-api(srs-api) +# Description: https://github.com/ossrs/srs ### END INIT INFO # 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="./" APP="python ./research/api-server/server.py" CONFIG="8085" diff --git a/trunk/etc/init.d/srs-demo b/trunk/etc/init.d/srs-demo index d8ebd8c38..1212456f1 100755 --- a/trunk/etc/init.d/srs-demo +++ b/trunk/etc/init.d/srs-demo @@ -1,17 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: simple-rtmp-server(srs) +# Provides: ossrs(srs) # RequiRED-Start: $all # RequiRED-Stop: $all # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: simple-rtmp-server(srs) -# Description: https://github.com/simple-rtmp-server/srs +# Short-Description: ossrs(srs) +# Description: https://github.com/ossrs/srs ### END INIT INFO # 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="./" APP="./objs/srs" CONFIG="./conf/demo.conf" diff --git a/trunk/etc/init.d/srs-demo-19350 b/trunk/etc/init.d/srs-demo-19350 index 3500cd041..00e72389f 100755 --- a/trunk/etc/init.d/srs-demo-19350 +++ b/trunk/etc/init.d/srs-demo-19350 @@ -1,17 +1,17 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: simple-rtmp-server(srs) +# Provides: ossrs(srs) # RequiRED-Start: $all # RequiRED-Stop: $all # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: simple-rtmp-server(srs) -# Description: https://github.com/simple-rtmp-server/srs +# Short-Description: ossrs(srs) +# Description: https://github.com/ossrs/srs ### END INIT INFO # 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="./" APP="./objs/srs" CONFIG="./conf/demo.19350.conf" diff --git a/trunk/ide/srs_clion/CMakeLists.txt b/trunk/ide/srs_clion/CMakeLists.txt index 80f9c6d78..453e81e9b 100755 --- a/trunk/ide/srs_clion/CMakeLists.txt +++ b/trunk/ide/srs_clion/CMakeLists.txt @@ -28,31 +28,31 @@ ELSE(NOT EXISTS ${PROJECT_SOURCE_DIR}/../../objs/st/libst.a) MESSAGE("srs_libs is ok") 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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/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/simple-rtmp-server/srs/wiki/v1_CN_IDE#jetbrains") -MESSAGE(STATUS "use ./configure && make, @see https://github.com/simple-rtmp-server/srs#usage") +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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/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/ossrs/srs/wiki/v1_CN_IDE#jetbrains") +MESSAGE(STATUS "use ./configure && make, @see https://github.com/ossrs/srs#usage") diff --git a/trunk/ide/srs_qt/srs-qt.pro.user b/trunk/ide/srs_qt/srs-qt.pro.user index 5d891ca10..18d3d0d7a 100755 --- a/trunk/ide/srs_qt/srs-qt.pro.user +++ b/trunk/ide/srs_qt/srs-qt.pro.user @@ -61,7 +61,7 @@ 0 0 - /home/winlin/git/simple-rtmp-server/trunk/ide/build-srs-qt-Desktop-Debug + /home/winlin/git/ossrs/trunk/ide/build-srs-qt-Desktop-Debug true @@ -120,7 +120,7 @@ true - /home/winlin/git/simple-rtmp-server/trunk/ide/build-srs-qt-Desktop-Release + /home/winlin/git/ossrs/trunk/ide/build-srs-qt-Desktop-Release true @@ -232,7 +232,7 @@ srs-qt - Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/simple-rtmp-server/trunk/ide/srs_qt/srs-qt.pro + Qt4ProjectManager.Qt4RunConfiguration:/home/winlin/git/ossrs/trunk/ide/srs_qt/srs-qt.pro srs-qt.pro false diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj index 91f7be634..b5e5a63e7 100644 --- a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj +++ b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.pbxproj @@ -1038,7 +1038,7 @@ CLANG_CXX_LIBRARY = "libstdc++"; LIBRARY_SEARCH_PATHS = ( "../../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)"; "USER_HEADER_SEARCH_PATHS[arch=*]" = "../../src/** ../../objs ../../objs/st ../../objs/hp ../../objs/openssl"; @@ -1053,7 +1053,7 @@ CLANG_CXX_LIBRARY = "libstdc++"; LIBRARY_SEARCH_PATHS = ( "../../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)"; }; diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index f20739ef7..555f7f2ca 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -2,7 +2,7 @@ ''' 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 this software and associated documentation files (the "Software"), to deal in @@ -840,13 +840,13 @@ if __name__ != "__main__": # check the user options 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 "%(sys.argv[0]) print " port: the port to listen at." print "For example:" print " python %s 8085"%(sys.argv[0]) print "" - print "See also: https://github.com/simple-rtmp-server/srs" + print "See also: https://github.com/ossrs/srs" sys.exit(1) # parse port from user options. diff --git a/trunk/research/api-server/static-dir/index.html b/trunk/research/api-server/static-dir/index.html index 4a3d3aac8..b4b4782c8 100755 --- a/trunk/research/api-server/static-dir/index.html +++ b/trunk/research/api-server/static-dir/index.html @@ -44,7 +44,7 @@
diff --git a/trunk/research/arm/jmp.cpp b/trunk/research/arm/jmp.cpp index c19a87ffd..76b6060b9 100644 --- a/trunk/research/arm/jmp.cpp +++ b/trunk/research/arm/jmp.cpp @@ -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 arm-linux-gnueabi-g++ -o jmp jmp.cpp -static arm-linux-gnueabi-strip jmp diff --git a/trunk/research/arm/jmp_sp.cpp b/trunk/research/arm/jmp_sp.cpp index d3d9edd89..9b1c71511 100644 --- a/trunk/research/arm/jmp_sp.cpp +++ b/trunk/research/arm/jmp_sp.cpp @@ -1,6 +1,6 @@ /* -# see: https://github.com/simple-rtmp-server/srs/issues/190 -# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm +# see: https://github.com/ossrs/srs/issues/190 +# see: https://github.com/ossrs/srs/wiki/v1_CN_SrsLinuxArm g++ -g -O0 -o jmp_sp jmp_sp.cpp arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static arm-linux-gnueabi-strip jmp_sp diff --git a/trunk/research/arm/test.cpp b/trunk/research/arm/test.cpp index 26cef0a19..a11953703 100644 --- a/trunk/research/arm/test.cpp +++ b/trunk/research/arm/test.cpp @@ -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-strip test */ diff --git a/trunk/research/code-statistic/cs.py b/trunk/research/code-statistic/cs.py index 6c8aa18d1..6581ada5c 100755 --- a/trunk/research/code-statistic/cs.py +++ b/trunk/research/code-statistic/cs.py @@ -2,7 +2,7 @@ ''' 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/code-statistic/csr.py b/trunk/research/code-statistic/csr.py index e264b09e7..6bffe9735 100755 --- a/trunk/research/code-statistic/csr.py +++ b/trunk/research/code-statistic/csr.py @@ -2,7 +2,7 @@ ''' 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/ffempty/ffempty.cc b/trunk/research/ffempty/ffempty.cc index 3634f7507..aedc6ea3b 100644 --- a/trunk/research/ffempty/ffempty.cc +++ b/trunk/research/ffempty/ffempty.cc @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/gperftools/cpu-profiler/cpu_profiler.cc b/trunk/research/gperftools/cpu-profiler/cpu_profiler.cc index e5b9e89fa..865eb0125 100644 --- a/trunk/research/gperftools/cpu-profiler/cpu_profiler.cc +++ b/trunk/research/gperftools/cpu-profiler/cpu_profiler.cc @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/gperftools/heap-checker/Makefile b/trunk/research/gperftools/heap-checker/Makefile index b0dfda71d..ca300f187 100644 --- a/trunk/research/gperftools/heap-checker/Makefile +++ b/trunk/research/gperftools/heap-checker/Makefile @@ -7,4 +7,4 @@ heap_checker: heap_checker.cc Makefile -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free \ ../../../objs/gperf/lib/libtcmalloc_and_profiler.a -lpthread clean: - rm -f heap_checker \ No newline at end of file + rm -f heap_checker diff --git a/trunk/research/gperftools/heap-checker/heap_checker.cc b/trunk/research/gperftools/heap-checker/heap_checker.cc index da2dec750..bb73b5253 100644 --- a/trunk/research/gperftools/heap-checker/heap_checker.cc +++ b/trunk/research/gperftools/heap-checker/heap_checker.cc @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/gperftools/heap-profiler/heap_profiler.cc b/trunk/research/gperftools/heap-profiler/heap_profiler.cc index 314c41d83..e7621408e 100644 --- a/trunk/research/gperftools/heap-profiler/heap_profiler.cc +++ b/trunk/research/gperftools/heap-profiler/heap_profiler.cc @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/hls/check_hls_backup.sh b/trunk/research/hls/check_hls_backup.sh index 45f0ef10f..f2d2ec8f3 100755 --- a/trunk/research/hls/check_hls_backup.sh +++ b/trunk/research/hls/check_hls_backup.sh @@ -96,4 +96,4 @@ else exit 1 fi -exit 0 \ No newline at end of file +exit 0 diff --git a/trunk/research/hls/ts_info.cc b/trunk/research/hls/ts_info.cc index 96728c46d..8f9e38eba 100644 --- a/trunk/research/hls/ts_info.cc +++ b/trunk/research/hls/ts_info.cc @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 2eed9f4a9..9a5aefd76 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -38,7 +38,7 @@ help: @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 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" clean: diff --git a/trunk/research/librtmp/srs_aac_raw_publish.c b/trunk/research/librtmp/srs_aac_raw_publish.c index 649d4c91a..c998ddd4e 100644 --- a/trunk/research/librtmp/srs_aac_raw_publish.c +++ b/trunk/research/librtmp/srs_aac_raw_publish.c @@ -1,7 +1,7 @@ /* 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 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" -// 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) { 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) { 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()); if (argc <= 2) { @@ -79,7 +79,7 @@ int main(int argc, char** argv) printf("For example:\n"); 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("See: https://github.com/simple-rtmp-server/srs/issues/212\n"); + printf("See: https://github.com/ossrs/srs/issues/212\n"); exit(-1); } diff --git a/trunk/research/librtmp/srs_audio_raw_publish.c b/trunk/research/librtmp/srs_audio_raw_publish.c index 8e4296dfe..2a18f7f22 100644 --- a/trunk/research/librtmp/srs_audio_raw_publish.c +++ b/trunk/research/librtmp/srs_audio_raw_publish.c @@ -1,7 +1,7 @@ /* 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 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" -// https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-63648892 +// https://github.com/ossrs/srs/issues/212#issuecomment-63648892 // allspace: // 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. @@ -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) { 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()); if (argc <= 2) { @@ -77,7 +77,7 @@ int main(int argc, char** argv) printf("For example:\n"); 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("See: https://github.com/simple-rtmp-server/srs/issues/212\n"); + printf("See: https://github.com/ossrs/srs/issues/212\n"); exit(-1); } diff --git a/trunk/research/librtmp/srs_bandwidth_check.c b/trunk/research/librtmp/srs_bandwidth_check.c index 11be798fd..450efa95f 100644 --- a/trunk/research/librtmp/srs_bandwidth_check.c +++ b/trunk/research/librtmp/srs_bandwidth_check.c @@ -1,7 +1,7 @@ /* 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 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; 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()); if (argc <= 1) { diff --git a/trunk/research/librtmp/srs_detect_rtmp.c b/trunk/research/librtmp/srs_detect_rtmp.c index 191248dac..67469460b 100644 --- a/trunk/research/librtmp/srs_detect_rtmp.c +++ b/trunk/research/librtmp/srs_detect_rtmp.c @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in @@ -61,7 +61,7 @@ int main(int argc, char** argv) int timeout = 0; 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()); if (argc <= 3) { diff --git a/trunk/research/librtmp/srs_flv_injecter.c b/trunk/research/librtmp/srs_flv_injecter.c index b53348460..d31ae66c4 100644 --- a/trunk/research/librtmp/srs_flv_injecter.c +++ b/trunk/research/librtmp/srs_flv_injecter.c @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in @@ -57,7 +57,7 @@ int main(int argc, char** argv) char* tmp_file; 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()); if (argc <= 2) { diff --git a/trunk/research/librtmp/srs_flv_parser.c b/trunk/research/librtmp/srs_flv_parser.c index 9e6743c82..2efca958a 100644 --- a/trunk/research/librtmp/srs_flv_parser.c +++ b/trunk/research/librtmp/srs_flv_parser.c @@ -1,7 +1,7 @@ /* 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 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; 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()); if (argc <= 1) { diff --git a/trunk/research/librtmp/srs_h264_raw_publish.c b/trunk/research/librtmp/srs_h264_raw_publish.c index 722f567cf..7df08ea5f 100644 --- a/trunk/research/librtmp/srs_h264_raw_publish.c +++ b/trunk/research/librtmp/srs_h264_raw_publish.c @@ -1,7 +1,7 @@ /* 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 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) { 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()); if (argc <= 2) { @@ -89,7 +89,7 @@ int main(int argc, char** argv) printf("For example:\n"); 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("See: https://github.com/simple-rtmp-server/srs/issues/66\n"); + printf("See: https://github.com/ossrs/srs/issues/66\n"); exit(-1); } diff --git a/trunk/research/librtmp/srs_ingest_flv.c b/trunk/research/librtmp/srs_ingest_flv.c index cabb77c8d..fd134a3bd 100644 --- a/trunk/research/librtmp/srs_ingest_flv.c +++ b/trunk/research/librtmp/srs_ingest_flv.c @@ -1,7 +1,7 @@ /* 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 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; 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()); if (argc <= 2) { diff --git a/trunk/research/librtmp/srs_ingest_rtmp.c b/trunk/research/librtmp/srs_ingest_rtmp.c index 85475fe70..150d52cc6 100644 --- a/trunk/research/librtmp/srs_ingest_rtmp.c +++ b/trunk/research/librtmp/srs_ingest_rtmp.c @@ -1,7 +1,7 @@ /* 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 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; 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()); if (argc <= 2) { diff --git a/trunk/research/librtmp/srs_play.c b/trunk/research/librtmp/srs_play.c index c42ab2a2b..1d1628c79 100644 --- a/trunk/research/librtmp/srs_play.c +++ b/trunk/research/librtmp/srs_play.c @@ -1,7 +1,7 @@ /* 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 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) { 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()); if (argc <= 1) { diff --git a/trunk/research/librtmp/srs_publish.c b/trunk/research/librtmp/srs_publish.c index 70abab577..5c385bcc1 100644 --- a/trunk/research/librtmp/srs_publish.c +++ b/trunk/research/librtmp/srs_publish.c @@ -1,7 +1,7 @@ /* 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 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) { 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()); if (argc <= 1) { @@ -46,12 +46,12 @@ int main(int argc, char** argv) } // 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", "[warning] it's only a sample to use librtmp. " "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." - "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_rtmp_t rtmp = srs_rtmp_create(argv[1]); diff --git a/trunk/research/librtmp/srs_rtmp_dump.c b/trunk/research/librtmp/srs_rtmp_dump.c index 3f3d030aa..a1b3c4415 100644 --- a/trunk/research/librtmp/srs_rtmp_dump.c +++ b/trunk/research/librtmp/srs_rtmp_dump.c @@ -1,7 +1,7 @@ /* 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 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; 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("@refer to http://rtmpdump.mplayerhq.hu/rtmpdump.1.html\n"); diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html index 6851cb328..2068f2631 100644 --- a/trunk/research/players/index.html +++ b/trunk/research/players/index.html @@ -32,7 +32,7 @@
diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html index 422e6d521..496d6d811 100644 --- a/trunk/research/players/jwplayer6.html +++ b/trunk/research/players/jwplayer6.html @@ -127,7 +127,7 @@
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html index 02507a025..47b2a429d 100644 --- a/trunk/research/players/osmf.html +++ b/trunk/research/players/osmf.html @@ -56,7 +56,7 @@
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html index 56b0bf3ac..01e2b113e 100644 --- a/trunk/research/players/srs_bwt.html +++ b/trunk/research/players/srs_bwt.html @@ -67,7 +67,7 @@
diff --git a/trunk/research/players/srs_bwt/src/SrsBandwidth.as b/trunk/research/players/srs_bwt/src/SrsBandwidth.as index 30d501c4b..63eef0939 100755 --- a/trunk/research/players/srs_bwt/src/SrsBandwidth.as +++ b/trunk/research/players/srs_bwt/src/SrsBandwidth.as @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in @@ -545,4 +545,4 @@ package } } } -} \ No newline at end of file +} diff --git a/trunk/research/players/srs_bwt/src/srs.bandwidth.js b/trunk/research/players/srs_bwt/src/srs.bandwidth.js index 512b746af..0065116be 100755 --- a/trunk/research/players/srs_bwt/src/srs.bandwidth.js +++ b/trunk/research/players/srs_bwt/src/srs.bandwidth.js @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in @@ -248,4 +248,4 @@ function __srs_on_complete(id, start_time, end_time, play_kbps, publish_kbps, pl bandwidth.on_update_status(status); bandwidth.on_complete(start_time, end_time, play_kbps, publish_kbps, play_bytes, publish_bytes, play_time, publish_time); -} \ No newline at end of file +} diff --git a/trunk/research/players/srs_bwt/src/srs_bwt.as b/trunk/research/players/srs_bwt/src/srs_bwt.as index 10bccc5c3..4a965e210 100755 --- a/trunk/research/players/srs_bwt/src/srs_bwt.as +++ b/trunk/research/players/srs_bwt/src/srs_bwt.as @@ -1,7 +1,7 @@ /* 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 this software and associated documentation files (the "Software"), to deal in @@ -193,4 +193,4 @@ package trace(status); } } -} \ No newline at end of file +} diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html index d7e7357d5..ea862aec6 100644 --- a/trunk/research/players/srs_chat.html +++ b/trunk/research/players/srs_chat.html @@ -246,7 +246,7 @@
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html index 6668e02c8..b70b8194d 100755 --- a/trunk/research/players/srs_player.html +++ b/trunk/research/players/srs_player.html @@ -54,7 +54,7 @@