mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseparse: Fix previous commit

Browse source 
Check the correct segment format value.

parse->segment.format is the format we're outputting in,
not the upstream format. Use parse->priv->upstream_format instead,
and make sure it's set in pull mode.
This commit is contained in:
Jan Schmidt 2016-11-16 00:30:26 +11:00
parent d81c0aec81
commit 2e579a7c1b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1711,12 +1711,12 @@ gst_base_parse_convert_default (GstBaseParse * parse,
return TRUE;
}
if (parse->segment.format != GST_FORMAT_BYTES) {
if (parse->priv->upstream_format != GST_FORMAT_BYTES) {
/* don't do byte format conversions if we're not really parsing
* a raw elementary stream, since we don't really have BYTES
* position / duration info */
if (src_format == GST_FORMAT_BYTES || dest_format == GST_FORMAT_BYTES);
goto no_slaved_conversions;
if (src_format == GST_FORMAT_BYTES || dest_format == GST_FORMAT_BYTES)
goto no_slaved_conversions;
}
/* need at least some frames */
@ -3669,6 +3669,8 @@ gst_base_parse_sink_activate (GstPad * sinkpad, GstObject * parent)
goto baseparse_push;
parse->priv->push_stream_start = TRUE;
/* In pull mode, upstream is BYTES */
parse->priv->upstream_format = GST_FORMAT_BYTES;
return gst_pad_start_task (sinkpad, (GstTaskFunction) gst_base_parse_loop,
sinkpad, NULL);
@ -3707,6 +3709,7 @@ gst_base_parse_activate (GstBaseParse * parse, gboolean active)
result = klass->stop (parse);
parse->priv->pad_mode = GST_PAD_MODE_NONE;
parse->priv->upstream_format = GST_FORMAT_UNDEFINED;
}
GST_DEBUG_OBJECT (parse, "activate return: %d", result);
return result;
@ -4064,7 +4067,7 @@ gst_base_parse_src_query_default (GstBaseParse * parse, GstQuery * query)
/* Only reply BYTES if upstream is in BYTES already, otherwise
* we're not in charge */
if (format == GST_FORMAT_BYTES
&& parse->segment.format == GST_FORMAT_BYTES) {
&& parse->priv->upstream_format == GST_FORMAT_BYTES) {
dest_value = parse->priv->offset;
res = TRUE;
} else if (format == parse->segment.format &&
@ -4074,7 +4077,7 @@ gst_base_parse_src_query_default (GstBaseParse * parse, GstQuery * query)
res = TRUE;
}
GST_OBJECT_UNLOCK (parse);
if (!res && parse->segment.format == GST_FORMAT_BYTES) {
if (!res && parse->priv->upstream_format == GST_FORMAT_BYTES) {
/* no precise result, upstream no idea either, then best estimate */
/* priv->offset is updated in both PUSH/PULL modes, *iff* we're
* in charge of things */