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

dvdemux: First query the peer duration in the requested format before converting to BYTES

Browse source 
Fixes usage of dvdemux after another demuxer, e.g. mxfdemux.
Fixes bug #650503.
This commit is contained in:
Sebastian Dröge 2011-06-02 13:38:30 +02:00
parent e376913fc3
commit 252c1afcc2
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/dv/gstdvdemux.c
View file

@ -574,26 +574,23 @@ gst_dvdemux_src_query (GstPad * pad, GstQuery * query)
GstFormat format; GstFormat format;
GstFormat format2; GstFormat format2;
gint64 end; gint64 end;
GstPad *peer;
/* get target format */ /* First ask the peer in the original format */
gst_query_parse_duration (query, &format, NULL); if (!gst_pad_peer_query (dvdemux->sinkpad, query)) {
/* get target format */
gst_query_parse_duration (query, &format, NULL);
/* change query to bytes to perform on peer */ /* change query to bytes to perform on peer */
gst_query_set_duration (query, GST_FORMAT_BYTES, -1); gst_query_set_duration (query, GST_FORMAT_BYTES, -1);
if ((peer = gst_pad_get_peer (dvdemux->sinkpad))) { /* Now ask the peer in BYTES format and try to convert */
/* ask peer for total length */ if (!gst_pad_peer_query (dvdemux->sinkpad, query)) {
if (!(res = gst_pad_query (peer, query))) {
gst_object_unref (peer);
goto error; goto error;
} }
/* get peer total length */ /* get peer total length */
gst_query_parse_duration (query, NULL, &end); gst_query_parse_duration (query, NULL, &end);
gst_object_unref (peer);
/* convert end to requested format */ /* convert end to requested format */
if (end != -1) { if (end != -1) {
format2 = format; format2 = format;
@ -601,11 +598,9 @@ gst_dvdemux_src_query (GstPad * pad, GstQuery * query)
GST_FORMAT_BYTES, end, &format2, &end))) { GST_FORMAT_BYTES, end, &format2, &end))) {
goto error; goto error;
} }
gst_query_set_duration (query, format, end);
} }
} else {
end = -1;
} }
gst_query_set_duration (query, format, end);
break; break;
} }
case GST_QUERY_CONVERT: case GST_QUERY_CONVERT: