summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_nsv.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-06-13 21:28:52 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-06-13 21:28:52 +0000
commitf85a943fdff3f12db8faf4b84e4f63aafdc60db3 (patch)
treee16cc52e6b9a9548714a1ee31a5265ff34127467 /src/demuxers/demux_nsv.c
parent62f8ce9ec67fb85da1023b5db90a0a5f1609cff7 (diff)
downloadxine-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_nsv.c')
-rw-r--r--src/demuxers/demux_nsv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 15f328441..a29cd9ca8 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -23,7 +23,7 @@
* For more information regarding the NSV file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_nsv.c,v 1.16 2004/05/16 18:01:43 tmattern Exp $
+ * $Id: demux_nsv.c,v 1.17 2004/06/13 21:28:54 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -309,9 +309,9 @@ static int demux_nsv_send_chunk(demux_plugin_t *this_gen) {
}
buf->type = this->video_type;
- buf->extra_info->input_pos = current_file_pos;
+ if( this->data_size )
+ buf->extra_info->input_normpos = (int)((double)current_file_pos * 65535 / this->data_size);
buf->extra_info->input_time = this->video_pts / 90;
- buf->extra_info->input_length = this->data_size;
buf->pts = this->video_pts;
buf->decoder_flags |= BUF_FLAG_FRAMERATE;
buf->decoder_info[0] = this->frame_pts_inc;
@@ -337,9 +337,9 @@ static int demux_nsv_send_chunk(demux_plugin_t *this_gen) {
}
buf->type = this->audio_type;
- buf->extra_info->input_pos = current_file_pos;
+ if( this->data_size )
+ buf->extra_info->input_normpos = (int)((double)current_file_pos * 65535 / this->data_size);
buf->extra_info->input_time = this->video_pts / 90;
- buf->extra_info->input_length = this->data_size;
buf->pts = this->video_pts;
buf->decoder_flags |= BUF_FLAG_FRAMERATE;
buf->decoder_info[0] = this->frame_pts_inc;
@@ -530,6 +530,6 @@ demuxer_info_t demux_info_nsv = {
plugin_info_t xine_plugin_info[] = {
/* type, API, "name", version, special_info, init_function */
- { PLUGIN_DEMUX, 24, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin },
+ { PLUGIN_DEMUX, 25, "nsv", XINE_VERSION_CODE, &demux_info_nsv, demux_nsv_init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};