actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

obscure fixes for large writeaheads

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-22 23:04:59 +00:00
parent e3c6b2cb34
commit 73e36c6234
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/DSoundHelpers.cpp
+27 -16
View File
@@ -143,7 +143,7 @@ DSoundBuf::DSoundBuf(DSound &ds, DSoundBuf::hw hardware,
/* The size of the actual DSound buffer. This can be large; we generally /* The size of the actual DSound buffer. This can be large; we generally
* won't fill it completely. */ * won't fill it completely. */
buffersize = 1024*64; buffersize = 1024*64;
buffersize = min( buffersize, writeahead ); buffersize = max( buffersize, writeahead );
WAVEFORMATEX waveformat; WAVEFORMATEX waveformat;
memset(&waveformat, 0, sizeof(waveformat)); memset(&waveformat, 0, sizeof(waveformat));
@@ -302,6 +302,20 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int chunksize)
} }
#endif #endif
/* Update buffer_bytes_filled. */
{
int first_byte_filled = write_cursor-buffer_bytes_filled;
if( first_byte_filled < 0 )
first_byte_filled += buffersize; /* unwrap */
int current_cursor = cursorstart;
if( current_cursor < first_byte_filled )
current_cursor += buffersize;
/* The number of bytes that have been played since the last time we got here: */
int bytes_played = current_cursor - first_byte_filled;
buffer_bytes_filled -= bytes_played;
}
/* XXX We can figure out if we've underrun, and increase the write-ahead /* XXX We can figure out if we've underrun, and increase the write-ahead
* when it happens. Two problems: * when it happens. Two problems:
@@ -320,25 +334,22 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int chunksize)
{ {
int first_byte_filled = write_cursor-buffer_bytes_filled; int first_byte_filled = write_cursor-buffer_bytes_filled;
if(first_byte_filled < 0) first_byte_filled += buffersize; /* unwrap */ if( first_byte_filled < 0 )
first_byte_filled += buffersize; /* unwrap */
int current_cursor = cursorstart;
if(current_cursor < first_byte_filled) current_cursor += buffersize;
/* The number of bytes that have been played since the last time we got here: */
int bytes_played = current_cursor - first_byte_filled;
buffer_bytes_filled -= bytes_played;
/* Data between the play cursor and the write cursor is committed to be /* Data between the play cursor and the write cursor is committed to be
* played. If we don't actually have data there, we've underrun. */ * played. If we don't actually have data there, we've underrun.
if(!contained(first_byte_filled, write_cursor, cursorstart) || * (If buffer_bytes_filled == buffersize, then it's full, and can't be
!contained(first_byte_filled, write_cursor, cursorend)) * an underrun.) */
if( buffer_bytes_filled < writeahead &&
(!contained(first_byte_filled, write_cursor, cursorstart) ||
!contained(first_byte_filled, write_cursor, cursorend)) )
{ {
int missed_by = cursorend - write_cursor; int missed_by = cursorend - write_cursor;
wrap( missed_by, buffersize ); wrap( missed_by, buffersize );
LOG->Trace("underrun: %i..%i filled but cursor at %i..%i (missed it by %i)", LOG->Trace("underrun %p: %i..%i filled but cursor at %i..%i (missed it by %i) %i/%i",
first_byte_filled, write_cursor, cursorstart, cursorend, this, first_byte_filled, write_cursor, cursorstart, cursorend,
missed_by); missed_by, buffer_bytes_filled, buffersize);
// (cursorend - first_byte_filled + buffersize) % buffersize); // (cursorend - first_byte_filled + buffersize) % buffersize);
/* Pretend the space between the play and write cursor is filled /* Pretend the space between the play and write cursor is filled
@@ -359,7 +370,7 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int chunksize)
if(buffer_bytes_filled > writeahead) if(buffer_bytes_filled > writeahead)
return false; return false;
int num_bytes_empty = buffersize-buffer_bytes_filled; int num_bytes_empty = writeahead-buffer_bytes_filled;
/* num_bytes_empty is the amount of free buffer space. If it's /* num_bytes_empty is the amount of free buffer space. If it's
* too small, come back later. */ * too small, come back later. */