mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-14 10:18:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mad/gstmad.c: Make queries actually work (update core first).

Browse source 
Original commit message from CVS:
* ext/mad/gstmad.c: (gst_mad_src_query), (gst_mad_sink_event):
Make queries actually work (update core first).
This commit is contained in:
Tim-Philipp Müller 2005-05-12 14:15:37 +00:00
parent fd7658d5af
commit a5a4848761
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-05-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (gst_mad_src_query), (gst_mad_sink_event):
Make queries actually work (update core first).
2005-05-12 Wim Taymans <wim@fluendo.com>
* gst/rtsp/README:

30
ext/mad/gstmad.c
View file

@ -568,15 +568,22 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
case GST_QUERY_POSITION:
{
GstFormat format;
gint64 cur, total;
gint64 cur, total, total_bytes;
/* query peer for total length */
if (!gst_pad_query (GST_PAD_PEER (mad->sinkpad), query))
/* save requested format */
gst_query_parse_position (query, &format, NULL, NULL);
/* query peer for total length in bytes */
gst_query_set_position (query, GST_FORMAT_BYTES, -1, -1);
if (!gst_pad_query (GST_PAD_PEER (mad->sinkpad), query)) {
GST_LOG_OBJECT (mad, "query on peer pad failed");
goto error;
}
gst_query_parse_position (query, &format, NULL, &total);
gst_query_parse_position (query, NULL, NULL, &total_bytes);
GST_LOG_OBJECT (mad, "peer pad returned total=%lld bytes", total_bytes);
/* and convert to the final format */
/* and convert to the requested format */
if (format != GST_FORMAT_DEFAULT) {
if (!gst_mad_convert_src (pad, GST_FORMAT_DEFAULT, mad->total_samples,
&format, &cur))
@ -585,6 +592,18 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
cur = mad->total_samples;
}
if (total_bytes != -1) {
if (format != GST_FORMAT_BYTES) {
if (!gst_mad_convert_sink (pad, GST_FORMAT_BYTES, total_bytes,
&format, &total))
goto error;
} else {
total = total_bytes;
}
} else {
total = -1;
}
gst_query_set_position (query, format, cur, total);
GST_LOG_OBJECT (mad,
@ -995,6 +1014,7 @@ gst_mad_sink_event (GstPad * pad, GstEvent * event)
format = GST_FORMAT_DEFAULT;
if (!gst_mad_convert_src (mad->srcpad,
GST_FORMAT_TIME, time, &format, &mad->total_samples)) {
GST_DEBUG ("Failed to convert time to total_samples");
continue;
}