mplayer.hg: seek.c comparison

comparison seek.c @ 1408:71ad3e1ba014

some cleanup, asf/mpg seek precision improved

author	arpi
date	Sun, 29 Jul 2001 00:39:47 +0000
parents	8ecf18884ad8
children	ea0a0b9e6fbc

comparison

equal deleted inserted replaced

-:2e23a033d6f8
+:71ad3e1ba014
 extern int asf_packetsize; // for seeking
 extern float avi_audio_pts;
 extern float avi_video_pts;
-extern float avi_video_ftime;
+//extern float avi_video_ftime;
 extern int skip_video_frames;
 extern float initial_pts_delay;
 extern int seek_to_byte;
 extern char* current_module; // for debugging
 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
 demux_stream_t *d_audio=demuxer->audio;
 demux_stream_t *d_video=demuxer->video;
 sh_audio_t *sh_audio=d_audio->sh;
 sh_video_t *sh_video=d_video->sh;
-int skip_audio_bytes=0;
 float skip_audio_secs=0;
 if(demuxer->file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){
 printf("Can't seek in raw .AVI streams! (index required, try with the -idx switch!)  \n");
 return 0;
 // seek forward
 while(video_chunk_pos<demuxer->idx_size){
 int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
 if(avi_stream_id(id)==d_video->id){  // video frame
 if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
-++skip_audio_bytes;
+//            ++skip_audio_bytes;
 }
 ++video_chunk_pos;
 }
 } else {
 // seek backward
 while(video_chunk_pos>=0){
 int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
 if(avi_stream_id(id)==d_video->id){  // video frame
 if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
---skip_audio_bytes;
+//            --skip_audio_bytes;
 }
 --video_chunk_pos;
 }
 }
 demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=video_chunk_pos;
 if(sh_audio){
 int i;
 int apos=0;
 int last=0;
 int len=0;
+	int skip_audio_bytes=0;
 // calc new audio position in audio stream: (using avg.bps value)
 curr_audio_pos=(avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
 if(curr_audio_pos<0)curr_audio_pos=0;
 #if 1
 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
 if(avi_stream_id(id)==d_video->id) ++skip_video_frames;
 }
 // requires for correct audio pts calculation (demuxer):
 avi_video_pts-=skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-}
+if(verbose) printf("SEEK: idx=%d  (a:%d v:%d)  v.skip=%d  a.skip=%d/%4.3f  \n",
+demuxer->idx_pos,audio_chunk_pos,video_chunk_pos,
-if(verbose) printf("SEEK: idx=%d  (a:%d v:%d)  v.skip=%d  a.skip=%d/%4.3f  \n",
+skip_video_frames,skip_audio_bytes,skip_audio_secs);
-demuxer->idx_pos,audio_chunk_pos,video_chunk_pos,
-skip_video_frames,skip_audio_bytes,skip_audio_secs);
+if(skip_audio_bytes){
+demux_read_data(d_audio,NULL,skip_audio_bytes);
+//d_audio->pts=0; // PTS is outdated because of the raw data skipping
+}
+	  resync_audio_stream(sh_audio);
+}
 }
 break;
 case DEMUXER_TYPE_ASF: {
 if(newpos<0 || newpos<demuxer->movi_start) newpos=demuxer->movi_start;
 //    printf("\r -- asf: newpos=%d -- \n",newpos);
 stream_seek(demuxer->stream,newpos);
 ds_fill_buffer(d_video);
-if(sh_audio) ds_fill_buffer(d_audio);
+if(sh_audio){
+ds_fill_buffer(d_audio);
+resync_audio_stream(sh_audio);
+}
 while(1){
-	if(sh_audio){
+	if(sh_audio && !d_audio->eof){
+	  float a_pts=d_audio->pts;
+a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
 	  // sync audio:
-if (d_video->pts > d_audio->pts){
+if (d_video->pts > a_pts){
-	      if(!ds_fill_buffer(d_audio)) sh_audio=NULL; // skip audio. EOF?
+	      skip_audio_frame(sh_audio);
+//	      if(!ds_fill_buffer(d_audio)) sh_audio=NULL; // skip audio. EOF?
 	      continue;
 	  }
 	}
 	if(d_video->flags&1) break; // found a keyframe!
 	if(!ds_fill_buffer(d_video)) break; // skip frame.  EOF?
 newpos=demuxer->filepos+(sh_video->i_bps)*rel_seek_secs;
 if(newpos<seek_to_byte) newpos=seek_to_byte;
 newpos&=~(STREAM_BUFFER_SIZE-1);  /* sector boundary */
 stream_seek(demuxer->stream,newpos);
 // re-sync video:
 videobuf_code_len=0; // reset ES stream buffer
-while(1){
-int i=sync_video_packet(d_video);
+	ds_fill_buffer(d_video);
+	if(sh_audio){
+	  ds_fill_buffer(d_audio);
+	  resync_audio_stream(sh_audio);
+	}
+	while(1){
+	  int i;
+if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){
+	    float a_pts=d_audio->pts;
+a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+	    if(d_video->pts>a_pts){
+	      skip_audio_frame(sh_audio);  // sync audio
+	      continue;
+	    }
+}
+i=sync_video_packet(d_video);
 if(i==0x1B3 || i==0x1B8) break; // found it!
 if(!i || !skip_video_packet(d_video)) break; // EOF?
 }
 }
 break;
 } // switch(demuxer->file_format)
 //====================== re-sync audio: =====================
 if(sh_audio){
+	if(verbose){
-if(skip_audio_bytes){
+	    float a_pts=d_audio->pts;
-demux_read_data(d_audio,NULL,skip_audio_bytes);
+a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
-//d_audio->pts=0; // PTS is outdated because of the raw data skipping
+	    printf("SEEK: A: %5.3f  V: %5.3f  A-V: %5.3f   \n",a_pts,d_video->pts,a_pts-d_video->pts);
-}
+	}
-current_module="resync_audio";
-	resync_audio_stream(sh_audio);
-// re-sync PTS (MPEG-PS only!!!)
-if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS)
-if(d_video->pts && d_audio->pts){
-if (d_video->pts < d_audio->pts){
-} else {
-while(d_video->pts > d_audio->pts){
-	      skip_audio_frame(sh_audio);
-}
-}
-}
 printf("A:%6.1f  V:%6.1f  A-V:%7.3f  ct: ?   \r",d_audio->pts,d_video->pts,0.0f);
 } else {
 printf("A: ---   V:%6.1f   \r",d_video->pts);
 }
 fflush(stdout);

Mercurial > mplayer.hg

comparison seek.c @ 1408:71ad3e1ba014