mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-03 22:59:56 +00:00
Code Issues1 Projects Releases Wiki Activity

Improve and fix LATENCY query handling

Browse source 
This now follows the design docs everywhere, especially the maximum latency
handling.

https://bugzilla.gnome.org/show_bug.cgi?id=744106
This commit is contained in:
Sebastian Dröge 2015-02-11 14:16:21 +01:00
parent 629b350806
commit 037928dcf6
10 changed files with 71 additions and 53 deletions

3
ext/opus/gstopusdec.c
View file

@ -181,6 +181,9 @@ gst_opus_dec_start (GstAudioDecoder * dec)
gst_audio_decoder_set_plc_aware (dec, TRUE);
if (odec->use_inband_fec) {
/* FIXME: Is our maximum latency really 120ms, i.e. are we going
* to buffer up to 120ms?
*/
gst_audio_decoder_set_latency (dec, 2 * GST_MSECOND + GST_MSECOND / 2,
120 * GST_MSECOND);
}

3
ext/resindvd/rsninputselector.c
View file

@ -1560,8 +1560,7 @@ gst_input_selector_query (GstPad * pad, GstObject * parent, GstQuery * query)
resmax = max;
else if (max < resmax)
resmax = max;
if (reslive == FALSE)
reslive = live;
reslive = TRUE;
}
}
}

35
ext/x265/gstx265enc.c
View file

@ -824,27 +824,32 @@ static void
gst_x265_enc_set_latency (GstX265Enc * encoder)
{
GstVideoInfo *info = &encoder->input_state->info;
gint max_delayed_frames;
GstClockTime latency;
/* FIXME get a real value from the encoder, this is currently not exposed */
if (encoder->tune > 0 && encoder->tune <= G_N_ELEMENTS (x265_tune_names) &&
strcmp (x265_tune_names[encoder->tune + 1], "zerolatency") == 0)
max_delayed_frames = 0;
else
max_delayed_frames = 5;
if (info->fps_n) {
GstClockTime latency;
gint max_delayed_frames;
// FIXME get a real value from the encoder, this is currently not exposed
max_delayed_frames = 5;
latency = gst_util_uint64_scale_ceil (GST_SECOND * info->fps_d,
max_delayed_frames, info->fps_n);
GST_INFO_OBJECT (encoder,
"Updating latency to %" GST_TIME_FORMAT " (%d frames)",
GST_TIME_ARGS (latency), max_delayed_frames);
gst_video_encoder_set_latency (GST_VIDEO_ENCODER (encoder), latency,
latency);
} else {
/* We can't do live as we don't know our latency */
gst_video_encoder_set_latency (GST_VIDEO_ENCODER (encoder),
0, GST_CLOCK_TIME_NONE);
/* FIXME: Assume 25fps. This is better than reporting no latency at
* all and then later failing in live pipelines
*/
latency = gst_util_uint64_scale_ceil (GST_SECOND * 1,
max_delayed_frames, 25);
}
GST_INFO_OBJECT (encoder,
"Updating latency to %" GST_TIME_FORMAT " (%d frames)",
GST_TIME_ARGS (latency), max_delayed_frames);
gst_video_encoder_set_latency (GST_VIDEO_ENCODER (encoder), latency, latency);
}
static gboolean

30
gst-libs/gst/base/gstaggregator.c
View file

@ -1118,15 +1118,17 @@ gst_aggregator_query_sink_latency_foreach (GstAggregator * self,
GST_LOG_OBJECT (pad, "got latency live:%s min:%" G_GINT64_FORMAT
" max:%" G_GINT64_FORMAT, live ? "true" : "false", min, max);
if (min != GST_CLOCK_TIME_NONE && min > data->min)
data->min = min;
if (live) {
if (min > data->min)
data->min = min;
if (max != GST_CLOCK_TIME_NONE &&
((data->max != GST_CLOCK_TIME_NONE && max < data->max) ||
(data->max == GST_CLOCK_TIME_NONE)))
data->max = max;
if (data->max == GST_CLOCK_TIME_NONE)
data->max = max;
else if (max < data->max)
data->max = max;
data->live |= live;
data->live = TRUE;
}
}
gst_query_unref (query);
@ -1166,8 +1168,8 @@ gst_aggregator_get_latency_unlocked (GstAggregator * self, gboolean * live,
if (GST_CLOCK_TIME_IS_VALID (max)
&& GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
max += self->priv->sub_latency_max;
else if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
max = self->priv->sub_latency_max;
else
max = GST_CLOCK_TIME_NONE;
if (live)
*live = self->priv->latency_live;
@ -1218,8 +1220,8 @@ gst_aggregator_query_latency (GstAggregator * self, GstQuery * query)
if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max)
&& GST_CLOCK_TIME_IS_VALID (data.max))
data.max += self->priv->sub_latency_max;
else if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
data.max = self->priv->sub_latency_max;
else
data.max = GST_CLOCK_TIME_NONE;
if (data.live && data.min > data.max) {
GST_ELEMENT_WARNING (self, CORE, NEGOTIATION,
@ -1593,8 +1595,8 @@ gst_aggregator_set_latency_property (GstAggregator * self, gint64 latency)
if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max)
&& GST_CLOCK_TIME_IS_VALID (max))
max += self->priv->sub_latency_max;
else if (GST_CLOCK_TIME_IS_VALID (self->priv->sub_latency_max))
max = self->priv->sub_latency_max;
else
max = GST_CLOCK_TIME_NONE;
if (GST_CLOCK_TIME_IS_VALID (max) && min > max) {
GST_ELEMENT_WARNING (self, CORE, NEGOTIATION,
@ -1742,7 +1744,7 @@ gst_aggregator_init (GstAggregator * self, GstAggregatorClass * klass)
self->priv->latency_live = FALSE;
self->priv->latency_min = self->priv->sub_latency_min = 0;
self->priv->latency_max = self->priv->sub_latency_max = GST_CLOCK_TIME_NONE;
self->priv->latency_max = self->priv->sub_latency_max = 0;
gst_aggregator_reset_flow_values (self);
self->srcpad = gst_pad_new_from_template (pad_template, "src");

8
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -598,13 +598,15 @@ gst_videoaggregator_src_setcaps (GstVideoAggregator * vagg, GstCaps * caps)
if (vagg->priv->current_caps == NULL ||
gst_caps_is_equal (caps, vagg->priv->current_caps) == FALSE) {
GstClockTime latency;
gst_caps_replace (&vagg->priv->current_caps, caps);
GST_VIDEO_AGGREGATOR_UNLOCK (vagg);
gst_aggregator_set_src_caps (agg, caps);
gst_aggregator_set_latency (agg, gst_util_uint64_scale (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&info), GST_VIDEO_INFO_FPS_N (&info)),
GST_CLOCK_TIME_NONE);
latency = gst_util_uint64_scale (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&info), GST_VIDEO_INFO_FPS_N (&info));
gst_aggregator_set_latency (agg, latency, latency);
GST_VIDEO_AGGREGATOR_LOCK (vagg);
}

5
gst/audiomixer/gstaudiomixer.c
View file

@ -826,7 +826,7 @@ gst_audiomixer_init (GstAudioMixer * audiomixer)
audiomixer->discont_wait = DEFAULT_DISCONT_WAIT;
audiomixer->output_buffer_duration = DEFAULT_OUTPUT_BUFFER_DURATION;
gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer),
audiomixer->output_buffer_duration, GST_CLOCK_TIME_NONE);
audiomixer->output_buffer_duration, audiomixer->output_buffer_duration);
}
static void
@ -877,7 +877,8 @@ gst_audiomixer_set_property (GObject * object, guint prop_id,
case PROP_OUTPUT_BUFFER_DURATION:
audiomixer->output_buffer_duration = g_value_get_uint64 (value);
gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer),
audiomixer->output_buffer_duration, GST_CLOCK_TIME_NONE);
audiomixer->output_buffer_duration,
audiomixer->output_buffer_duration);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);

16
gst/frei0r/gstfrei0rmixer.c
View file

@ -340,15 +340,17 @@ gst_frei0r_mixer_src_query_latency (GstFrei0rMixer * self, GstQuery * query)
if (res) {
gst_query_parse_latency (peerquery, &live_cur, &min_cur, &max_cur);
if (min_cur > min)
min = min_cur;
if (live_cur) {
if (min_cur > min)
min = min_cur;
if (max_cur != GST_CLOCK_TIME_NONE &&
((max != GST_CLOCK_TIME_NONE && max_cur > max) ||
(max == GST_CLOCK_TIME_NONE)))
max = max_cur;
if (max == GST_CLOCK_TIME_NONE)
max = max_cur;
else if (max_cur < max)
max = max_cur;
live = live || live_cur;
live = TRUE;
}
}
gst_query_unref (peerquery);

2
gst/inter/gstinteraudiosrc.c
View file

@ -444,7 +444,7 @@ gst_inter_audio_src_query (GstBaseSrc * src, GstQuery * query)
GstClockTime min_latency, max_latency;
min_latency = interaudiosrc->latency_time;
max_latency = min_latency;
max_latency = interaudiosrc->buffer_time;
GST_DEBUG_OBJECT (src,
"report latency min %" GST_TIME_FORMAT " max %" GST_TIME_FORMAT,

6
gst/liveadder/liveadder.c
View file

@ -755,8 +755,10 @@ gst_live_adder_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
GST_TIME_ARGS (pad_min_latency),
GST_TIME_ARGS (pad_max_latency));
min_latency = MAX (pad_min_latency, min_latency);
max_latency = MIN (pad_max_latency, max_latency);
if (pad_us_live) {
min_latency = MAX (pad_min_latency, min_latency);
max_latency = MIN (pad_max_latency, max_latency);
}
}
}
break;

16
gst/videomeasure/gstvideomeasure_ssim.c
View file

@ -664,15 +664,17 @@ gst_ssim_query_latency (GstSSim * ssim, GstQuery * query)
if (res) {
gst_query_parse_latency (peerquery, &live_cur, &min_cur, &max_cur);
if (min_cur > min)
min = min_cur;
if (live_cur) {
if (min_cur > min)
min = min_cur;
if (max_cur != GST_CLOCK_TIME_NONE &&
((max != GST_CLOCK_TIME_NONE && max_cur > max) ||
(max == GST_CLOCK_TIME_NONE)))
max = max_cur;
if (max == GST_CLOCK_TIME_NONE)
max = max_cur;
else if (max_cur < max)
max = max_cur;
live = live || live_cur;
live = TRUE;
}
}
gst_query_unref (peerquery);