mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-08-02 19:55:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpmanager: rtpsession: don't send empty RTCP packets

Browse source 
generate_rtcp can produce empty packets when reduced size RTCP is turned on.
Skip them since it doesn't make sense to push them and they cause errors with
elements that expect RTCP packets to contain data (like srtpenc).
This commit is contained in:
Alessandro Decina 2015-11-25 14:51:40 +11:00
parent 2dbc9f86fc
commit dd4df554d5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/rtpmanager/rtpsession.c
View file

@ -4026,7 +4026,7 @@ done:
/* push out the RTCP packets */
while ((output = g_queue_pop_head (&data.output))) {
gboolean do_not_suppress;
gboolean do_not_suppress, empty_buffer;
GstBuffer *buffer = output->buffer;
RTPSource *source = output->source;
@ -4034,7 +4034,10 @@ done:
g_signal_emit (sess, rtp_session_signals[SIGNAL_ON_SENDING_RTCP], 0,
buffer, data.is_early, &do_not_suppress);
if (sess->callbacks.send_rtcp && (do_not_suppress || !data.may_suppress)) {
empty_buffer = gst_buffer_get_size (buffer) == 0;
if (sess->callbacks.send_rtcp &&
!empty_buffer && (do_not_suppress || !data.may_suppress)) {
guint packet_size;
packet_size = gst_buffer_get_size (buffer) + sess->header_len;
@ -4052,9 +4055,11 @@ done:
RTP_SESSION_UNLOCK (sess);
} else {
GST_DEBUG ("freeing packet callback: %p"
" empty_buffer: %d, "
" do_not_suppress: %d may_suppress: %d", sess->callbacks.send_rtcp,
do_not_suppress, data.may_suppress);
sess->stats.nacks_dropped += data.nacked_seqnums;
empty_buffer, do_not_suppress, data.may_suppress);
if (!empty_buffer)
sess->stats.nacks_dropped += data.nacked_seqnums;
gst_buffer_unref (buffer);
}
g_object_unref (source);