mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

mad: Fix for changes in GstQuery API

Browse source
This commit is contained in:
Edward Hervey 2011-08-02 12:48:52 +02:00
parent 0a593a1e98
commit 2efbca2aa6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/mad/gstmad.c
View file

@ -511,7 +511,6 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
} }
case GST_QUERY_DURATION: case GST_QUERY_DURATION:
{ {
GstFormat bytes_format = GST_FORMAT_BYTES;
GstFormat time_format = GST_FORMAT_TIME; GstFormat time_format = GST_FORMAT_TIME;
GstFormat req_format; GstFormat req_format;
gint64 total, total_bytes; gint64 total, total_bytes;
@ -531,7 +530,7 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
} }
/* query peer for total length in bytes */ /* query peer for total length in bytes */
if (!gst_pad_query_peer_duration (mad->sinkpad, &bytes_format, if (!gst_pad_query_peer_duration (mad->sinkpad, GST_FORMAT_BYTES,
&total_bytes) || total_bytes <= 0) { &total_bytes) || total_bytes <= 0) {
GST_LOG_OBJECT (mad, "duration query on peer pad failed"); GST_LOG_OBJECT (mad, "duration query on peer pad failed");
goto error; goto error;
@ -1637,12 +1636,11 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
} else { } else {
/* if we have a pending timestamp, we can use it now to calculate the sample offset */ /* if we have a pending timestamp, we can use it now to calculate the sample offset */
if (GST_CLOCK_TIME_IS_VALID (mad->last_ts)) { if (GST_CLOCK_TIME_IS_VALID (mad->last_ts)) {
GstFormat format = GST_FORMAT_DEFAULT;
gint64 total; gint64 total;
/* Convert incoming timestamp to a number of encoded samples */ /* Convert incoming timestamp to a number of encoded samples */
gst_pad_query_convert (mad->srcpad, GST_FORMAT_TIME, mad->last_ts, gst_pad_query_convert (mad->srcpad, GST_FORMAT_TIME, mad->last_ts,
&format, &total); GST_FORMAT_DEFAULT, &total);
GST_DEBUG_OBJECT (mad, "calculated samples offset from ts is %" GST_DEBUG_OBJECT (mad, "calculated samples offset from ts is %"
G_GUINT64_FORMAT " accumulated samples offset is %" G_GUINT64_FORMAT " accumulated samples offset is %"