summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2013-07-29 10:56:06 +0200
committerSebastian Dröge <slomo@circular-chaos.org>2013-07-29 10:56:06 +0200
commit1ce9d7b2d1d26091493809a732e354232deae26e (patch)
tree84d53b82f27ebbc49005277d12861cf6d0551857
parent1803b3c18530cb0100d140c2b8e49a8dfe41f941 (diff)
asfdemux: Implement SEGMENT query
-rw-r--r--gst/asfdemux/gstasfdemux.c28
1 files changed, 27 insertions, 1 deletions
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index b50d4a1e..c09eb86a 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -2623,7 +2623,7 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data,
flags = gst_asf_demux_get_uint16 (&data, &size);
stream_id = flags & 0x7f;
- is_encrypted = !!((flags & 0x8000) << 15);
+ is_encrypted = ! !((flags & 0x8000) << 15);
unknown = gst_asf_demux_get_uint32 (&data, &size);
GST_DEBUG_OBJECT (demux, "Found stream %u, time_offset=%" GST_TIME_FORMAT,
@@ -4297,6 +4297,32 @@ gst_asf_demux_handle_src_query (GstPad * pad, GstObject * parent,
gst_query_set_latency (query, live, min, max);
break;
}
+ case GST_QUERY_SEGMENT:
+ {
+ GstFormat format;
+ gint64 start, stop;
+
+ format = demux->segment.format;
+
+ start =
+ gst_segment_to_stream_time (&demux->segment, format,
+ demux->segment.start);
+ if ((stop = demux->segment.stop) == -1)
+ stop = demux->segment.duration;
+ else
+ stop = gst_segment_to_stream_time (&demux->segment, format, stop);
+
+ if (demux->segment.rate < 0.0) {
+ gint64 tmp;
+ tmp = stop;
+ stop = start;
+ start = tmp;
+ }
+
+ gst_query_set_segment (query, demux->segment.rate, format, start, stop);
+ res = TRUE;
+ break;
+ }
default:
res = gst_pad_query_default (pad, parent, query);
break;