mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsession: Only send EOS if all sources have been marked bye

Browse source 
Now that multiple sender RTPSource can share the same RTPSession, we
must not send an EOS unless they're all marked bye.
This commit is contained in:
Olivier Crête 2017-07-04 12:24:41 -04:00
parent 0444342c05
commit 7e7e52caa0
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/rtpmanager/rtpsession.c
View file

@ -3950,6 +3950,21 @@ update_generation (const gchar * key, RTPSource * source, ReportData * data)
} }
} }
static gboolean
rtp_session_are_all_sources_bye (RTPSession * sess)
{
GHashTableIter iter;
RTPSource *src;
g_hash_table_iter_init (&iter, sess->ssrcs[sess->mask_idx]);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) & src)) {
if (!src->marked_bye)
return FALSE;
}
return TRUE;
}
/** /**
* rtp_session_on_timeout: * rtp_session_on_timeout:
* @sess: an #RTPSession * @sess: an #RTPSession
@ -4106,8 +4121,8 @@ done:
GST_DEBUG ("%p, sending RTCP packet, avg size %u, %u", &sess->stats, GST_DEBUG ("%p, sending RTCP packet, avg size %u, %u", &sess->stats,
sess->stats.avg_rtcp_packet_size, packet_size); sess->stats.avg_rtcp_packet_size, packet_size);
result = result =
sess->callbacks.send_rtcp (sess, source, buffer, output->is_bye, sess->callbacks.send_rtcp (sess, source, buffer,
sess->send_rtcp_user_data); rtp_session_are_all_sources_bye (sess), sess->send_rtcp_user_data);
RTP_SESSION_LOCK (sess); RTP_SESSION_LOCK (sess);
sess->stats.nacks_sent += data.nacked_seqnums; sess->stats.nacks_sent += data.nacked_seqnums;