1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

revert the copyrigh, only when commit feature, add the copyright field

This commit is contained in:
winlin 2013-12-22 12:40:46 +08:00
parent dfb3e117f8
commit bad6f0d3a8
5 changed files with 29 additions and 4 deletions

View file

@ -31,6 +31,9 @@ vhost demo.srs.com {
gop_cache on; gop_cache on;
queue_length 30; queue_length 30;
forward 127.0.0.1:19350; forward 127.0.0.1:19350;
bandcheck {
enabled off;
}
hls { hls {
enabled on; enabled on;
hls_path ./objs/nginx/html; hls_path ./objs/nginx/html;
@ -200,6 +203,31 @@ vhost dev {
} }
} }
# vhost for bandwidth check
# generally, the bandcheck vhost must be: bandcheck.srs.com,
# or need to modify the vhost of client.
vhost bandcheck.srs.com {
enabled on;
chunk_size 65000;
# bandwidth check config.
bandcheck {
# whether support bandwidth check,
# default: off.
enabled on;
# the key for server to valid,
# if invalid key, server disconnect and abort the bandwidth check.
key 35c9b402c12a7246868752e2878f7e0e;
# the interval in seconds for bandwidth check,
# server donot allow new test request.
# default: 30
interval 30;
# the max available check bandwidth in kbps.
# to avoid attack of bandwidth check.
# default: 1000
limit_kbps 4000;
}
}
# set the chunk size of vhost. # set the chunk size of vhost.
vhost chunksize.vhost.com { vhost chunksize.vhost.com {
# the default chunk size is 128, max is 65536, # the default chunk size is 128, max is 65536,

2
trunk/src/core/srs_core.cpp Normal file → Executable file
View file

@ -43,7 +43,7 @@ void srs_update_system_time_ms()
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
// we must convert the tv_sec/tv_usec to int64_t. // we must convert the tv_sec/tv_usec to int64_t.
_srs_system_time_us_cache = now.tv_sec * 1000 * 1000 + now.tv_usec; _srs_system_time_us_cache = ((int64_t)now.tv_sec) * 1000 * 1000 + (int64_t)now.tv_usec;
_srs_system_time_us_cache = srs_max(0, _srs_system_time_us_cache); _srs_system_time_us_cache = srs_max(0, _srs_system_time_us_cache);
} }

View file

@ -2,7 +2,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013 winlin Copyright (c) 2013 winlin
Copyright (c) 2013 wenjiegit
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

1
trunk/src/core/srs_core_config.cpp Normal file → Executable file
View file

@ -2,7 +2,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013 winlin Copyright (c) 2013 winlin
Copyright (c) 2013 wenjiegit
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in

1
trunk/src/core/srs_core_config.hpp Normal file → Executable file
View file

@ -2,7 +2,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2013 winlin Copyright (c) 2013 winlin
Copyright (c) 2013 wenjiegit
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in