正在显示
44 个修改的文件
包含
19 行增加
和
0 行删除
trunk/conf/srs.conf
100755 → 100644
@@ -17,6 +17,13 @@ vhost removed.vhost.com { | @@ -17,6 +17,13 @@ vhost removed.vhost.com { | ||
17 | # default: on | 17 | # default: on |
18 | enabled off; | 18 | enabled off; |
19 | } | 19 | } |
20 | +# the vhost with hls disabled. | ||
21 | +vhost no-hls.vhost.com { | ||
22 | + # whether the hls is enabled. | ||
23 | + # if off, donot write hls(ts and m3u8) when publish. | ||
24 | + # default: on | ||
25 | + hls off; | ||
26 | +} | ||
20 | # the vhost for min delay, donot cache any stream. | 27 | # the vhost for min delay, donot cache any stream. |
21 | vhost min.delay.com { | 28 | vhost min.delay.com { |
22 | # whether cache the last gop. | 29 | # whether cache the last gop. |
trunk/src/core/srs_core.cpp
100755 → 100644
trunk/src/core/srs_core.hpp
100755 → 100644
trunk/src/core/srs_core_amf0.cpp
100755 → 100644
trunk/src/core/srs_core_amf0.hpp
100755 → 100644
trunk/src/core/srs_core_autofree.cpp
100755 → 100644
trunk/src/core/srs_core_autofree.hpp
100755 → 100644
trunk/src/core/srs_core_buffer.cpp
100755 → 100644
trunk/src/core/srs_core_buffer.hpp
100755 → 100644
trunk/src/core/srs_core_client.cpp
100755 → 100644
trunk/src/core/srs_core_client.hpp
100755 → 100644
trunk/src/core/srs_core_codec.cpp
100755 → 100644
trunk/src/core/srs_core_codec.hpp
100755 → 100644
trunk/src/core/srs_core_config.cpp
100755 → 100644
@@ -562,6 +562,17 @@ SrsConfDirective* SrsConfig::get_gop_cache(std::string vhost) | @@ -562,6 +562,17 @@ SrsConfDirective* SrsConfig::get_gop_cache(std::string vhost) | ||
562 | return conf->get("gop_cache"); | 562 | return conf->get("gop_cache"); |
563 | } | 563 | } |
564 | 564 | ||
565 | +SrsConfDirective* SrsConfig::get_hls(std::string vhost) | ||
566 | +{ | ||
567 | + SrsConfDirective* conf = get_vhost(vhost); | ||
568 | + | ||
569 | + if (!conf) { | ||
570 | + return NULL; | ||
571 | + } | ||
572 | + | ||
573 | + return conf->get("hls"); | ||
574 | +} | ||
575 | + | ||
565 | SrsConfDirective* SrsConfig::get_refer(std::string vhost) | 576 | SrsConfDirective* SrsConfig::get_refer(std::string vhost) |
566 | { | 577 | { |
567 | SrsConfDirective* conf = get_vhost(vhost); | 578 | SrsConfDirective* conf = get_vhost(vhost); |
trunk/src/core/srs_core_config.hpp
100755 → 100644
@@ -109,6 +109,7 @@ public: | @@ -109,6 +109,7 @@ public: | ||
109 | virtual int parse_options(int argc, char** argv); | 109 | virtual int parse_options(int argc, char** argv); |
110 | virtual SrsConfDirective* get_vhost(std::string vhost); | 110 | virtual SrsConfDirective* get_vhost(std::string vhost); |
111 | virtual SrsConfDirective* get_gop_cache(std::string vhost); | 111 | virtual SrsConfDirective* get_gop_cache(std::string vhost); |
112 | + virtual SrsConfDirective* get_hls(std::string vhost); | ||
112 | virtual SrsConfDirective* get_refer(std::string vhost); | 113 | virtual SrsConfDirective* get_refer(std::string vhost); |
113 | virtual SrsConfDirective* get_refer_play(std::string vhost); | 114 | virtual SrsConfDirective* get_refer_play(std::string vhost); |
114 | virtual SrsConfDirective* get_refer_publish(std::string vhost); | 115 | virtual SrsConfDirective* get_refer_publish(std::string vhost); |
trunk/src/core/srs_core_conn.cpp
100755 → 100644
trunk/src/core/srs_core_conn.hpp
100755 → 100644
trunk/src/core/srs_core_error.cpp
100755 → 100644
trunk/src/core/srs_core_error.hpp
100755 → 100644
trunk/src/core/srs_core_handshake.cpp
100755 → 100644
trunk/src/core/srs_core_handshake.hpp
100755 → 100644
trunk/src/core/srs_core_log.cpp
100755 → 100644
trunk/src/core/srs_core_log.hpp
100755 → 100644
trunk/src/core/srs_core_pithy_print.cpp
100755 → 100644
trunk/src/core/srs_core_pithy_print.hpp
100755 → 100644
trunk/src/core/srs_core_protocol.cpp
100755 → 100644
trunk/src/core/srs_core_protocol.hpp
100755 → 100644
trunk/src/core/srs_core_refer.cpp
100755 → 100644
trunk/src/core/srs_core_refer.hpp
100755 → 100644
trunk/src/core/srs_core_reload.cpp
100755 → 100644
trunk/src/core/srs_core_reload.hpp
100755 → 100644
trunk/src/core/srs_core_rtmp.cpp
100755 → 100644
trunk/src/core/srs_core_rtmp.hpp
100755 → 100644
trunk/src/core/srs_core_server.cpp
100755 → 100644
trunk/src/core/srs_core_server.hpp
100755 → 100644
trunk/src/core/srs_core_socket.cpp
100755 → 100644
trunk/src/core/srs_core_socket.hpp
100755 → 100644
trunk/src/core/srs_core_source.cpp
100755 → 100644
trunk/src/core/srs_core_source.hpp
100755 → 100644
trunk/src/core/srs_core_stream.cpp
100755 → 100644
trunk/src/core/srs_core_stream.hpp
100755 → 100644
trunk/src/main/srs_main_server.cpp
100755 → 100644
trunk/src/srs/init
100755 → 100644
trunk/src/srs/srs.upp
100755 → 100644
-
请 注册 或 登录 后发表评论