mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-04 22:48:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpbin: avoid generating errors when rtcp messages are empty and check the queue is not empty

Browse source 
Add a check to verify all the output buffers were empty for the
session in a timout and log an error.

https://bugzilla.gnome.org/show_bug.cgi?id=773269
This commit is contained in:
Alejandro G. Castro 2016-10-20 13:14:13 +02:00 committed by Sebastian Dröge
parent eeea2a7fe8
commit 6e7816c589
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/rtpmanager/rtpsession.c
View file

@ -3968,6 +3968,7 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
ReportData data = { GST_RTCP_BUFFER_INIT };
GHashTable *table_copy;
ReportOutput *output;
gboolean all_empty = FALSE;
g_return_val_if_fail (RTP_IS_SESSION (sess), GST_FLOW_ERROR);
@ -4031,6 +4032,9 @@ rtp_session_on_timeout (RTPSession * sess, GstClockTime current_time,
if (!is_rtcp_time (sess, current_time, &data))
goto done;
/* check if all the buffers are empty afer generation */
all_empty = TRUE;
GST_DEBUG
("doing RTCP generation %u for %u sources, early %d, may suppress %d",
sess->generation, data.num_to_report, data.is_early, data.may_suppress);
@ -4081,8 +4085,8 @@ done:
empty_buffer = gst_buffer_get_size (buffer) == 0;
if (empty_buffer)
GST_ERROR ("rtpsession: Trying to send an empty RTCP packet");
if (!empty_buffer)
all_empty = FALSE;
if (sess->callbacks.send_rtcp &&
!empty_buffer && (do_not_suppress || !data.may_suppress)) {
@ -4116,6 +4120,10 @@ done:
g_object_unref (source);
g_slice_free (ReportOutput, output);
}
if (all_empty)
GST_ERROR ("generated empty RTCP messages for all the sources");
return result;
}