summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gst/mve/gstmvedemux.c37
2 files changed, 46 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 626561b3..f6bd0b61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2007-01-11 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/mve/gstmvedemux.c: (gst_mve_demux_get_src_query_types),
+ (gst_mve_demux_handle_src_query), (gst_mve_demux_handle_src_event),
+ (gst_mve_add_stream):
+ Support SEEKING query (bad news now delivered properly!); add event
+ function to source pads to make sure seeks aren't propagated
+ upstream, even if they aren't handled.
+
+2007-01-11 Tim-Philipp Müller <tim at centricular dot net>
+
Patch by: Jens Granseuer <jensgr at gmx net>
* configure.ac:
diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c
index 767e730d..01ccfe5b 100644
--- a/gst/mve/gstmvedemux.c
+++ b/gst/mve/gstmvedemux.c
@@ -147,6 +147,7 @@ gst_mve_demux_get_src_query_types (GstPad * pad)
{
static const GstQueryType src_types[] = {
GST_QUERY_POSITION,
+ GST_QUERY_SEEKING,
0
};
@@ -177,6 +178,21 @@ gst_mve_demux_handle_src_query (GstPad * pad, GstQuery * query)
}
break;
}
+ case GST_QUERY_SEEKING:{
+ GstFormat format;
+
+ gst_query_parse_seeking (query, &format, NULL, NULL, NULL);
+ if (format == GST_FORMAT_TIME) {
+ gst_query_set_seeking (query, GST_FORMAT_TIME, FALSE, 0, -1);
+ res = TRUE;
+ }
+ break;
+ }
+ case GST_QUERY_DURATION:{
+ /* FIXME: really should implement/estimate this somehow */
+ res = FALSE;
+ break;
+ }
default:
res = gst_pad_query_default (pad, query);
break;
@@ -185,6 +201,25 @@ gst_mve_demux_handle_src_query (GstPad * pad, GstQuery * query)
return res;
}
+static gboolean
+gst_mve_demux_handle_src_event (GstPad * pad, GstEvent * event)
+{
+ gboolean res;
+
+ switch (GST_EVENT_TYPE (event)) {
+ case GST_EVENT_SEEK:
+ GST_DEBUG ("seeking not supported");
+ res = FALSE;
+ break;
+ default:
+ res = gst_pad_event_default (pad, event);
+ break;
+ }
+
+ return res;
+}
+
+
static GstStateChangeReturn
gst_mve_demux_change_state (GstElement * element, GstStateChange transition)
{
@@ -230,6 +265,8 @@ gst_mve_add_stream (GstMveDemux * mve, GstMveDemuxStream * stream,
GST_DEBUG_FUNCPTR (gst_mve_demux_get_src_query_types));
gst_pad_set_query_function (stream->pad,
GST_DEBUG_FUNCPTR (gst_mve_demux_handle_src_query));
+ gst_pad_set_event_function (stream->pad,
+ GST_DEBUG_FUNCPTR (gst_mve_demux_handle_src_event));
gst_pad_set_element_private (stream->pad, stream);
GST_DEBUG_OBJECT (mve, "adding pad %s", GST_PAD_NAME (stream->pad));