mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mad/gstmad.c: For position and duration queries in TIME format, try the peer first (might be a demuxer).

Browse source 
Original commit message from CVS:
* ext/mad/gstmad.c: (gst_mad_src_query):
For position and duration queries in TIME format, try the peer
first (might be a demuxer).
This commit is contained in:
Tim-Philipp Müller 2005-12-09 18:38:53 +00:00
parent 81f2585c88
commit 741c6663e2
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-12-09 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (gst_mad_src_query):
For position and duration queries in TIME format, try the peer
first (might be a demuxer).
2005-12-08 Martin Soto <martinsoto@users.sourceforge.net> 2005-12-08 Martin Soto <martinsoto@users.sourceforge.net>
* gst/mpegstream/gstdvddemux.c (gst_dvd_demux_handle_newsegment): * gst/mpegstream/gstdvddemux.c (gst_dvd_demux_handle_newsegment):

2
common

@ -1 +1 @@
Subproject commit fe94837afc0b10eaf867156fc29eea0073ba45df Subproject commit 4edc214072fe07d2aade96bc336493425654d7b4

35
ext/mad/gstmad.c
View file

@ -547,10 +547,13 @@ static gboolean
gst_mad_src_query (GstPad * pad, GstQuery * query) gst_mad_src_query (GstPad * pad, GstQuery * query)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GstPad *peer;
GstMad *mad; GstMad *mad;
mad = GST_MAD (GST_PAD_PARENT (pad)); mad = GST_MAD (GST_PAD_PARENT (pad));
peer = gst_pad_get_peer (mad->sinkpad);
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
{ {
@ -560,6 +563,14 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
/* save requested format */ /* save requested format */
gst_query_parse_position (query, &format, NULL); gst_query_parse_position (query, &format, NULL);
/* try any demuxer before us first */
if (format == GST_FORMAT_TIME && peer && gst_pad_query (peer, query)) {
gst_query_parse_position (query, NULL, &cur);
GST_LOG_OBJECT (mad, "peer returned position %" GST_TIME_FORMAT,
GST_TIME_ARGS (cur));
break;
}
/* and convert to the requested format */ /* and convert to the requested format */
if (format != GST_FORMAT_DEFAULT) { if (format != GST_FORMAT_DEFAULT) {
if (!gst_mad_convert_src (pad, GST_FORMAT_DEFAULT, mad->total_samples, if (!gst_mad_convert_src (pad, GST_FORMAT_DEFAULT, mad->total_samples,
@ -583,22 +594,28 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
GstFormat format; GstFormat format;
GstFormat rformat; GstFormat rformat;
gint64 total, total_bytes; gint64 total, total_bytes;
GstPad *peer;
/* save requested format */ /* save requested format */
gst_query_parse_duration (query, &format, NULL); gst_query_parse_duration (query, &format, NULL);
if (peer == NULL)
goto error;
/* try any demuxer before us first */
if (format == GST_FORMAT_TIME && gst_pad_query (peer, query)) {
gst_query_parse_duration (query, NULL, &total);
GST_LOG_OBJECT (mad, "peer returned duration %" GST_TIME_FORMAT,
GST_TIME_ARGS (total));
break;
}
/* query peer for total length in bytes */ /* query peer for total length in bytes */
gst_query_set_duration (query, GST_FORMAT_BYTES, -1); gst_query_set_duration (query, GST_FORMAT_BYTES, -1);
if ((peer = gst_pad_get_peer (mad->sinkpad)) == NULL)
goto error;
if (!gst_pad_query (peer, query)) { if (!gst_pad_query (peer, query)) {
GST_LOG_OBJECT (mad, "query on peer pad failed"); GST_LOG_OBJECT (mad, "query on peer pad failed");
goto error; goto error;
} }
gst_object_unref (peer);
/* get the returned format */ /* get the returned format */
gst_query_parse_duration (query, &rformat, &total_bytes); gst_query_parse_duration (query, &rformat, &total_bytes);
@ -650,11 +667,19 @@ gst_mad_src_query (GstPad * pad, GstQuery * query)
res = FALSE; res = FALSE;
break; break;
} }
if (peer)
gst_object_unref (peer);
return res; return res;
error: error:
GST_DEBUG ("error handling query"); GST_DEBUG ("error handling query");
if (peer)
gst_object_unref (peer);
return FALSE; return FALSE;
} }