diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-13 21:28:52 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2004-06-13 21:28:52 +0000 |
| commit | f85a943fdff3f12db8faf4b84e4f63aafdc60db3 (patch) | |
| tree | e16cc52e6b9a9548714a1ee31a5265ff34127467 /src/xine-engine/demux.c | |
| parent | 62f8ce9ec67fb85da1023b5db90a0a5f1609cff7 (diff) | |
| download | xine-lib-f85a943fdff3f12db8faf4b84e4f63aafdc60db3.tar.gz xine-lib-f85a943fdff3f12db8faf4b84e4f63aafdc60db3.tar.bz2 | |
implement steps 1, 2, 3 and 4 of the seeking proposal:
http://article.gmane.org/gmane.comp.video.xine.devel/9532
it is now up to demuxers to decide what the 0..65535 position means.
demuxers tested: ogg, voc, flac, rm, asf, vqa, vob, avi, y4m, au, mov, ts, mp3, mpg, wav, ra, mve
CVS patchset: 6686
CVS date: 2004/06/13 21:28:52
Diffstat (limited to 'src/xine-engine/demux.c')
| -rw-r--r-- | src/xine-engine/demux.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 6399c0776..d01e2a887 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -20,7 +20,7 @@ * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication * - * $Id: demux.c,v 1.49 2004/05/16 21:45:24 jcdutton Exp $ + * $Id: demux.c,v 1.50 2004/06/13 21:28:57 miguelfreitas Exp $ */ @@ -483,7 +483,7 @@ int _x_action_pending (xine_stream_t *stream) { */ void _x_demux_send_data(fifo_buffer_t *fifo, uint8_t *data, int size, int64_t pts, uint32_t type, uint32_t decoder_flags, - off_t input_pos, off_t input_length, + int input_normpos, int input_time, int total_time, uint32_t frame_number) { buf_element_t *buf; @@ -510,8 +510,7 @@ void _x_demux_send_data(fifo_buffer_t *fifo, uint8_t *data, int size, buf->pts = pts; pts = 0; - buf->extra_info->input_pos = input_pos; - buf->extra_info->input_length = input_length; + buf->extra_info->input_normpos = input_normpos; buf->extra_info->input_time = input_time; buf->extra_info->total_time = total_time; buf->extra_info->frame_number = frame_number; @@ -529,9 +528,9 @@ void _x_demux_send_data(fifo_buffer_t *fifo, uint8_t *data, int size, */ int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, int size, int64_t pts, uint32_t type, - uint32_t decoder_flags, off_t input_pos, - off_t input_length, int input_time, - int total_time, uint32_t frame_number) { + uint32_t decoder_flags, off_t input_normpos, + int input_time, int total_time, + uint32_t frame_number) { buf_element_t *buf; decoder_flags |= BUF_FLAG_FRAME_START; @@ -558,8 +557,7 @@ int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, buf->pts = pts; pts = 0; - buf->extra_info->input_pos = input_pos; - buf->extra_info->input_length = input_length; + buf->extra_info->input_normpos = input_normpos; buf->extra_info->input_time = input_time; buf->extra_info->total_time = total_time; buf->extra_info->frame_number = frame_number; |