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/demuxers/demux_elem.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/demuxers/demux_elem.c')
| -rw-r--r-- | src/demuxers/demux_elem.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index d626fe619..4fa76ffd7 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_elem.c,v 1.84 2004/05/16 18:01:28 tmattern Exp $ + * $Id: demux_elem.c,v 1.85 2004/06/13 21:28:52 miguelfreitas Exp $ * * demultiplexer for elementary mpeg streams */ @@ -84,7 +84,9 @@ static int demux_mpeg_elem_next (demux_mpeg_elem_t *this, int preview_mode) { buf->size = done; buf->content = buf->mem; buf->pts = 0; - buf->extra_info->input_pos = this->input->get_current_pos(this->input); + if( this->input->get_length (this->input) ) + buf->extra_info->input_normpos = (int)( (double) this->input->get_current_pos (this->input) * + 65535 / this->input->get_length (this->input) ); buf->type = BUF_VIDEO_MPEG; if (preview_mode) @@ -142,6 +144,8 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) { demux_mpeg_elem_t *this = (demux_mpeg_elem_t *) this_gen; + start_pos = (off_t) ( (double) start_pos / 65535 * + this->input->get_length (this->input) ); this->status = DEMUX_OK; @@ -303,6 +307,6 @@ demuxer_info_t demux_info_elem = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 24, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin }, + { PLUGIN_DEMUX, 25, "elem", XINE_VERSION_CODE, &demux_info_elem, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |