summaryrefslogtreecommitdiffstats
path: root/gst/avi/gstavidemux.h
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-08-22 17:02:39 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-08-22 17:02:39 +0000
commit2bd16585bc39f674e14fac93646175a562901370 (patch)
tree804a3d56d32705d7b0d80c3f5fc3bb02bc9ea2ef /gst/avi/gstavidemux.h
parent0f38451f208637683b47694f74bf09da10d26a3a (diff)
gst/avi/gstavidemux.*: Mark DISCONT.
Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_parse_stream), (gst_avi_demux_do_seek), (gst_avi_demux_handle_seek), (gst_avi_demux_process_next_entry): * gst/avi/gstavidemux.h: Mark DISCONT. Remove old unused fields and reorder the struct a bit.
Diffstat (limited to 'gst/avi/gstavidemux.h')
-rw-r--r--gst/avi/gstavidemux.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h
index 259906fa..bc14183f 100644
--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@@ -60,9 +60,10 @@ typedef struct {
/* index of this streamcontext */
guint num;
- /* pad, strh */
+ /* pad*/
GstPad *pad;
- GstFlowReturn last_flow;
+
+ /* stream info and headers */
gst_riff_strh *strh;
union {
gst_riff_strf_vids *vids;
@@ -73,22 +74,23 @@ typedef struct {
GstBuffer *extradata, *initdata;
gchar *name;
- /* current position (byte, frame, time) */
+ /* current position (byte, frame, time) and other status vars */
guint current_frame;
guint64 current_byte;
- gint current_entry;
+ GstFlowReturn last_flow;
+ gboolean discont;
/* stream length */
guint64 total_bytes;
guint32 total_frames;
guint64 total_time;
- /* VBR indicator */
- gboolean is_vbr;
-
/* stream length according to index */
GstClockTime idx_duration;
+ /* VBR indicator */
+ gboolean is_vbr;
+
guint64 *indexes;
GstTagList *taglist;
@@ -125,14 +127,14 @@ typedef struct _GstAviDemux {
/* some stream info for length */
gst_riff_avih *avih;
- /* seeking in TIME */
- gboolean streaming;
- GstSegment segment;
- gboolean segment_running;
- GstEvent *seek_event;
+ /* segment in TIME */
+ GstSegment segment;
+ gboolean segment_running;
+ gboolean streaming;
+ /* pending tags/events */
+ GstEvent *seek_event;
GstTagList *globaltags;
-
gboolean got_tags;
} GstAviDemux;