diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf old mode 100755 new mode 100644 index 633848f8a..427826337 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -17,6 +17,13 @@ vhost removed.vhost.com { # default: on enabled off; } +# the vhost with hls disabled. +vhost no-hls.vhost.com { + # whether the hls is enabled. + # if off, donot write hls(ts and m3u8) when publish. + # default: on + hls off; +} # the vhost for min delay, donot cache any stream. vhost min.delay.com { # whether cache the last gop. diff --git a/trunk/src/core/srs_core.cpp b/trunk/src/core/srs_core.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_amf0.cpp b/trunk/src/core/srs_core_amf0.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_amf0.hpp b/trunk/src/core/srs_core_amf0.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_autofree.cpp b/trunk/src/core/srs_core_autofree.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_buffer.cpp b/trunk/src/core/srs_core_buffer.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_buffer.hpp b/trunk/src/core/srs_core_buffer.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_client.cpp b/trunk/src/core/srs_core_client.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_client.hpp b/trunk/src/core/srs_core_client.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_codec.cpp b/trunk/src/core/srs_core_codec.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_codec.hpp b/trunk/src/core/srs_core_codec.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_config.cpp b/trunk/src/core/srs_core_config.cpp old mode 100755 new mode 100644 index 59caa2894..4b2d0f361 --- a/trunk/src/core/srs_core_config.cpp +++ b/trunk/src/core/srs_core_config.cpp @@ -562,6 +562,17 @@ SrsConfDirective* SrsConfig::get_gop_cache(std::string vhost) return conf->get("gop_cache"); } +SrsConfDirective* SrsConfig::get_hls(std::string vhost) +{ + SrsConfDirective* conf = get_vhost(vhost); + + if (!conf) { + return NULL; + } + + return conf->get("hls"); +} + SrsConfDirective* SrsConfig::get_refer(std::string vhost) { SrsConfDirective* conf = get_vhost(vhost); diff --git a/trunk/src/core/srs_core_config.hpp b/trunk/src/core/srs_core_config.hpp old mode 100755 new mode 100644 index bc059e1ec..f57368edc --- a/trunk/src/core/srs_core_config.hpp +++ b/trunk/src/core/srs_core_config.hpp @@ -109,6 +109,7 @@ public: virtual int parse_options(int argc, char** argv); virtual SrsConfDirective* get_vhost(std::string vhost); virtual SrsConfDirective* get_gop_cache(std::string vhost); + virtual SrsConfDirective* get_hls(std::string vhost); virtual SrsConfDirective* get_refer(std::string vhost); virtual SrsConfDirective* get_refer_play(std::string vhost); virtual SrsConfDirective* get_refer_publish(std::string vhost); diff --git a/trunk/src/core/srs_core_conn.cpp b/trunk/src/core/srs_core_conn.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_conn.hpp b/trunk/src/core/srs_core_conn.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_error.cpp b/trunk/src/core/srs_core_error.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_error.hpp b/trunk/src/core/srs_core_error.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_handshake.cpp b/trunk/src/core/srs_core_handshake.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_handshake.hpp b/trunk/src/core/srs_core_handshake.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_log.cpp b/trunk/src/core/srs_core_log.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_log.hpp b/trunk/src/core/srs_core_log.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_pithy_print.cpp b/trunk/src/core/srs_core_pithy_print.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_pithy_print.hpp b/trunk/src/core/srs_core_pithy_print.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_protocol.cpp b/trunk/src/core/srs_core_protocol.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_protocol.hpp b/trunk/src/core/srs_core_protocol.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_refer.cpp b/trunk/src/core/srs_core_refer.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_refer.hpp b/trunk/src/core/srs_core_refer.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_reload.cpp b/trunk/src/core/srs_core_reload.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_reload.hpp b/trunk/src/core/srs_core_reload.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_rtmp.cpp b/trunk/src/core/srs_core_rtmp.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_rtmp.hpp b/trunk/src/core/srs_core_rtmp.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_server.cpp b/trunk/src/core/srs_core_server.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_server.hpp b/trunk/src/core/srs_core_server.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_socket.cpp b/trunk/src/core/srs_core_socket.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_socket.hpp b/trunk/src/core/srs_core_socket.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_source.cpp b/trunk/src/core/srs_core_source.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_source.hpp b/trunk/src/core/srs_core_source.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_stream.cpp b/trunk/src/core/srs_core_stream.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/core/srs_core_stream.hpp b/trunk/src/core/srs_core_stream.hpp old mode 100755 new mode 100644 diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp old mode 100755 new mode 100644 diff --git a/trunk/src/srs/init b/trunk/src/srs/init old mode 100755 new mode 100644 diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp old mode 100755 new mode 100644