正在显示
4 个修改的文件
包含
29 行增加
和
7 行删除
| @@ -501,7 +501,7 @@ Supported operating systems and hardware: | @@ -501,7 +501,7 @@ Supported operating systems and hardware: | ||
| 501 | 501 | ||
| 502 | ## Releases | 502 | ## Releases |
| 503 | * 2015-01-15, [Release v1.0r1](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1), bug fixed, 1.0.21, 59472 lines.<br/> | 503 | * 2015-01-15, [Release v1.0r1](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1), bug fixed, 1.0.21, 59472 lines.<br/> |
| 504 | -* 2014-12-05, [Release v1.0](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0), all bug fixed, 1.0.10, 59391 lines.<br/> | 504 | +* 2014-12-05, [Release v1.0r0](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r0), all bug fixed, 1.0.10, 59391 lines.<br/> |
| 505 | * 2014-10-09, [Release v1.0-beta](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.beta), all bug fixed, 1.0.0, 59316 lines.<br/> | 505 | * 2014-10-09, [Release v1.0-beta](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.beta), all bug fixed, 1.0.0, 59316 lines.<br/> |
| 506 | * 2014-08-03, [Release v1.0-mainline7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline7), config utest, all bug fixed. 57432 lines.<br/> | 506 | * 2014-08-03, [Release v1.0-mainline7](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline7), config utest, all bug fixed. 57432 lines.<br/> |
| 507 | * 2014-07-13, [Release v1.0-mainline6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline6), core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.<br/> | 507 | * 2014-07-13, [Release v1.0-mainline6](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0.mainline6), core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines.<br/> |
| @@ -525,6 +525,7 @@ Supported operating systems and hardware: | @@ -525,6 +525,7 @@ Supported operating systems and hardware: | ||
| 525 | 525 | ||
| 526 | ### SRS 2.0 history | 526 | ### SRS 2.0 history |
| 527 | 527 | ||
| 528 | +* v2.0, 2015-02-03, fix [#136](https://github.com/winlinvip/simple-rtmp-server/issues/136), support hls without io(in ram). 2.0.112 | ||
| 528 | * v2.0, 2015-01-31, for [#250](https://github.com/winlinvip/simple-rtmp-server/issues/250), support push MPEGTS over UDP to SRS. 2.0.111 | 529 | * v2.0, 2015-01-31, for [#250](https://github.com/winlinvip/simple-rtmp-server/issues/250), support push MPEGTS over UDP to SRS. 2.0.111 |
| 529 | * v2.0, 2015-01-29, build libfdk-aac in ffmpeg. 2.0.108 | 530 | * v2.0, 2015-01-29, build libfdk-aac in ffmpeg. 2.0.108 |
| 530 | * v2.0, 2015-01-25, for [#301](https://github.com/winlinvip/simple-rtmp-server/issues/301), hls support h.264+mp3, ok for vlc. 2.0.107 | 531 | * v2.0, 2015-01-25, for [#301](https://github.com/winlinvip/simple-rtmp-server/issues/301), hls support h.264+mp3, ok for vlc. 2.0.107 |
| @@ -461,6 +461,12 @@ vhost with-hls.srs.com { | @@ -461,6 +461,12 @@ vhost with-hls.srs.com { | ||
| 461 | # @see https://github.com/winlinvip/simple-rtmp-server/issues/264 | 461 | # @see https://github.com/winlinvip/simple-rtmp-server/issues/264 |
| 462 | # default: ignore | 462 | # default: ignore |
| 463 | hls_on_error ignore; | 463 | hls_on_error ignore; |
| 464 | + # the hls storage: disk, ram or both. | ||
| 465 | + # disk, to write hls m3u8/ts to disk. | ||
| 466 | + # ram, serve m3u8/ts in memory, which use embeded http server to delivery. | ||
| 467 | + # both, disk and ram. | ||
| 468 | + # default: disk | ||
| 469 | + hls_storage disk; | ||
| 464 | # the hls output path. | 470 | # the hls output path. |
| 465 | # the app dir is auto created under the hls_path. | 471 | # the app dir is auto created under the hls_path. |
| 466 | # for example, for rtmp stream: | 472 | # for example, for rtmp stream: |
| @@ -473,12 +479,6 @@ vhost with-hls.srs.com { | @@ -473,12 +479,6 @@ vhost with-hls.srs.com { | ||
| 473 | # in a word, the hls_path is for vhost. | 479 | # in a word, the hls_path is for vhost. |
| 474 | # default: ./objs/nginx/html | 480 | # default: ./objs/nginx/html |
| 475 | hls_path ./objs/nginx/html; | 481 | hls_path ./objs/nginx/html; |
| 476 | - # the hls storage: disk, ram or both. | ||
| 477 | - # disk, to write hls m3u8/ts to disk. | ||
| 478 | - # ram, serve m3u8/ts in memory, which use embeded http server to delivery. | ||
| 479 | - # both, disk and ram. | ||
| 480 | - # default: disk | ||
| 481 | - hls_storage disk; | ||
| 482 | # the hls mount for hls_storage ram, | 482 | # the hls mount for hls_storage ram, |
| 483 | # which use srs embeded http server to delivery HLS, | 483 | # which use srs embeded http server to delivery HLS, |
| 484 | # where the mount specifies the HTTP url to mount. | 484 | # where the mount specifies the HTTP url to mount. |
trunk/conf/ram.hls.conf
0 → 100644
| 1 | +# the config for srs to delivery hls | ||
| 2 | +# @see https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SampleHLS | ||
| 3 | +# @see full.conf for detail config. | ||
| 4 | + | ||
| 5 | +listen 1935; | ||
| 6 | +max_connections 1000; | ||
| 7 | +http_server { | ||
| 8 | + enabled on; | ||
| 9 | + listen 8080; | ||
| 10 | + dir ./objs/nginx/html; | ||
| 11 | +} | ||
| 12 | +vhost __defaultVhost__ { | ||
| 13 | + hls { | ||
| 14 | + enabled on; | ||
| 15 | + hls_fragment 10; | ||
| 16 | + hls_window 60; | ||
| 17 | + hls_storage ram; | ||
| 18 | + hls_mount /[app]/[stream].m3u8; | ||
| 19 | + } | ||
| 20 | +} |
| @@ -175,6 +175,7 @@ private: | @@ -175,6 +175,7 @@ private: | ||
| 175 | std::string m3u8; | 175 | std::string m3u8; |
| 176 | private: | 176 | private: |
| 177 | ISrsHlsHandler* handler; | 177 | ISrsHlsHandler* handler; |
| 178 | + // TODO: FIXME: supports reload. | ||
| 178 | bool should_write_cache; | 179 | bool should_write_cache; |
| 179 | bool should_write_file; | 180 | bool should_write_file; |
| 180 | private: | 181 | private: |
-
请 注册 或 登录 后发表评论