diff --git a/ChangeLog b/ChangeLog index 1e3fd9c3b6..a2dffaa70a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-01-10 Tim-Philipp Müller + + * ext/amrnb/amrnbparse.c: (gst_amrnbparse_query): + * ext/mad/gstid3tag.c: (gst_id3_tag_src_query): + * ext/mad/gstmad.c: (gst_mad_src_query): + * ext/mpeg2dec/gstmpeg2dec.c: (gst_mpeg2dec_src_query): + * ext/sidplay/gstsiddec.cc: + * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_handle_src_query): + * gst/realmedia/rmdemux.c: (gst_rmdemux_src_query): + Pass unhandled queries upstream (useful e.g. for SEEKING query) + (fixes #325652; based on patch by: Philippe); make rmdemux return + FALSE for position queries, instead of setting -1 as value and + returning TRUE. + 2006-01-05 Martin Soto * gst/mpegstream/gstmpegparse.c (gst_mpeg_parse_adjust_ts) diff --git a/common b/common index 5f10c872ca..e0b121388e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 5f10c872cafb3eb8058d63e438cae029ed9e8d73 +Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf diff --git a/ext/amrnb/amrnbparse.c b/ext/amrnb/amrnbparse.c index 05f2399511..6106d23d56 100644 --- a/ext/amrnb/amrnbparse.c +++ b/ext/amrnb/amrnbparse.c @@ -236,7 +236,7 @@ gst_amrnbparse_query (GstPad * pad, GstQuery * query) break; } default: - res = FALSE; + res = gst_pad_query_default (pad, query); break; } return res; diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index 0e4ed71536..34fa1fceb1 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -487,6 +487,7 @@ gst_id3_tag_src_query (GstPad * pad, GstQuery * query) break; } default: + res = gst_pad_query_default (pad, query); break; } return res; diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 9e4e6edfa0..81f4d2c4c1 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -666,7 +666,7 @@ gst_mad_src_query (GstPad * pad, GstQuery * query) break; } default: - res = FALSE; + res = gst_pad_query_default (pad, query); break; } diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index af2e94846d..5478096388 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -1149,7 +1149,7 @@ gst_mpeg2dec_src_query (GstPad * pad, GstQuery * query) break; } default: - res = FALSE; + res = gst_pad_query_default (pad, query); break; } done: diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 9d4205dc4a..cd04c8799e 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -613,7 +613,7 @@ gst_siddec_src_query (GstPad * pad, GstQuery * query) break; } default: - res = FALSE; + res = gst_pad_query_default (pad, query); break; } return res; diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c index 4fef0bdaee..e8a9f32734 100644 --- a/gst/mpegstream/gstmpegparse.c +++ b/gst/mpegstream/gstmpegparse.c @@ -1048,8 +1048,8 @@ gst_mpeg_parse_handle_src_query (GstPad * pad, GstQuery * query) break; } default: - res = FALSE; - goto done; + res = gst_pad_query_default (pad, query); + break; } done: diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index fc54accc5e..a27998b97f 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -630,18 +630,18 @@ gst_rmdemux_src_query (GstPad * pad, GstQuery * query) switch (GST_QUERY_TYPE (query)) { case GST_QUERY_POSITION: GST_DEBUG_OBJECT (rmdemux, "src_query position"); - gst_query_set_position (query, GST_FORMAT_TIME, -1); //rmdemux->cur_timestamp, + gst_query_set_position (query, GST_FORMAT_TIME, -1); /* rmdemux->cur_timestamp */ GST_DEBUG_OBJECT (rmdemux, "Position query: no idea from demuxer!"); + res = FALSE; break; case GST_QUERY_DURATION: GST_DEBUG_OBJECT (rmdemux, "src_query duration"); - gst_query_set_duration (query, GST_FORMAT_TIME, //rmdemux->cur_timestamp, - rmdemux->duration); - GST_DEBUG_OBJECT (rmdemux, "Duration query: set to %lld in demuxer", + gst_query_set_duration (query, GST_FORMAT_TIME, rmdemux->duration); + GST_DEBUG_OBJECT (rmdemux, "duration set to %" G_GINT64_FORMAT, rmdemux->duration); break; default: - res = FALSE; + res = gst_pad_query_default (pad, query); break; }