diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-30 09:00:36 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-06-30 09:00:36 +0000 |
commit | aa254e4374fa1753f90643d6fb1be4bdfda7efcb (patch) | |
tree | 7608d447b8a85a40fc06076281d622904788c70a /gst/avi/gstavidemux.h | |
parent | 094d0b479448a307f07d4ee9789f368a27919daf (diff) |
gst/avi/: Port from -THREADED to HEAD, and fix for latest API changes of the day. Keep avimux dead for now.
Original commit message from CVS:
* gst/avi/Makefile.am:
* gst/avi/gstavi.c: (plugin_init):
* gst/avi/gstavidemux.c: (gst_avi_demux_get_type),
(gst_avi_demux_class_init), (gst_avi_demux_init),
(gst_avi_demux_reset), (gst_avi_demux_index_next),
(gst_avi_demux_index_entry_for_time),
(gst_avi_demux_index_entry_for_byte),
(gst_avi_demux_index_entry_for_frame), (gst_avi_demux_src_convert),
(gst_avi_demux_handle_src_query), (gst_avi_demux_handle_src_event),
(gst_avi_demux_parse_file_header), (gst_avi_demux_stream_init),
(gst_avi_demux_parse_avih), (gst_avi_demux_parse_superindex),
(gst_avi_demux_parse_subindex), (gst_avi_demux_read_subindexes),
(gst_avi_demux_parse_stream), (gst_avi_demux_parse_odml),
(gst_avi_demux_parse_index), (gst_avi_demux_stream_index),
(gst_avi_demux_stream_scan), (gst_avi_demux_massage_index),
(gst_avi_demux_stream_header), (gst_avi_demux_handle_seek),
(gst_avi_demux_process_next_entry), (gst_avi_demux_stream_data),
(gst_avi_demux_loop), (gst_avi_demux_sink_activate),
(gst_avi_demux_sink_activate_pull):
* gst/avi/gstavidemux.h:
Port from -THREADED to HEAD, and fix for latest API changes of
the day. Keep avimux dead for now.
Diffstat (limited to 'gst/avi/gstavidemux.h')
-rw-r--r-- | gst/avi/gstavidemux.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h index c5db2581..e99ba637 100644 --- a/gst/avi/gstavidemux.h +++ b/gst/avi/gstavidemux.h @@ -22,6 +22,7 @@ #include <gst/gst.h> +#include "avi-ids.h" #include "gst/riff/riff-ids.h" #include "gst/riff/riff-read.h" @@ -61,25 +62,25 @@ typedef struct { /* pad, strh */ GstPad *pad; - GstCaps *caps; gst_riff_strh *strh; - gint blockalign, bitrate; - gint width, height; + union { + gst_riff_strf_vids *vids; + gst_riff_strf_auds *auds; + gst_riff_strf_iavs *iavs; + gpointer data; + } strf; + GstBuffer *extradata, *initdata; + gchar *name; /* current position (byte, frame, time) */ guint current_frame; guint64 current_byte; gint current_entry; - /* delay in time (init_frames) */ - guint64 delay; - /* stream length */ guint64 total_bytes; guint32 total_frames; - guint32 skip; - guint64 *indexes; } avi_stream_context; @@ -90,14 +91,14 @@ typedef enum { } GstAviDemuxState; typedef struct _GstAviDemux { - GstRiffRead parent; + GstElement parent; /* pads */ GstPad *sinkpad; /* AVI decoding state */ GstAviDemuxState state; - guint level_up; + guint64 offset; /* index */ gst_avi_index_entry *index_entries; @@ -112,18 +113,18 @@ typedef struct _GstAviDemux { avi_stream_context stream[GST_AVI_DEMUX_MAX_STREAMS]; /* some stream info for length */ - guint32 us_per_frame; - guint32 num_frames; + gst_riff_avih *avih; /* seeking */ guint64 seek_offset; guint64 last_seek; gint seek_entry; gboolean seek_flush; + GstEvent *seek_event; } GstAviDemux; typedef struct _GstAviDemuxClass { - GstRiffReadClass parent_class; + GstElementClass parent_class; } GstAviDemuxClass; GType gst_avi_demux_get_type (void); |