Mercurial > mplayer.hg
changeset 12151:75fdb659f5bf
round len to outburst and increment full_buffers at the correct time, patch by Nehal <nehalmistry at gmx.net>
| author | faust3 |
|---|---|
| date | Wed, 07 Apr 2004 17:53:42 +0000 |
| parents | 2c9a2b1772bc |
| children | 5a946ba77df5 |
| files | libao2/ao_sdl.c libao2/ao_win32.c |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_sdl.c Wed Apr 07 13:00:33 2004 +0000 +++ b/libao2/ao_sdl.c Wed Apr 07 17:53:42 2004 +0000 @@ -66,12 +66,13 @@ x=BUFFSIZE-buf_write_pos; if(x>len) x=len; memcpy(buffer[buf_write]+buf_write_pos,data+len2,x); + if (buf_write_pos==0) + ++full_buffers; len2+=x; len-=x; buffered_bytes+=x; buf_write_pos+=x; if(buf_write_pos>=BUFFSIZE){ // block is full, find next! buf_write=(buf_write+1)%NUM_BUFS; - ++full_buffers; buf_write_pos=0; } } @@ -316,6 +317,7 @@ // return: number of bytes played static int play(void* data,int len,int flags){ + len = (len/ao_data.outburst)*ao_data.outburst; #if 0 int ret;
--- a/libao2/ao_win32.c Wed Apr 07 13:00:33 2004 +0000 +++ b/libao2/ao_win32.c Wed Apr 07 17:53:42 2004 +0000 @@ -1,6 +1,6 @@ /****************************************************************************** * ao_win32.c: Windows waveOut interface for MPlayer - * Copyright (c) 2002 Sascha Sommer <saschasommer@freenet.de>. + * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer@freenet.de>. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -220,6 +220,7 @@ x=BUFFER_SIZE-buf_write_pos; if(x>len) x=len; memcpy(current->lpData+buf_write_pos,data+len2,x); + if(buf_write_pos==0)full_buffers++; len2+=x; len-=x; buffered_bytes+=x; buf_write_pos+=x; //prepare header and write data to device @@ -230,7 +231,6 @@ if(buf_write_pos>=BUFFER_SIZE){ //buffer is full find next // block is full, find next! buf_write=(buf_write+1)%BUFFER_COUNT; - ++full_buffers; buf_write_pos=0; } } @@ -242,6 +242,7 @@ // return: number of bytes played static int play(void* data,int len,int flags) { + len = (len/ao_data.outburst)*ao_data.outburst; return write_waveOutBuffer(data,len); }