[MPlayer-cvslog] CVS: main mplayer.c,1.929,1.930

[Corey Hickey CVS]

CVS change done by Corey Hickey CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv29678

Modified Files:
	mplayer.c 
Log Message:
Include buffered decoded audio in A-V sync calculations.
Patch by Uoti Urpala, uoti<<dot>>urpala<<at>>pp1<<dot>>inet<<dot>>fi


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.929
retrieving revision 1.930
diff -u -r1.929 -r1.930
--- mplayer.c	15 Apr 2006 09:36:53 -0000	1.929
+++ mplayer.c	17 Apr 2006 16:31:42 -0000	1.930
@@ -3494,8 +3494,7 @@
   if(playsize>0){
       sh_audio->a_out_buffer_len-=playsize;
       memmove(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[playsize],sh_audio->a_out_buffer_len);
-      sh_audio->delay+=playback_speed*playsize/((float)((ao_data.bps && sh_audio->afilter) ?
-          ao_data.bps : sh_audio->o_bps));
+      sh_audio->delay+=playback_speed*playsize/(float)ao_data.bps;
   }
 
   break;
@@ -3798,7 +3797,7 @@
 	  -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps,
 	  a_pts+(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps);
 #endif	  
-      a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+      a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps - sh_audio->a_out_buffer_len*playback_speed/(float)ao_data.bps;
     }
     v_pts=sh_video ? sh_video->pts : d_video->pts;