mplayer.hg: mplayer.c comparison

comparison mplayer.c @ 889:1b905517c684

AVI -bps desync problem solved

author	arpi_esp
date	Sun, 27 May 2001 00:02:12 +0000
parents	258884190f83
children	bad858a47870

comparison

equal deleted inserted replaced

-:c7561094bc2c
+:1b905517c684
 if(pts_from_bps){
 // PTS = (audio position)/(bytes per sec)
 //      a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
 a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
 delay_corrected=1; // hack
+v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
+if(verbose)printf("%5.3f|",v_pts-d_video->pts);
 } else {
 if(!delay_corrected && d_audio->pts){
 float x=d_audio->pts-d_video->pts-(delay+audio_delay);
 float y=-(delay+audio_delay);
 printf("Initial PTS delay: %5.3f sec  (calculated: %5.3f)\n",x,y);
 audio_delay,delay,d_audio->pts,d_video->pts);
 }
 // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec)
 a_pts=d_audio->pts;
 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
-}
+v_pts=d_video->pts-frame_time;
+}
-v_pts=d_video->pts-frame_time;
 if(verbose)printf("### A:%8.3f (%8.3f)  V:%8.3f  A-V:%7.4f  \n",a_pts,a_pts-audio_delay-delay,v_pts,(a_pts-delay-audio_delay)-v_pts);
 if(frame_corr_num==1){
 float x=frame_correction;
 skip_video_frames=0;
 // SEEK streams
 //      if(d_video->pts) avi_video_pts=d_video->pts;
 avi_audio_pts=0;
-d_video->pts=0;
-d_audio->pts=0;
+// Done by ds_free_packs():
+//d_video->pts=0;
+//d_audio->pts=0;
 // find video chunk pos:
 if(rel_seek_frames>0){
 // seek forward
 while(video_chunk_pos<demuxer->idx_size){
 --skip_audio_bytes;
 }
 --video_chunk_pos;
 }
 }
-demuxer->idx_pos_a=demuxer->idx_pos_v=
+demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=video_chunk_pos;
-demuxer->idx_pos=video_chunk_pos;
 //      printf("%d frames skipped\n",skip_audio_bytes);
 #if 1
 // re-calc video pts:
-avi_video_pts=0;
+d_video->pack_no=0;
 for(i=0;i<video_chunk_pos;i++){
 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
-//          if(LOWORD(id)==aviTWOCC('0','0')){ // video frame
+if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
-if(avi_stream_id(id)==d_video->id){  // video frame
-avi_video_pts+=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-}
 }
+avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
 //printf("v-pts recalc! %5.3f -> %5.3f  \n",v_pts,avi_video_pts);
 //v_pts=avi_video_pts;
 //#else
 //avi_video_pts=v_pts;
 #endif
 #endif
 // find audio chunk pos:
 for(i=0;i<video_chunk_pos;i++){
 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
-//if(TWOCCFromFOURCC(id)==cktypeWAVEbytes){
 if(avi_stream_id(id)==d_audio->id){
-int aid=StreamFromFOURCC(id);
-if(d_audio->id==aid || d_audio->id==-1){
 len=((AVIINDEXENTRY *)demuxer->idx)[i].dwChunkLength;
 last=i;
 if(apos<=curr_audio_pos && curr_audio_pos<(apos+len)){
 if(verbose)printf("break;\n");
 break;
 }
 apos+=len;
-}
 }
 }
 if(verbose)printf("XXX i=%d  last=%d  apos=%d  curr_audio_pos=%d  \n",
 i,last,apos,curr_audio_pos);
 //          audio_chunk_pos=last; // maybe wrong (if not break; )
 skip_audio_bytes=curr_audio_pos-apos;
 // update stream position:
 d_audio->pos=audio_chunk_pos;
 d_audio->dpos=apos;
-demuxer->idx_pos_a=demuxer->idx_pos_v=
+demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=audio_chunk_pos;
-demuxer->idx_pos=audio_chunk_pos;
 if(!(sh_audio->codec->flags&CODECS_FLAG_SEEKABLE)){
 #if 0
 //             curr_audio_pos=apos; // selected audio codec can't seek in chunk
 skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf->nAvgBytesPerSec;
 //      skip_audio_bytes=bytes to skip from that chunk
 //      skip_audio_secs=time to play audio before video (if can't skip)
 // calc skip_video_frames & adjust video pts counter:
 //          i=last;
-i=demuxer->idx_pos;
+	  for(i=demuxer->idx_pos;i<video_chunk_pos;i++){
-while(i<video_chunk_pos){
 int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
-//            if(LOWORD(id)==aviTWOCC('0','0')){ // video frame
+if(avi_stream_id(id)==d_video->id) ++skip_video_frames;
-if(avi_stream_id(id)==d_video->id){  // video frame
-++skip_video_frames;
-// requires for correct audio pts calculation (demuxer):
-avi_video_pts-=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-}
-++i;
 }
+// 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,
 //====================== re-sync audio: =====================
 if(has_audio){
 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
+//d_audio->pts=0; // PTS is outdated because of the raw data skipping
 }
 current_module="resync_audio";
 switch(sh_audio->codec->driver){
 }
 }
 }
 }
+current_module=NULL;
 RESET_AUDIO(audio_fd);
-current_module=NULL;
 c_total=0; // kell ez?
 printf("A:%6.1f  V:%6.1f  A-V:%7.3f",d_audio->pts,d_video->pts,0.0f);
 printf("  ct:%7.3f   \r",c_total);fflush(stdout);
 } else {
 printf("A: ---   V:%6.1f   \r",d_video->pts);fflush(stdout);
 }
 max_pts_correction=0.1;
-frame_corr_num=-5; frame_correction=0;
+frame_corr_num=0; // -5
+frame_correction=0;
 force_redraw=5;
 a_frame=-skip_audio_secs;
 //      a_frame=-audio_delay-buffer_delay-skip_audio_secs;
 v_frame=0; // !!!!!!
 audio_time_usage=0; video_time_usage=0; vout_time_usage=0;

Mercurial > mplayer.hg

comparison mplayer.c @ 889:1b905517c684