seeking flags implemented: 0x1=rel/abs and 0x2=time/percent

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1629 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 13 insertions, 7 deletions

diff --git a/demux_mpg.c b/demux_mpg.c
index 3de56b25ee..5f3477c509 100644
--- a/demux_mpg.c
+++ b/demux_mpg.c
@@ -351,15 +351,21 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
     sh_video_t *sh_video=d_video->sh;
 
   //================= seek in MPEG ==========================
-        off_t newpos;
-        if(!sh_video->i_bps) // unspecified?
-          newpos=demuxer->filepos+2324*75*rel_seek_secs; // 174.3 kbyte/sec
+    off_t newpos=(flags&1)?demuxer->movi_start:demuxer->filepos;
+	
+    if(flags&2){
+	// float seek 0..1
+	newpos+=(demuxer->movi_end-demuxer->movi_start)*rel_seek_secs;
+    } else {
+	// time seek (secs)
+        if(!sh_video->i_bps) // unspecified or VBR
+          newpos+=2324*75*rel_seek_secs; // 174.3 kbyte/sec
         else
-          newpos=demuxer->filepos+(sh_video->i_bps)*rel_seek_secs;
+          newpos+=sh_video->i_bps*rel_seek_secs;
+    }
+
+        if(newpos<demuxer->movi_start) newpos=demuxer->movi_start;
 
-        if(newpos<demuxer->stream->start_pos 
-	 && demuxer->stream->type==STREAMTYPE_VCD)
-	     newpos=demuxer->stream->start_pos; // for VCD
 #ifdef _LARGEFILE_SOURCE
         newpos&=~((long long)STREAM_BUFFER_SIZE-1);  /* sector boundary */
 #else