diff --git a/README.md b/README.md index b00c35f4c..801bed1fe 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ minimum run. see [Build](https://github.com/winlinvip/simple-rtmp-server/wiki/Bu SRS supports [vhost](https://github.com/winlinvip/simple-rtmp-server/wiki/RtmpUrlVhost), rtmp([encoder push](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryRTMP), client/edge pull), ingester(srs pull), -[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), +[HLS](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS), HLS audio only, [transcoding](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [forward](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [http hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback). Blog: [http://blog.csdn.net/win_lin](http://blog.csdn.net/win_lin)
@@ -75,47 +75,48 @@ Supported operating systems and hardware: * All handware. ### Summary -1. Simple: also stable enough.
-2. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven.
-3. With RTMP edge server, support origin server.
-4. RTMP without vod streaming, live streaming only.
-5. With multiple processes, support single process.
-6. Support vhost, support \_\_defaultVhost\_\_.
-7. Support adobe rtmp live streaming.
-8. Support apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS) live streaming.
-9. Support reload config to enable changes.
-10. Support cache last gop for flash player to fast startup.
-11. Support listen at multiple ports.
-12. Support long time(>4.6hours) publish/play.
-13. High performace, 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB
-14. Support forward publish stream to build active-standby [cluster](https://github.com/winlinvip/simple-rtmp-server/wiki/Cluster).
-15. Support broadcast by forward the stream to other servers(origin/edge).
-16. Support live stream transcoding by ffmpeg.
-17. Support live stream forward(acopy/vcopy) by ffmpeg.
-18. Support ffmpeg filters(logo/overlay/crop), x264 params, copy/vn/an.
-19. Support audio transcode only, speex/mp3 to aac
-20. Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback)(for authentication and injection).
-21. Support bandwidth test api and flash client.
-22. Player, publisher(encoder), and demo pages(jquery+bootstrap).
-23. Demo video meeting or chat(SRS+cherrypy+jquery+bootstrap).
-24. Full documents in wiki, in chineses.
-25. Support RTMP(play-publish) library: srs-librtmp
-26. Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm)) with rtmp/ssl/hls/librtmp.
-27. [plan] Support system utest
-28. [plan] Support embeded http server for api and hls(live/vod)
-29. [plan] Support vod(file to hls stream)
-30. [plan] Support stream ingester using ffmpeg.
-31. [plan] Support ingest RTSP(RTP, SDP) stream to RTMP.
-32. [plan] Support network based cli and json result.
-33. [plan] Support HLS cluster, use RTMP ATC to generate the TS
-34. [plan] Support RTMP edge server, push/pull stream from any RTMP server
-35. [plan] Support multiple processes, for both origin and edge
-36. [no-plan] Support adobe flash refer/token/swf verification.
-37. [no-plan] Support adobe amf3 codec.
-38. [no-plan] Support dvr(record live to vod file)
-39. [no-plan] Support encryption: RTMPE/RTMPS, HLS DRM
-40. [no-plan] Support RTMPT, http to tranverse firewalls
-41. [no-plan] Support file source, transcoding file to live stream
+01. Simple: also stable enough.
+02. [High-performance](https://github.com/winlinvip/simple-rtmp-server/wiki/Performance): single-thread, async socket, event/st-thread driven.
+03. With RTMP edge server, support origin server.
+04. RTMP without vod streaming, live streaming only.
+05. With multiple processes, support single process.
+06. Support vhost, support \_\_defaultVhost\_\_.
+07. Support adobe rtmp live streaming.
+08. Support apple [HLS(m3u8)](https://github.com/winlinvip/simple-rtmp-server/wiki/DeliveryHLS) live streaming.
+09. Support HLS audio-only live streaming.
+10. Support reload config to enable changes.
+11. Support cache last gop for flash player to fast startup.
+12. Support listen at multiple ports.
+13. Support long time(>4.6hours) publish/play.
+14. High performace, 1800 connections(500kbps), 900Mbps, CPU 90.2%, 41MB
+15. Support forward publish stream to build active-standby [cluster](https://github.com/winlinvip/simple-rtmp-server/wiki/Cluster).
+16. Support broadcast by forward the stream to other servers(origin/edge).
+17. Support live stream transcoding by ffmpeg.
+18. Support live stream forward(acopy/vcopy) by ffmpeg.
+19. Support ffmpeg filters(logo/overlay/crop), x264 params, copy/vn/an.
+20. Support audio transcode only, speex/mp3 to aac
+21. Support [http callback api hooks](https://github.com/winlinvip/simple-rtmp-server/wiki/HTTPCallback)(for authentication and injection).
+22. Support bandwidth test api and flash client.
+23. Player, publisher(encoder), and demo pages(jquery+bootstrap).
+24. Demo video meeting or chat(SRS+cherrypy+jquery+bootstrap).
+25. Full documents in wiki, in chineses.
+26. Support RTMP(play-publish) library: srs-librtmp
+27. Support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm)) with rtmp/ssl/hls/librtmp.
+28. [plan] Support system utest
+29. [plan] Support embeded http server for api and hls(live/vod)
+30. [plan] Support vod(file to hls stream)
+31. [plan] Support stream ingester using ffmpeg.
+32. [plan] Support ingest RTSP(RTP, SDP) stream to RTMP.
+33. [plan] Support network based cli and json result.
+34. [plan] Support HLS cluster, use RTMP ATC to generate the TS
+35. [plan] Support RTMP edge server, push/pull stream from any RTMP server
+36. [plan] Support multiple processes, for both origin and edge
+37. [no-plan] Support adobe flash refer/token/swf verification.
+38. [no-plan] Support adobe amf3 codec.
+39. [no-plan] Support dvr(record live to vod file)
+40. [no-plan] Support encryption: RTMPE/RTMPS, HLS DRM
+41. [no-plan] Support RTMPT, http to tranverse firewalls
+42. [no-plan] Support file source, transcoding file to live stream
### Performance 1. 300 connections, 150Mbps, 500kbps, CPU 18.8%, MEM 5956KB. diff --git a/trunk/doc/source.200kbps.768x320.flv b/trunk/doc/source.200kbps.768x320.flv index 84bbb0cd7..70e8a09ab 100644 Binary files a/trunk/doc/source.200kbps.768x320.flv and b/trunk/doc/source.200kbps.768x320.flv differ