diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index c379c8aba..46b5d1fec 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -2546,7 +2546,7 @@ srs_error_t SrsConfig::check_normal_config() && n != "mss" && n != "latency" && n != "recvlatency" && n != "peerlatency" && n != "tlpkdrop" && n != "connect_timeout" && n != "sendbuf" && n != "recvbuf" && n != "payloadsize" - && n != "default_app" && n != "mix_correct" && n != "sei_filter" + && n != "default_app" && n != "sei_filter" && n != "tlpktdrop" && n != "tsbpdmode") { return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal srt_server.%s", n.c_str()); } @@ -6978,21 +6978,6 @@ string SrsConfig::get_default_app_name() return conf->arg0(); } -bool SrsConfig::get_srt_mix_correct() -{ - static bool DEFAULT = true; - SrsConfDirective* conf = root->get("srt_server"); - if (!conf) { - return DEFAULT; - } - - conf = conf->get("mix_correct"); - if (!conf || conf->arg0().empty()) { - return DEFAULT; - } - return SRS_CONF_PERFER_TRUE(conf->arg0()); -} - SrsConfDirective* SrsConfig::get_srt(std::string vhost) { SrsConfDirective* conf = get_vhost(vhost); diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index e514ec6b8..d9bd6b47c 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -660,8 +660,6 @@ public: virtual int get_srto_payloadsize(); // Get the default app. virtual std::string get_default_app_name(); - // Get the mix_correct - virtual bool get_srt_mix_correct(); private: SrsConfDirective* get_srt(std::string vhost); public: