basesink: Always render prepared buffer

Currently, if prepare() takes too much time, we skip the call to render().
The side effect of this, is that we endup starving the render(). The solution
in this patch is to always render frames that are on time before prepare() is
executed. This will maximize the number of frames we display and smoothly
degrade the rendering performance.

https://bugzilla.gnome.org/show_bug.cgi?id=729335
This commit is contained in:
Nicolas Dufresne 2014-05-01 10:37:18 -04:00
parent 58a574e523
commit 3895e431bd

View file

@ -3273,7 +3273,7 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
GstSegment *segment; GstSegment *segment;
GstBuffer *sync_buf; GstBuffer *sync_buf;
gint do_qos; gint do_qos;
gboolean late, step_end; gboolean late, step_end, prepared = FALSE;
if (G_UNLIKELY (basesink->flushing)) if (G_UNLIKELY (basesink->flushing))
goto flushing; goto flushing;
@ -3347,11 +3347,15 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
gst_base_sink_get_sync_times (basesink, obj, &sstart, &sstop, &rstart, gst_base_sink_get_sync_times (basesink, obj, &sstart, &sstop, &rstart,
&rstop, &rnext, &do_sync, &stepped, current, &step_end); &rstop, &rnext, &do_sync, &stepped, current, &step_end);
if (!stepped && syncable && do_sync) if (G_UNLIKELY (stepped))
goto dropped;
if (syncable && do_sync)
late = late =
gst_base_sink_is_too_late (basesink, obj, rstart, rstop, gst_base_sink_is_too_late (basesink, obj, rstart, rstop,
GST_CLOCK_EARLY, 0, FALSE); GST_CLOCK_EARLY, 0, FALSE);
if (late)
if (G_UNLIKELY (late))
goto dropped; goto dropped;
if (!is_list) { if (!is_list) {
@ -3367,6 +3371,8 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
goto prepare_failed; goto prepare_failed;
} }
} }
prepared = TRUE;
} }
again: again:
@ -3380,6 +3386,9 @@ again:
if (G_UNLIKELY (ret != GST_FLOW_OK)) if (G_UNLIKELY (ret != GST_FLOW_OK))
goto sync_failed; goto sync_failed;
/* Don't skip if prepare() was called on time */
late = late && !prepared;
/* drop late buffers unconditionally, let's hope it's unlikely */ /* drop late buffers unconditionally, let's hope it's unlikely */
if (G_UNLIKELY (late)) if (G_UNLIKELY (late))
goto dropped; goto dropped;