FS-11549: RTCP: fix report block stats

(thanks Sergey Hripchenko)
This commit is contained in:
Dragos Oancea 2019-02-07 23:18:02 +00:00 committed by Andrey Volk
parent 5b9d0244c5
commit 385769344b

View File

@ -2176,6 +2176,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
rtcp_bytes += sizeof(struct switch_rtcp_report_block); rtcp_bytes += sizeof(struct switch_rtcp_report_block);
rtcp_generate_report_block(rtp_session, rtcp_report_block, nack_dup); rtcp_generate_report_block(rtp_session, rtcp_report_block, nack_dup);
rtp_session->rtcp_send_msg.header.count = 1; /* reception report block count */ rtp_session->rtcp_send_msg.header.count = 1; /* reception report block count */
stats->sent_pkt_count = 0;
} }
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_NOTICE, "Sending RTCP SR (ssrc=%u)\n", rtp_session->ssrc); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_NOTICE, "Sending RTCP SR (ssrc=%u)\n", rtp_session->ssrc);
} }
@ -2355,12 +2356,12 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
rtcp_bytes += sdes_bytes; rtcp_bytes += sdes_bytes;
/* Prepare next report */ /* Prepare next report */
if (rtp_session->rtcp_send_msg.header.count) {
stats->last_rpt_cycle = stats->cycle; stats->last_rpt_cycle = stats->cycle;
stats->last_rpt_ext_seq = stats->high_ext_seq_recv; stats->last_rpt_ext_seq = stats->high_ext_seq_recv;
stats->last_rpt_ts = rtp_session->write_timer.samplecount; stats->last_rpt_ts = rtp_session->write_timer.samplecount;
stats->period_pkt_count = 0; stats->period_pkt_count = 0;
stats->sent_pkt_count = 0; }