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

allocate buffer on demand

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-21 06:09:19 +00:00
parent 03b5a724e9
commit 9c23f35047
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+14 -9
View File
@@ -10,8 +10,8 @@ static const int channels = 2;
static const int bytes_per_frame = channels*2; /* 16-bit */ static const int bytes_per_frame = channels*2; /* 16-bit */
static int frames_to_buffer; static int frames_to_buffer;
static const int num_chunks = 8; /* 512 is about 10ms, which is big enough for the tolerance of most schedulers. */
static int chunksize() { return frames_to_buffer / num_chunks; } static int chunksize() { return 512; }
static int underruns = 0, logged_underruns = 0; static int underruns = 0, logged_underruns = 0;
@@ -22,15 +22,20 @@ RageSound_Generic_Software::sound::sound()
available = true; available = true;
} }
void RageSound_Generic_Software::sound::Init() void RageSound_Generic_Software::sound::Allocate( int frames )
{ {
/* Reserve enough blocks in the buffer to hold the buffer. Add one, to account for /* Reserve enough blocks in the buffer to hold the buffer. Add one, to account for
* the fact that we may have a partial block due to a previous Mix() call. */ * the fact that we may have a partial block due to a previous Mix() call. */
const int frames_per_block = samples_per_block / channels; const int frames_per_block = samples_per_block / channels;
const int blocks_to_prebuffer = frames_to_buffer / frames_per_block; const int blocks_to_prebuffer = frames / frames_per_block;
buffer.reserve( blocks_to_prebuffer + 1 ); buffer.reserve( blocks_to_prebuffer + 1 );
} }
void RageSound_Generic_Software::sound::Deallocate()
{
buffer.reserve( 0 );
}
int RageSound_Generic_Software::DecodeThread_start( void *p ) int RageSound_Generic_Software::DecodeThread_start( void *p )
{ {
((RageSound_Generic_Software *) p)->DecodeThread(); ((RageSound_Generic_Software *) p)->DecodeThread();
@@ -59,8 +64,9 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
if( s.state == sound::HALTING ) if( s.state == sound::HALTING )
{ {
/* This indicates that this stream can be reused. */ /* This indicates that this stream can be reused. */
s.Deallocate();
s.state = sound::STOPPED; s.state = sound::STOPPED;
s.available = true; s.available = true; /* do this last */
// LOG->Trace("set %p from HALTING to STOPPED", sounds[i].snd); // LOG->Trace("set %p from HALTING to STOPPED", sounds[i].snd);
continue; continue;
@@ -295,6 +301,9 @@ void RageSound_Generic_Software::StartMixing( RageSoundBase *snd )
s.volume = snd->GetVolume(); s.volume = snd->GetVolume();
s.buffer.clear(); s.buffer.clear();
/* Initialize the sound buffer. */
s.Allocate( frames_to_buffer );
// LOG->Trace("StartMixing(%s) (%p)", s.snd->GetLoadedFilePath().c_str(), s.snd ); // LOG->Trace("StartMixing(%s) (%p)", s.snd->GetLoadedFilePath().c_str(), s.snd );
/* Prebuffer some frames before changing the sound to PLAYING. */ /* Prebuffer some frames before changing the sound to PLAYING. */
@@ -355,10 +364,6 @@ void RageSound_Generic_Software::StartDecodeThread()
{ {
ASSERT( !m_DecodeThread.IsCreated() ); ASSERT( !m_DecodeThread.IsCreated() );
/* Initialize the sound buffers, now that frames_to_buffer is finalized. */
for( unsigned i = 0; i < ARRAYSIZE(sounds); ++i )
sounds[i].Init();
m_DecodeThread.Create( DecodeThread_start, this ); m_DecodeThread.Create( DecodeThread_start, this );
} }
stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.h
+2 -1
View File
@@ -121,7 +121,8 @@ private:
} state; } state;
sound(); sound();
void Init(); void Allocate( int frames );
void Deallocate();
}; };
/* List of currently playing sounds: XXX no vector */ /* List of currently playing sounds: XXX no vector */