mirror of
https://github.com/ossrs/srs.git
synced 2025-02-15 04:42:04 +00:00
fix the format to unix without x
This commit is contained in:
parent
235e3cc120
commit
e3e0db9bb1
44 changed files with 19 additions and 0 deletions
7
trunk/conf/srs.conf
Executable file → Normal file
7
trunk/conf/srs.conf
Executable file → Normal file
|
@ -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.
|
||||
|
|
0
trunk/src/core/srs_core.cpp
Executable file → Normal file
0
trunk/src/core/srs_core.cpp
Executable file → Normal file
0
trunk/src/core/srs_core.hpp
Executable file → Normal file
0
trunk/src/core/srs_core.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_amf0.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_amf0.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_amf0.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_amf0.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_autofree.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_autofree.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_autofree.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_autofree.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_buffer.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_buffer.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_buffer.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_buffer.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_client.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_client.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_client.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_client.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_codec.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_codec.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_codec.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_codec.hpp
Executable file → Normal file
11
trunk/src/core/srs_core_config.cpp
Executable file → Normal file
11
trunk/src/core/srs_core_config.cpp
Executable file → Normal file
|
@ -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);
|
||||
|
|
1
trunk/src/core/srs_core_config.hpp
Executable file → Normal file
1
trunk/src/core/srs_core_config.hpp
Executable file → Normal file
|
@ -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);
|
||||
|
|
0
trunk/src/core/srs_core_conn.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_conn.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_conn.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_conn.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_error.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_error.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_error.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_error.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_handshake.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_handshake.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_handshake.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_handshake.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_log.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_log.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_log.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_log.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_pithy_print.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_pithy_print.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_pithy_print.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_pithy_print.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_protocol.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_protocol.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_protocol.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_protocol.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_refer.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_refer.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_refer.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_refer.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_reload.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_reload.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_reload.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_reload.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_rtmp.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_rtmp.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_rtmp.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_rtmp.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_server.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_server.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_server.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_server.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_socket.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_socket.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_socket.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_socket.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_source.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_source.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_source.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_source.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_stream.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_stream.cpp
Executable file → Normal file
0
trunk/src/core/srs_core_stream.hpp
Executable file → Normal file
0
trunk/src/core/srs_core_stream.hpp
Executable file → Normal file
0
trunk/src/main/srs_main_server.cpp
Executable file → Normal file
0
trunk/src/main/srs_main_server.cpp
Executable file → Normal file
0
trunk/src/srs/init
Executable file → Normal file
0
trunk/src/srs/init
Executable file → Normal file
0
trunk/src/srs/srs.upp
Executable file → Normal file
0
trunk/src/srs/srs.upp
Executable file → Normal file
Loading…
Reference in a new issue