mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:56:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsource: refactor receiver stats update

Browse source
This commit is contained in:
Wim Taymans 2013-11-07 16:13:16 +01:00
parent 33ebda8ecf
commit 268a75e705
1 changed files with 47 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
gst/rtpmanager/rtpsource.c
View file

@ -977,26 +977,13 @@ do_bitrate_estimation (RTPSource * src, GstClockTime running_time,
} }
} }
/** static gboolean
* rtp_source_process_rtp: update_receiver_stats (RTPSource * src, RTPPacketInfo * pinfo)
* @src: an #RTPSource
* @pinfo: an #RTPPacketInfo
*
* Let @src handle the incomming RTP packet described in @pinfo.
*
* Returns: a #GstFlowReturn.
*/
GstFlowReturn
rtp_source_process_rtp (RTPSource * src, RTPPacketInfo * pinfo)
{ {
GstFlowReturn result = GST_FLOW_OK;
guint16 seqnr, udelta; guint16 seqnr, udelta;
RTPSourceStats *stats; RTPSourceStats *stats;
guint16 expected; guint16 expected;
g_return_val_if_fail (RTP_IS_SOURCE (src), GST_FLOW_ERROR);
g_return_val_if_fail (pinfo != NULL, GST_FLOW_ERROR);
stats = &src->stats; stats = &src->stats;
seqnr = pinfo->seqnum; seqnr = pinfo->seqnum;
@ -1071,15 +1058,57 @@ rtp_source_process_rtp (RTPSource * src, RTPPacketInfo * pinfo)
src->stats.packets_received++; src->stats.packets_received++;
/* for the bitrate estimation */ /* for the bitrate estimation */
src->bytes_received += pinfo->payload_len; src->bytes_received += pinfo->payload_len;
GST_LOG ("seq %d, PC: %" G_GUINT64_FORMAT ", OC: %" G_GUINT64_FORMAT,
seqnr, src->stats.packets_received, src->stats.octets_received);
return TRUE;
/* ERRORS */
done:
{
return FALSE;
}
bad_sequence:
{
GST_WARNING ("unacceptable seqnum received");
return FALSE;
}
probation_seqnum:
{
GST_WARNING ("probation: seqnr %d != expected %d", seqnr, expected);
src->curr_probation = src->probation;
src->stats.max_seq = seqnr;
return FALSE;
}
}
/**
* rtp_source_process_rtp:
* @src: an #RTPSource
* @pinfo: an #RTPPacketInfo
*
* Let @src handle the incomming RTP packet described in @pinfo.
*
* Returns: a #GstFlowReturn.
*/
GstFlowReturn
rtp_source_process_rtp (RTPSource * src, RTPPacketInfo * pinfo)
{
GstFlowReturn result;
g_return_val_if_fail (RTP_IS_SOURCE (src), GST_FLOW_ERROR);
g_return_val_if_fail (pinfo != NULL, GST_FLOW_ERROR);
if (!update_receiver_stats (src, pinfo))
return GST_FLOW_OK;
/* the source that sent the packet must be a sender */ /* the source that sent the packet must be a sender */
src->is_sender = TRUE; src->is_sender = TRUE;
src->validated = TRUE; src->validated = TRUE;
do_bitrate_estimation (src, pinfo->running_time, &src->bytes_received); do_bitrate_estimation (src, pinfo->running_time, &src->bytes_received);
GST_LOG ("seq %d, PC: %" G_GUINT64_FORMAT ", OC: %" G_GUINT64_FORMAT,
seqnr, src->stats.packets_received, src->stats.octets_received);
/* calculate jitter for the stats */ /* calculate jitter for the stats */
calculate_jitter (src, pinfo); calculate_jitter (src, pinfo);
@ -1087,22 +1116,7 @@ rtp_source_process_rtp (RTPSource * src, RTPPacketInfo * pinfo)
result = push_packet (src, pinfo->data); result = push_packet (src, pinfo->data);
pinfo->data = NULL; pinfo->data = NULL;
done:
return result; return result;
/* ERRORS */
bad_sequence:
{
GST_WARNING ("unacceptable seqnum received");
return GST_FLOW_OK;
}
probation_seqnum:
{
GST_WARNING ("probation: seqnr %d != expected %d", seqnr, expected);
src->curr_probation = src->probation;
src->stats.max_seq = seqnr;
return GST_FLOW_OK;
}
} }
/** /**