RTC: Refine PLI request log.

pull/1969/head
jinxue.cgh 4 years ago committed by winlin
parent 1a33452e95
commit 2b47b42213

@ -342,6 +342,7 @@ srs_error_t SrsRtcPLIWorker::cycle()
return srs_error_wrap(err, "quit");
}
while (!plis_.empty()) {
std::map<uint32_t, SrsContextId> plis;
plis.swap(plis_);
@ -354,7 +355,7 @@ srs_error_t SrsRtcPLIWorker::cycle()
srs_error_reset(err);
}
}
}
srs_cond_wait(wait_);
}
@ -1406,12 +1407,8 @@ srs_error_t SrsRtcPublishStream::on_rtcp_xr(SrsRtcpXr* rtcp)
void SrsRtcPublishStream::request_keyframe(uint32_t ssrc)
{
pli_worker_->request_keyframe(ssrc, _srs_context->get_id());
}
srs_error_t SrsRtcPublishStream::do_request_keyframe(uint32_t ssrc, SrsContextId sub_cid)
{
srs_error_t err = srs_success;
SrsContextId sub_cid = _srs_context->get_id();
pli_worker_->request_keyframe(ssrc, sub_cid);
uint32_t nn = 0;
if (pli_epp->can_print(ssrc, &nn)) {
@ -1419,7 +1416,11 @@ srs_error_t SrsRtcPublishStream::do_request_keyframe(uint32_t ssrc, SrsContextId
srs_trace("RTC: Need PLI ssrc=%u, play=[%s], publish=[%s], count=%u/%u", ssrc, sub_cid.c_str(),
cid_.c_str(), nn, pli_epp->nn_count);
}
}
srs_error_t SrsRtcPublishStream::do_request_keyframe(uint32_t ssrc, SrsContextId sub_cid)
{
srs_error_t err = srs_success;
if ((err = session_->send_rtcp_fb_pli(ssrc, sub_cid)) != srs_success) {
srs_warn("PLI err %s", srs_error_desc(err).c_str());
srs_freep(err);

Loading…
Cancel
Save