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

add atc_auto to disable or enable auto detect atc

Browse source
This commit is contained in:
winlin 2014-04-30 12:08:11 +08:00
parent 30bb3ff704
commit fc501b050b
5 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/conf/full.conf
View file

@ -223,6 +223,12 @@ vhost atc.srs.com {
# #
# default: off # default: off
atc on; atc on;
# whether enable the auto atc,
# if enabled, detect the bravo_atc="true" in onMetaData packet,
# set atc to on if matched.
# always ignore the onMetaData if atc_auto is off.
# default: on
atc_auto on;
} }
# vhost for bandwidth check # vhost for bandwidth check

18
trunk/src/app/srs_app_config.cpp
View file

@ -1654,7 +1654,7 @@ bool SrsConfig::get_atc(string vhost)
SrsConfDirective* conf = get_vhost(vhost); SrsConfDirective* conf = get_vhost(vhost);
if (!conf) { if (!conf) {
return true; return false;
} }
conf = conf->get("atc"); conf = conf->get("atc");
@ -1665,6 +1665,22 @@ bool SrsConfig::get_atc(string vhost)
return false; return false;
} }
bool SrsConfig::get_atc_auto(string vhost)
{
SrsConfDirective* conf = get_vhost(vhost);
if (!conf) {
return true;
}
conf = conf->get("atc_auto");
if (conf && conf->arg0() == "off") {
return false;
}
return true;
}
double SrsConfig::get_queue_length(string vhost) double SrsConfig::get_queue_length(string vhost)
{ {
SrsConfDirective* conf = get_vhost(vhost); SrsConfDirective* conf = get_vhost(vhost);

1
trunk/src/app/srs_app_config.hpp
View file

@ -180,6 +180,7 @@ public:
virtual SrsConfDirective* get_vhost_on_dvr_hss_reap_flv(std::string vhost); virtual SrsConfDirective* get_vhost_on_dvr_hss_reap_flv(std::string vhost);
virtual bool get_gop_cache(std::string vhost); virtual bool get_gop_cache(std::string vhost);
virtual bool get_atc(std::string vhost); virtual bool get_atc(std::string vhost);
virtual bool get_atc_auto(std::string vhost);
virtual double get_queue_length(std::string vhost); virtual double get_queue_length(std::string vhost);
virtual SrsConfDirective* get_forward(std::string vhost); virtual SrsConfDirective* get_forward(std::string vhost);
virtual SrsConfDirective* get_refer(std::string vhost); virtual SrsConfDirective* get_refer(std::string vhost);

10
trunk/src/app/srs_app_source.cpp
View file

@ -822,11 +822,13 @@ int SrsSource::on_meta_data(SrsMessage* msg, SrsOnMetaDataPacket* metadata)
} }
} }
// if bravo-atc, open atc for vhost. // if allow atc_auto and bravo-atc detected, open atc for vhost.
atc = _srs_config->get_atc(_req->vhost); atc = _srs_config->get_atc(_req->vhost);
if ((prop = metadata->metadata->get_property("bravo_atc")) != NULL) { if (_srs_config->get_atc_auto(_req->vhost)) {
if (prop->is_string() && prop->to_str() == "true") { if ((prop = metadata->metadata->get_property("bravo_atc")) != NULL) {
atc = true; if (prop->is_string() && prop->to_str() == "true") {
atc = true;
}
} }
} }

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR "0" #define VERSION_MAJOR "0"
#define VERSION_MINOR "9" #define VERSION_MINOR "9"
#define VERSION_REVISION "85" #define VERSION_REVISION "86"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info. // server info.
#define RTMP_SIG_SRS_KEY "srs" #define RTMP_SIG_SRS_KEY "srs"