mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiopayload: use ptime-multiple

Browse source 
Based on patch by Olivier Crête <olivier.crete@collabora.co.uk>

Fixes #613248
This commit is contained in:
Olivier Crête 2010-03-26 19:00:47 -04:00 committed by Wim Taymans
parent 1fa171d396
commit 66cc2faba7
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/rtp/gstbasertpaudiopayload.c
View file

@ -110,6 +110,8 @@ struct _GstBaseRTPAudioPayloadPrivate
guint cached_ptime; guint cached_ptime;
guint cached_min_length; guint cached_min_length;
guint cached_max_length; guint cached_max_length;
guint cached_ptime_multiple;
guint cached_align;
gboolean buffer_list; gboolean buffer_list;
}; };
@ -637,6 +639,7 @@ gst_base_rtp_audio_payload_get_lengths (GstBaseRTPPayload *
guint max_mtu, mtu; guint max_mtu, mtu;
guint maxptime_octets; guint maxptime_octets;
guint minptime_octets; guint minptime_octets;
guint ptime_mult_octets;
payload = GST_BASE_RTP_AUDIO_PAYLOAD_CAST (basepayload); payload = GST_BASE_RTP_AUDIO_PAYLOAD_CAST (basepayload);
priv = payload->priv; priv = payload->priv;
@ -644,21 +647,26 @@ gst_base_rtp_audio_payload_get_lengths (GstBaseRTPPayload *
if (priv->align == 0) if (priv->align == 0)
return FALSE; return FALSE;
*align = priv->align;
mtu = GST_BASE_RTP_PAYLOAD_MTU (payload); mtu = GST_BASE_RTP_PAYLOAD_MTU (payload);
/* check cached values */ /* check cached values */
if (G_LIKELY (priv->cached_mtu == mtu if (G_LIKELY (priv->cached_mtu == mtu
&& priv->cached_ptime_multiple ==
basepayload->abidata.ABI.ptime_multiple
&& priv->cached_ptime == basepayload->abidata.ABI.ptime && priv->cached_ptime == basepayload->abidata.ABI.ptime
&& priv->cached_max_ptime == basepayload->max_ptime && priv->cached_max_ptime == basepayload->max_ptime
&& priv->cached_min_ptime == basepayload->min_ptime)) { && priv->cached_min_ptime == basepayload->min_ptime)) {
/* if nothing changed, return cached values */ /* if nothing changed, return cached values */
*min_payload_len = priv->cached_min_length; *min_payload_len = priv->cached_min_length;
*max_payload_len = priv->cached_max_length; *max_payload_len = priv->cached_max_length;
*align = priv->cached_align;
return TRUE; return TRUE;
} }
ptime_mult_octets = priv->time_to_bytes (payload,
basepayload->abidata.ABI.ptime_multiple);
*align = ALIGN_DOWN (MAX (priv->align, ptime_mult_octets), priv->align);
/* ptime max */ /* ptime max */
if (basepayload->max_ptime != -1) { if (basepayload->max_ptime != -1) {
maxptime_octets = priv->time_to_bytes (payload, basepayload->max_ptime); maxptime_octets = priv->time_to_bytes (payload, basepayload->max_ptime);
@ -698,8 +706,10 @@ gst_base_rtp_audio_payload_get_lengths (GstBaseRTPPayload *
priv->cached_ptime = basepayload->abidata.ABI.ptime; priv->cached_ptime = basepayload->abidata.ABI.ptime;
priv->cached_min_ptime = basepayload->min_ptime; priv->cached_min_ptime = basepayload->min_ptime;
priv->cached_max_ptime = basepayload->max_ptime; priv->cached_max_ptime = basepayload->max_ptime;
priv->cached_ptime_multiple = basepayload->abidata.ABI.ptime_multiple;
priv->cached_min_length = *min_payload_len; priv->cached_min_length = *min_payload_len;
priv->cached_max_length = *max_payload_len; priv->cached_max_length = *max_payload_len;
priv->cached_align = *align;
return TRUE; return TRUE;
} }
@ -849,7 +859,8 @@ gst_base_rtp_audio_payload_handle_buffer (GstBaseRTPPayload *
GST_DEBUG_OBJECT (payload, "got buffer size %u, available %u", GST_DEBUG_OBJECT (payload, "got buffer size %u, available %u",
size, available); size, available);
if (available == 0 && (size >= min_payload_len && size <= max_payload_len)) { if (available == 0 && (size >= min_payload_len && size <= max_payload_len) &&
(size % align == 0)) {
/* If buffer fits on an RTP packet, let's just push it through /* If buffer fits on an RTP packet, let's just push it through
* this will check against max_ptime and max_mtu */ * this will check against max_ptime and max_mtu */
GST_DEBUG_OBJECT (payload, "Fast packet push"); GST_DEBUG_OBJECT (payload, "Fast packet push");