remove the increase timeout for read, for there is no small timeout.
正在显示
1 个修改的文件
包含
0 行增加
和
20 行删除
@@ -1113,20 +1113,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg) | @@ -1113,20 +1113,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg) | ||
1113 | // the cid must not negative. | 1113 | // the cid must not negative. |
1114 | srs_assert(cid >= 0); | 1114 | srs_assert(cid >= 0); |
1115 | 1115 | ||
1116 | - // once we got the chunk message header, | ||
1117 | - // that is there is a real message in cache, | ||
1118 | - // increase the timeout to got it. | ||
1119 | - // For example, in the play loop, we set timeout to 100ms, | ||
1120 | - // when we got a chunk header, we should increase the timeout, | ||
1121 | - // or we maybe timeout and disconnect the client. | ||
1122 | - int64_t timeout_us = skt->get_recv_timeout(); | ||
1123 | - if (!skt->is_never_timeout(timeout_us)) { | ||
1124 | - int64_t pkt_timeout_us = srs_max(timeout_us, SRS_MIN_RECV_TIMEOUT_US); | ||
1125 | - skt->set_recv_timeout(pkt_timeout_us); | ||
1126 | - srs_verbose("change recv timeout_us " | ||
1127 | - "from %"PRId64" to %"PRId64"", timeout_us, pkt_timeout_us); | ||
1128 | - } | ||
1129 | - | ||
1130 | // get the cached chunk stream. | 1116 | // get the cached chunk stream. |
1131 | SrsChunkStream* chunk = NULL; | 1117 | SrsChunkStream* chunk = NULL; |
1132 | 1118 | ||
@@ -1177,12 +1163,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg) | @@ -1177,12 +1163,6 @@ int SrsProtocol::recv_interlaced_message(SrsMessage** pmsg) | ||
1177 | return ret; | 1163 | return ret; |
1178 | } | 1164 | } |
1179 | 1165 | ||
1180 | - // reset the recv timeout | ||
1181 | - if (!skt->is_never_timeout(timeout_us)) { | ||
1182 | - skt->set_recv_timeout(timeout_us); | ||
1183 | - srs_verbose("reset recv timeout_us to %"PRId64"", timeout_us); | ||
1184 | - } | ||
1185 | - | ||
1186 | // not got an entire RTMP message, try next chunk. | 1166 | // not got an entire RTMP message, try next chunk. |
1187 | if (!msg) { | 1167 | if (!msg) { |
1188 | srs_verbose("get partial message success. chunk_payload_size=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", | 1168 | srs_verbose("get partial message success. chunk_payload_size=%d, size=%d, message(type=%d, size=%d, time=%"PRId64", sid=%d)", |
-
请 注册 或 登录 后发表评论