正在显示
100 个修改的文件
包含
86 行增加
和
5 行删除
| @@ -2156,7 +2156,7 @@ int SrsConfig::get_bw_check_interval_ms(string vhost) | @@ -2156,7 +2156,7 @@ int SrsConfig::get_bw_check_interval_ms(string vhost) | ||
| 2156 | return SRS_CONF_DEFAULT_BANDWIDTH_INTERVAL * 1000; | 2156 | return SRS_CONF_DEFAULT_BANDWIDTH_INTERVAL * 1000; |
| 2157 | } | 2157 | } |
| 2158 | 2158 | ||
| 2159 | - return ::atof(conf->arg0().c_str()) * 1000; | 2159 | + return (int)(::atof(conf->arg0().c_str()) * 1000); |
| 2160 | } | 2160 | } |
| 2161 | 2161 | ||
| 2162 | int SrsConfig::get_bw_check_limit_kbps(string vhost) | 2162 | int SrsConfig::get_bw_check_limit_kbps(string vhost) |
| @@ -3316,3 +3316,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b) | @@ -3316,3 +3316,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b) | ||
| 3316 | 3316 | ||
| 3317 | return true; | 3317 | return true; |
| 3318 | } | 3318 | } |
| 3319 | + |
| @@ -722,3 +722,4 @@ void SrsPublishEdge::on_proxy_unpublish() | @@ -722,3 +722,4 @@ void SrsPublishEdge::on_proxy_unpublish() | ||
| 722 | state = SrsEdgeStateInit; | 722 | state = SrsEdgeStateInit; |
| 723 | srs_trace("edge change from %d to state %d (init).", pstate, state); | 723 | srs_trace("edge change from %d to state %d (init).", pstate, state); |
| 724 | } | 724 | } |
| 725 | + |
| @@ -993,8 +993,8 @@ int SrsHlsCache::on_publish(SrsHlsMuxer* muxer, SrsRequest* req, int64_t segment | @@ -993,8 +993,8 @@ int SrsHlsCache::on_publish(SrsHlsMuxer* muxer, SrsRequest* req, int64_t segment | ||
| 993 | std::string stream = req->stream; | 993 | std::string stream = req->stream; |
| 994 | std::string app = req->app; | 994 | std::string app = req->app; |
| 995 | 995 | ||
| 996 | - int hls_fragment = _srs_config->get_hls_fragment(vhost); | ||
| 997 | - int hls_window = _srs_config->get_hls_window(vhost); | 996 | + int hls_fragment = (int)_srs_config->get_hls_fragment(vhost); |
| 997 | + int hls_window = (int)_srs_config->get_hls_window(vhost); | ||
| 998 | 998 | ||
| 999 | // get the hls path config | 999 | // get the hls path config |
| 1000 | std::string hls_path = _srs_config->get_hls_path(vhost); | 1000 | std::string hls_path = _srs_config->get_hls_path(vhost); |
| @@ -1531,3 +1531,4 @@ void SrsHls::hls_mux() | @@ -1531,3 +1531,4 @@ void SrsHls::hls_mux() | ||
| 1531 | 1531 | ||
| 1532 | #endif | 1532 | #endif |
| 1533 | 1533 | ||
| 1534 | + |
| @@ -197,13 +197,13 @@ int SrsRtmpConn::service_cycle() | @@ -197,13 +197,13 @@ int SrsRtmpConn::service_cycle() | ||
| 197 | { | 197 | { |
| 198 | int ret = ERROR_SUCCESS; | 198 | int ret = ERROR_SUCCESS; |
| 199 | 199 | ||
| 200 | - if ((ret = rtmp->set_window_ack_size(2.5 * 1000 * 1000)) != ERROR_SUCCESS) { | 200 | + if ((ret = rtmp->set_window_ack_size((int)(2.5 * 1000 * 1000))) != ERROR_SUCCESS) { |
| 201 | srs_error("set window acknowledgement size failed. ret=%d", ret); | 201 | srs_error("set window acknowledgement size failed. ret=%d", ret); |
| 202 | return ret; | 202 | return ret; |
| 203 | } | 203 | } |
| 204 | srs_verbose("set window acknowledgement size success"); | 204 | srs_verbose("set window acknowledgement size success"); |
| 205 | 205 | ||
| 206 | - if ((ret = rtmp->set_peer_bandwidth(2.5 * 1000 * 1000, 2)) != ERROR_SUCCESS) { | 206 | + if ((ret = rtmp->set_peer_bandwidth((int)(2.5 * 1000 * 1000), 2)) != ERROR_SUCCESS) { |
| 207 | srs_error("set peer bandwidth failed. ret=%d", ret); | 207 | srs_error("set peer bandwidth failed. ret=%d", ret); |
| 208 | return ret; | 208 | return ret; |
| 209 | } | 209 | } |
| @@ -1124,3 +1124,4 @@ void SrsRtmpConn::http_hooks_on_stop() | @@ -1124,3 +1124,4 @@ void SrsRtmpConn::http_hooks_on_stop() | ||
| 1124 | 1124 | ||
| 1125 | return; | 1125 | return; |
| 1126 | } | 1126 | } |
| 1127 | + |
| @@ -36,3 +36,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -36,3 +36,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 36 | extern void srs_close_stfd(st_netfd_t& stfd); | 36 | extern void srs_close_stfd(st_netfd_t& stfd); |
| 37 | 37 | ||
| 38 | #endif | 38 | #endif |
| 39 | + |
| @@ -97,3 +97,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -97,3 +97,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 97 | className& operator= (const className&) | 97 | className& operator= (const className&) |
| 98 | 98 | ||
| 99 | #endif | 99 | #endif |
| 100 | + |
| @@ -263,3 +263,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -263,3 +263,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 263 | #define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported" | 263 | #define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported" |
| 264 | 264 | ||
| 265 | #endif | 265 | #endif |
| 266 | + |
| @@ -35,3 +35,4 @@ bool srs_is_client_gracefully_close(int error_code) | @@ -35,3 +35,4 @@ bool srs_is_client_gracefully_close(int error_code) | ||
| 35 | || error_code == ERROR_SOCKET_READ_FULLY | 35 | || error_code == ERROR_SOCKET_READ_FULLY |
| 36 | || error_code == ERROR_SOCKET_WRITE; | 36 | || error_code == ERROR_SOCKET_WRITE; |
| 37 | } | 37 | } |
| 38 | + |
| @@ -60,3 +60,4 @@ extern std::string srs_string_remove(std::string str, std::string remove_chars); | @@ -60,3 +60,4 @@ extern std::string srs_string_remove(std::string str, std::string remove_chars); | ||
| 60 | extern bool srs_string_ends_with(std::string str, std::string flag); | 60 | extern bool srs_string_ends_with(std::string str, std::string flag); |
| 61 | 61 | ||
| 62 | #endif | 62 | #endif |
| 63 | + |
-
请 注册 或 登录 后发表评论