session: move check for is_early around

Move the check for the early RTCP to where it is needed and used.
This commit is contained in:
Wim Taymans 2013-07-25 22:39:04 +02:00
parent b069db6a2e
commit a3bf374351

View file

@ -2939,6 +2939,11 @@ is_rtcp_time (RTPSession * sess, GstClockTime current_time, ReportData * data)
{
GstClockTime new_send_time, elapsed;
if (GST_CLOCK_TIME_IS_VALID (sess->next_early_rtcp_time))
data->is_early = TRUE;
else
data->is_early = FALSE;
if (data->is_early && sess->next_early_rtcp_time < current_time)
goto early;
@ -3087,11 +3092,6 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
g_hash_table_foreach_remove (sess->ssrcs[sess->mask_idx],
(GHRFunc) remove_closing_sources, NULL);
if (GST_CLOCK_TIME_IS_VALID (sess->next_early_rtcp_time))
data.is_early = TRUE;
else
data.is_early = FALSE;
/* see if we need to generate SR or RR packets */
if (is_rtcp_time (sess, current_time, &data)) {
if (own->marked_bye) {