Fix WHIP source state with transcoding bug. v6.0.179 (#4495)
This commit is contained in:
parent
f22a5db38a
commit
31c0ff8815
|
|
@ -665,9 +665,6 @@ void SrsRtcSource::on_unpublish()
|
||||||
|
|
||||||
srs_trace("cleanup when unpublish, created=%u, deliver=%u", is_created_, is_delivering_packets_);
|
srs_trace("cleanup when unpublish, created=%u, deliver=%u", is_created_, is_delivering_packets_);
|
||||||
|
|
||||||
is_created_ = false;
|
|
||||||
is_delivering_packets_ = false;
|
|
||||||
|
|
||||||
if (!_source_id.empty()) {
|
if (!_source_id.empty()) {
|
||||||
_pre_source_id = _source_id;
|
_pre_source_id = _source_id;
|
||||||
}
|
}
|
||||||
|
|
@ -701,6 +698,9 @@ void SrsRtcSource::on_unpublish()
|
||||||
if (consumers.empty()) {
|
if (consumers.empty()) {
|
||||||
stream_die_at_ = srs_get_system_time();
|
stream_die_at_ = srs_get_system_time();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_created_ = false;
|
||||||
|
is_delivering_packets_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SrsRtcSource::subscribe(ISrsRtcSourceEventHandler* h)
|
void SrsRtcSource::subscribe(ISrsRtcSourceEventHandler* h)
|
||||||
|
|
|
||||||
|
|
@ -1073,8 +1073,6 @@ void SrsSrtSource::on_unpublish()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
can_publish_ = true;
|
|
||||||
|
|
||||||
SrsStatistic* stat = SrsStatistic::instance();
|
SrsStatistic* stat = SrsStatistic::instance();
|
||||||
stat->on_stream_close(req);
|
stat->on_stream_close(req);
|
||||||
|
|
||||||
|
|
@ -1090,6 +1088,8 @@ void SrsSrtSource::on_unpublish()
|
||||||
if (consumers.empty()) {
|
if (consumers.empty()) {
|
||||||
stream_die_at_ = srs_get_system_time();
|
stream_die_at_ = srs_get_system_time();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
can_publish_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)
|
srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)
|
||||||
|
|
|
||||||
|
|
@ -233,6 +233,7 @@ void SrsFastCoroutine::stop()
|
||||||
}
|
}
|
||||||
disposed = true;
|
disposed = true;
|
||||||
stopping_ = true;
|
stopping_ = true;
|
||||||
|
stopping_cid_ = _srs_context->get_id();
|
||||||
|
|
||||||
interrupt();
|
interrupt();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user