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_flv.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_flv.c')
| -rw-r--r-- | src/demuxers/demux_flv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 8c22fd2d3..c9eba89ce 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -24,7 +24,7 @@ * For more information on the FLV file format, visit: * http://download.macromedia.com/pub/flash/flash_file_format_specification.pdf * - * $Id: demux_flv.c,v 1.2 2004/05/16 18:01:43 tmattern Exp $ + * $Id: demux_flv.c,v 1.3 2004/06/13 21:28:53 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -144,8 +144,9 @@ printf (" chunk_type = %X, 0x%X -1 bytes, pts %lld, sub-type = %X\n", while (remaining_bytes) { buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_VIDEO_FLV1; - buf->extra_info->input_pos = this->input->get_current_pos(this->input); - buf->extra_info->input_length = this->input->get_length(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) ); if (remaining_bytes > buf->max_size) buf->size = buf->max_size; @@ -343,6 +344,6 @@ demuxer_info_t demux_info_flv = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 24, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, + { PLUGIN_DEMUX, 25, "flashvideo", XINE_VERSION_CODE, &demux_info_flv, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |