mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: fix draining with less data than min frame size available

Browse source 
baseparse would pass whatever is left in the adapter to the
subclass when draining, even if it's less than the minimum
frame size required. This is bogus, baseparse should just
discard that data then. The original intention of that code
seems to have been that if we have more data available than
the minimum required we should pass all of the data available
and not just the minimum required, which does make sense, so
we'll continue to do that in the case that more data is available.

Fixes assertions in rawvideoparse on EOS after not-negotiated with
fakesrc sizetype=random ! queue ! rawvideoparse format=rgb ! appsink caps=video/x-raw,format=I420

https://bugzilla.gnome.org/show_bug.cgi?id=773666
This commit is contained in:
Tim-Philipp Müller 2016-10-29 11:17:38 +01:00 committed by Sebastian Dröge
parent 287645c2d7
commit 2e278aeb71
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libs/gst/base/gstbaseparse.c
View file

@ -3184,9 +3184,17 @@ gst_base_parse_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
av = gst_adapter_available (parse->priv->adapter);
if (G_UNLIKELY (parse->priv->drain)) {
GST_DEBUG_OBJECT (parse, "draining, data left: %u, min %u", av, min_size);
/* pass all available data to subclass, not just the minimum,
* but never pass less than the minimum required to the subclass */
if (av >= min_size) {
min_size = av;
GST_DEBUG_OBJECT (parse, "draining, data left: %d", min_size);
if (G_UNLIKELY (!min_size)) {
if (G_UNLIKELY (!min_size))
goto done;
} else if (av > 0) {
GST_DEBUG_OBJECT (parse, "draining, but not enough data available, "
"discarding %u bytes", av);
gst_adapter_clear (parse->priv->adapter);
goto done;
}
}