正在显示
2 个修改的文件
包含
10 行增加
和
1 行删除
| @@ -317,7 +317,7 @@ Supported operating systems and hardware: | @@ -317,7 +317,7 @@ Supported operating systems and hardware: | ||
| 317 | 22. Player, publisher(encoder), and demo pages(jquery+bootstrap). <br/> | 317 | 22. Player, publisher(encoder), and demo pages(jquery+bootstrap). <br/> |
| 318 | 23. Demo video meeting or chat(SRS+cherrypy+jquery+bootstrap). <br/> | 318 | 23. Demo video meeting or chat(SRS+cherrypy+jquery+bootstrap). <br/> |
| 319 | 24. [dev] Full documents in wiki, in chineses. <br/> | 319 | 24. [dev] Full documents in wiki, in chineses. <br/> |
| 320 | -25. [dev] Support RTMP(publish) library<br/> | 320 | +25. [dev] Support RTMP(play-publish) library: srs-librtmp<br/> |
| 321 | 26. [plan] Support RTSP(RTP, SDP)<br/> | 321 | 26. [plan] Support RTSP(RTP, SDP)<br/> |
| 322 | 27. [plan] Support system utest<br/> | 322 | 27. [plan] Support system utest<br/> |
| 323 | 28. [plan] Support HLS cluster, use RTMP ATC to generate the TS<br/> | 323 | 28. [plan] Support HLS cluster, use RTMP ATC to generate the TS<br/> |
| @@ -381,6 +381,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv | @@ -381,6 +381,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv | ||
| 381 | * nginx v1.5.0: 139524 lines <br/> | 381 | * nginx v1.5.0: 139524 lines <br/> |
| 382 | 382 | ||
| 383 | ### History | 383 | ### History |
| 384 | +* v1.0, 2014-03-02, srs-librtmp, client publish/play library like librtmp. | ||
| 384 | * v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/drm/app/main module. | 385 | * v1.0, 2014-03-01, modularity, extract core/kernel/os/protocol/drm/app/main module. |
| 385 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. | 386 | * v1.0, 2014-02-28, support arm build(SRS/ST), add ssl to 3rdparty package. |
| 386 | * v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/Build), [FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/Reload) | 387 | * v1.0, 2014-02-28, add wiki [BuildArm](https://github.com/winlinvip/simple-rtmp-server/wiki/Build), [FFMPEG](https://github.com/winlinvip/simple-rtmp-server/wiki/FFMPEG), [Reload](https://github.com/winlinvip/simple-rtmp-server/wiki/Reload) |
| @@ -28,6 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -28,6 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 28 | #include <srs_librtmp.h> | 28 | #include <srs_librtmp.h> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | +/** | ||
| 32 | +* srs-librtmp is a librtmp like library, | ||
| 33 | +* used to play/publish rtmp stream from/to rtmp server. | ||
| 34 | +* socket: use sync and block socket to connect/recv/send data with server. | ||
| 35 | +* depends: no need other libraries; depends on ssl if use srs_complex_handshake. | ||
| 36 | +* thread-safe: no | ||
| 37 | +*/ | ||
| 38 | + | ||
| 31 | #ifdef __cplusplus | 39 | #ifdef __cplusplus |
| 32 | extern "C"{ | 40 | extern "C"{ |
| 33 | #endif | 41 | #endif |
-
请 注册 或 登录 后发表评论