RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 20:00:56 +00:00
Code Issues Releases Wiki Activity

Always write full buffers in ao_win32, except for the last block.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28853 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-03-06 18:50:50 +00:00
parent 79df4b2499
commit 7ee7bd3d5b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libao2/ao_win32.c
View File

@ -172,6 +172,7 @@ static int init(int rate,int channels,int format,int flags)
ao_data.bps=channels*rate; ao_data.bps=channels*rate;
if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8) if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8)
ao_data.bps*=2; ao_data.bps*=2;
ao_data.outburst = BUFFER_SIZE;
if(ao_data.buffersize==-1) if(ao_data.buffersize==-1)
{ {
ao_data.buffersize=af_fmt2bits(format)/8; ao_data.buffersize=af_fmt2bits(format)/8;
@ -298,22 +299,18 @@ static int write_waveOutBuffer(unsigned char* data,int len){
//unprepare the header if it is prepared //unprepare the header if it is prepared
if(current->dwFlags & WHDR_PREPARED) if(current->dwFlags & WHDR_PREPARED)
waveOutUnprepareHeader(hWaveOut, current, sizeof(WAVEHDR)); waveOutUnprepareHeader(hWaveOut, current, sizeof(WAVEHDR));
x=BUFFER_SIZE-buf_write_pos; x=BUFFER_SIZE;
if(x>len) x=len; if(x>len) x=len;
fast_memcpy(current->lpData+buf_write_pos,data+len2,x); fast_memcpy(current->lpData+buf_write_pos,data+len2,x);
if(buf_write_pos==0)full_buffers++; full_buffers++;
len2+=x; len-=x; len2+=x; len-=x;
buffered_bytes+=x; buf_write_pos+=x; buffered_bytes+=x;
//prepare header and write data to device //prepare header and write data to device
current->dwBufferLength = buf_write_pos; current->dwBufferLength = x;
waveOutPrepareHeader(hWaveOut, current, sizeof(WAVEHDR)); waveOutPrepareHeader(hWaveOut, current, sizeof(WAVEHDR));
waveOutWrite(hWaveOut, current, sizeof(WAVEHDR)); waveOutWrite(hWaveOut, current, sizeof(WAVEHDR));
if(buf_write_pos>=BUFFER_SIZE){ //buffer is full find next
// block is full, find next!
buf_write=(buf_write+1)%BUFFER_COUNT; buf_write=(buf_write+1)%BUFFER_COUNT;
buf_write_pos=0;
}
} }
return len2; return len2;
} }