diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-08 10:05:44 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-08 10:05:44 +0000 |
commit | b11ef987a573e1fbb5bb47a0185bbfeb1849580e (patch) | |
tree | 4dedb8f4f85ea033d2d41d02e85bbc3f7ac74c16 /libmpdemux/demux_mpg.c | |
parent | d7e310e1c2820142eb6cda3ac14c1ba437296649 (diff) | |
download | mpv-b11ef987a573e1fbb5bb47a0185bbfeb1849580e.tar.bz2 mpv-b11ef987a573e1fbb5bb47a0185bbfeb1849580e.tar.xz |
fixed broken seeking in mpeg-es files; syncword seeking for all 3 video codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14427 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mpg.c')
-rw-r--r-- | libmpdemux/demux_mpg.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 111a51fdf3..9819c48c1b 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -410,15 +410,18 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ sh_video_t *sh_video=d_video->sh; mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; int precision = 1; - float oldpts = mpg_d->last_pts; + float oldpts = 0; off_t oldpos = demuxer->filepos; - float newpts = (flags & 1) ? 0.0 : oldpts; + float newpts = 0; off_t newpos = (flags & 1) ? demuxer->movi_start : oldpos; + if(mpg_d) + oldpts = mpg_d->last_pts; + newpts = (flags & 1) ? 0.0 : oldpts; //================= seek in MPEG ========================== //calculate the pts to seek to if(flags & 2) { - if (mpg_d->final_pts > 0.0) + if (mpg_d && mpg_d->final_pts > 0.0) newpts += mpg_d->final_pts * rel_seek_secs; else newpts += rel_seek_secs * (demuxer->movi_end - demuxer->movi_start) * oldpts / oldpos; @@ -475,9 +478,17 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ } } i=sync_video_packet(d_video); - if(i==0x1B3 || i==0x1B8) break; // found it! + if(sh_video->format == 0x10000004) { //mpeg4 + if(i==0x1B6) break; //vop (frame) startcode + } else if(sh_video->format == 0x10000005){ //h264 + if((i & ~0x60) == 0x101 || (i & ~0x60) == 0x102 || (i & ~0x60) == 0x105) break; + } else { //default mpeg1/2 + if(i==0x1B3 || i==0x1B8) break; // found it! + } if(!i || !skip_video_packet(d_video)) break; // EOF? } + if(!mpg_d) + break; if (!precision || abs(newpts - mpg_d->last_pts) < 0.5 || (mpg_d->last_pts == oldpts)) break; if ((newpos - oldpos) * (mpg_d->last_pts - oldpts) < 0) { // invalid timestamps mpg_d->has_valid_timestamps = 0; @@ -485,12 +496,14 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ } precision--; //prepare another seek because we are off by more than 0.5s + if(mpg_d) { newpos += (newpts - mpg_d->last_pts) * (newpos - oldpos) / (mpg_d->last_pts - oldpts); ds_free_packs(d_audio); ds_free_packs(d_video); demuxer->stream->eof=0; // clear eof flag d_video->eof=0; d_audio->eof=0; + } } } |