mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-05 15:08:53 +00:00
rtprtxqueue: implement handling of the max-size-time property
https://bugzilla.gnome.org/show_bug.cgi?id=780867
This commit is contained in:
parent
6337f133c0
commit
7f6c783930
2 changed files with 68 additions and 1 deletions
|
@ -101,6 +101,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||||
|
|
||||||
static gboolean gst_rtp_rtx_queue_src_event (GstPad * pad, GstObject * parent,
|
static gboolean gst_rtp_rtx_queue_src_event (GstPad * pad, GstObject * parent,
|
||||||
GstEvent * event);
|
GstEvent * event);
|
||||||
|
static gboolean gst_rtp_rtx_queue_sink_event (GstPad * pad, GstObject * parent,
|
||||||
|
GstEvent * event);
|
||||||
static GstFlowReturn gst_rtp_rtx_queue_chain (GstPad * pad, GstObject * parent,
|
static GstFlowReturn gst_rtp_rtx_queue_chain (GstPad * pad, GstObject * parent,
|
||||||
GstBuffer * buffer);
|
GstBuffer * buffer);
|
||||||
static GstFlowReturn gst_rtp_rtx_queue_chain_list (GstPad * pad,
|
static GstFlowReturn gst_rtp_rtx_queue_chain_list (GstPad * pad,
|
||||||
|
@ -208,6 +210,8 @@ gst_rtp_rtx_queue_init (GstRTPRtxQueue * rtx)
|
||||||
"sink"), "sink");
|
"sink"), "sink");
|
||||||
GST_PAD_SET_PROXY_CAPS (rtx->sinkpad);
|
GST_PAD_SET_PROXY_CAPS (rtx->sinkpad);
|
||||||
GST_PAD_SET_PROXY_ALLOCATION (rtx->sinkpad);
|
GST_PAD_SET_PROXY_ALLOCATION (rtx->sinkpad);
|
||||||
|
gst_pad_set_event_function (rtx->sinkpad,
|
||||||
|
GST_DEBUG_FUNCPTR (gst_rtp_rtx_queue_sink_event));
|
||||||
gst_pad_set_chain_function (rtx->sinkpad,
|
gst_pad_set_chain_function (rtx->sinkpad,
|
||||||
GST_DEBUG_FUNCPTR (gst_rtp_rtx_queue_chain));
|
GST_DEBUG_FUNCPTR (gst_rtp_rtx_queue_chain));
|
||||||
gst_pad_set_chain_list_function (rtx->sinkpad,
|
gst_pad_set_chain_list_function (rtx->sinkpad,
|
||||||
|
@ -238,7 +242,8 @@ push_seqnum (GstBuffer * buffer, RTXData * data)
|
||||||
if (data->found)
|
if (data->found)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtpbuffer))
|
if (!GST_IS_BUFFER (buffer) ||
|
||||||
|
!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtpbuffer))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
seqnum = gst_rtp_buffer_get_seq (&rtpbuffer);
|
seqnum = gst_rtp_buffer_get_seq (&rtpbuffer);
|
||||||
|
@ -294,6 +299,29 @@ gst_rtp_rtx_queue_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
gst_rtp_rtx_queue_sink_event (GstPad * pad, GstObject * parent,
|
||||||
|
GstEvent * event)
|
||||||
|
{
|
||||||
|
GstRTPRtxQueue *rtx = GST_RTP_RTX_QUEUE (parent);
|
||||||
|
gboolean res;
|
||||||
|
|
||||||
|
switch (GST_EVENT_TYPE (event)) {
|
||||||
|
case GST_EVENT_SEGMENT:
|
||||||
|
{
|
||||||
|
g_mutex_lock (&rtx->lock);
|
||||||
|
gst_event_copy_segment (event, &rtx->head_segment);
|
||||||
|
g_queue_push_head (rtx->queue, gst_event_ref (event));
|
||||||
|
g_mutex_unlock (&rtx->lock);
|
||||||
|
/* fall through */
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
res = gst_pad_event_default (pad, parent, event);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
do_push (GstBuffer * buffer, GstRTPRtxQueue * rtx)
|
do_push (GstBuffer * buffer, GstRTPRtxQueue * rtx)
|
||||||
{
|
{
|
||||||
|
@ -301,6 +329,38 @@ do_push (GstBuffer * buffer, GstRTPRtxQueue * rtx)
|
||||||
gst_pad_push (rtx->srcpad, buffer);
|
gst_pad_push (rtx->srcpad, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static guint32
|
||||||
|
get_ts_diff (GstRTPRtxQueue * rtx)
|
||||||
|
{
|
||||||
|
GstClockTime high_ts, low_ts;
|
||||||
|
GstClockTimeDiff result;
|
||||||
|
GstBuffer *high_buf, *low_buf;
|
||||||
|
|
||||||
|
high_buf = g_queue_peek_head (rtx->queue);
|
||||||
|
|
||||||
|
while (GST_IS_EVENT ((low_buf = g_queue_peek_tail (rtx->queue)))) {
|
||||||
|
GstEvent *event = g_queue_pop_tail (rtx->queue);
|
||||||
|
gst_event_copy_segment (event, &rtx->tail_segment);
|
||||||
|
gst_event_unref (event);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!high_buf || !low_buf || high_buf == low_buf)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
high_ts = GST_BUFFER_TIMESTAMP (high_buf);
|
||||||
|
low_ts = GST_BUFFER_TIMESTAMP (low_buf);
|
||||||
|
|
||||||
|
high_ts = gst_segment_to_running_time (&rtx->head_segment, GST_FORMAT_TIME,
|
||||||
|
high_ts);
|
||||||
|
low_ts = gst_segment_to_running_time (&rtx->tail_segment, GST_FORMAT_TIME,
|
||||||
|
low_ts);
|
||||||
|
|
||||||
|
result = high_ts - low_ts;
|
||||||
|
|
||||||
|
/* return value in ms instead of ns */
|
||||||
|
return (guint32) gst_util_uint64_scale_int (result, 1, GST_MSECOND);
|
||||||
|
}
|
||||||
|
|
||||||
/* Must be called with rtx->lock */
|
/* Must be called with rtx->lock */
|
||||||
static void
|
static void
|
||||||
shrink_queue (GstRTPRtxQueue * rtx)
|
shrink_queue (GstRTPRtxQueue * rtx)
|
||||||
|
@ -309,6 +369,10 @@ shrink_queue (GstRTPRtxQueue * rtx)
|
||||||
while (g_queue_get_length (rtx->queue) > rtx->max_size_packets)
|
while (g_queue_get_length (rtx->queue) > rtx->max_size_packets)
|
||||||
gst_buffer_unref (g_queue_pop_tail (rtx->queue));
|
gst_buffer_unref (g_queue_pop_tail (rtx->queue));
|
||||||
}
|
}
|
||||||
|
if (rtx->max_size_time) {
|
||||||
|
while (get_ts_diff (rtx) > rtx->max_size_time)
|
||||||
|
gst_buffer_unref (g_queue_pop_tail (rtx->queue));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstFlowReturn
|
static GstFlowReturn
|
||||||
|
|
|
@ -59,6 +59,9 @@ struct _GstRTPRtxQueue
|
||||||
guint max_size_time;
|
guint max_size_time;
|
||||||
guint max_size_packets;
|
guint max_size_packets;
|
||||||
|
|
||||||
|
GstSegment head_segment;
|
||||||
|
GstSegment tail_segment;
|
||||||
|
|
||||||
/* Statistics */
|
/* Statistics */
|
||||||
guint n_requests;
|
guint n_requests;
|
||||||
guint n_fulfilled_requests;
|
guint n_fulfilled_requests;
|
||||||
|
|
Loading…
Reference in a new issue