diff options
author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-17 16:31:42 +0000 |
---|---|---|
committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-17 16:31:42 +0000 |
commit | 6867264ec4c918011aadceee09cc86a0d5ee90c9 (patch) | |
tree | 0c2b67709ae15a19eddf6574052bf6956fd27b0c /mplayer.c | |
parent | 1cfdfe73be05f98ed2911a326348e9a0d19d7011 (diff) | |
download | mpv-6867264ec4c918011aadceee09cc86a0d5ee90c9.tar.bz2 mpv-6867264ec4c918011aadceee09cc86a0d5ee90c9.tar.xz |
Include buffered decoded audio in A-V sync calculations.
Patch by Uoti Urpala, uoti<<dot>>urpala<<at>>pp1<<dot>>inet<<dot>>fi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18130 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -3494,8 +3494,7 @@ while(sh_audio){ 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 @@ if(time_frame>0.001 && !(vo_flags&256)){ -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; |