正在显示
2 个修改的文件
包含
2 行增加
和
10 行删除
@@ -1164,14 +1164,6 @@ void SrsHls::dispose() | @@ -1164,14 +1164,6 @@ void SrsHls::dispose() | ||
1164 | on_unpublish(); | 1164 | on_unpublish(); |
1165 | } | 1165 | } |
1166 | 1166 | ||
1167 | - // only dispose hls when positive. | ||
1168 | - if (_req) { | ||
1169 | - int hls_dispose = _srs_config->get_hls_dispose(_req->vhost); | ||
1170 | - if (hls_dispose <= 0) { | ||
1171 | - return; | ||
1172 | - } | ||
1173 | - } | ||
1174 | - | ||
1175 | muxer->dispose(); | 1167 | muxer->dispose(); |
1176 | } | 1168 | } |
1177 | 1169 |
@@ -1472,7 +1472,7 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio) | @@ -1472,7 +1472,7 @@ int SrsSource::on_audio(SrsCommonMessage* shared_audio) | ||
1472 | if (!mix_correct && is_monotonically_increase) { | 1472 | if (!mix_correct && is_monotonically_increase) { |
1473 | if (last_packet_time > 0 && shared_audio->header.timestamp < last_packet_time) { | 1473 | if (last_packet_time > 0 && shared_audio->header.timestamp < last_packet_time) { |
1474 | is_monotonically_increase = false; | 1474 | is_monotonically_increase = false; |
1475 | - srs_warn("stream not monotonically increase, please open mix_correct."); | 1475 | + srs_warn("AUTIO: stream not monotonically increase, please open mix_correct."); |
1476 | } | 1476 | } |
1477 | } | 1477 | } |
1478 | last_packet_time = shared_audio->header.timestamp; | 1478 | last_packet_time = shared_audio->header.timestamp; |
@@ -1663,7 +1663,7 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) | @@ -1663,7 +1663,7 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) | ||
1663 | if (!mix_correct && is_monotonically_increase) { | 1663 | if (!mix_correct && is_monotonically_increase) { |
1664 | if (last_packet_time > 0 && shared_video->header.timestamp < last_packet_time) { | 1664 | if (last_packet_time > 0 && shared_video->header.timestamp < last_packet_time) { |
1665 | is_monotonically_increase = false; | 1665 | is_monotonically_increase = false; |
1666 | - srs_warn("stream not monotonically increase, please open mix_correct."); | 1666 | + srs_warn("VIDEO: stream not monotonically increase, please open mix_correct."); |
1667 | } | 1667 | } |
1668 | } | 1668 | } |
1669 | last_packet_time = shared_video->header.timestamp; | 1669 | last_packet_time = shared_video->header.timestamp; |
-
请 注册 或 登录 后发表评论