yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use a better way to calculate the number of buffers

Browse source 
used by OGG/Vorbis. 24 buffers are enough for smooth
  and stutter free playback and ensure, that OGG_Stop()
  is effective nearly immediately.
- Change C99 comments to C89, since snd_vorbis.c is
  a C89 file. Caedes will beat me for this :/
This commit is contained in:
Yamagi Burmeister 2012-04-23 07:59:39 +00:00
parent 3d7013e12b
commit 3bce2a212a
1 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/client/sound/snd_vorbis.c
View file

@ -54,6 +54,7 @@ cvar_t *ogg_sequence; /* Sequence play indicator. */
cvar_t *ogg_volume; /* Music volume. */
OggVorbis_File ovFile; /* Ogg Vorbis file. */
vorbis_info *ogg_info; /* Ogg Vorbis file information */
int ogg_numbufs; /* Number of buffers for OpenAL */
/*
* Initialize the Ogg Vorbis subsystem.
@ -583,6 +584,7 @@ OGG_Stop ( void )
ov_clear( &ovFile );
ogg_status = STOP;
ogg_info = NULL;
ogg_numbufs = 0;
if ( ogg_buffer != NULL )
{
@ -606,24 +608,32 @@ OGG_Stream ( void )
if ( ogg_status == PLAY )
{
#ifdef USE_OPENAL
if( sound_started == SS_OAL )
if ( sound_started == SS_OAL )
{
/* Calculate the number of buffers used
for storing decoded OGG/Vorbis data.
We take the number of active buffers
at startup (at this point most of the
samples should be precached and loaded
into buffers) and add 24. Empircal
testing showed, that at most times
at least 12 buffers remain available
for OGG/Vorbis, enough for about 0.5
seconds playback. The music won't
stutter as long as the framerate
stayes over 3 FPS. */
if ( ogg_numbufs == 0 )
{
ogg_numbufs = active_buffers + 24;
}
/* active_buffers are all active OpenAL buffers,
buffering normal sfx _and_ ogg/vorbis samples.
Empirical testing showed that there are most
likly never more than 256 sfx buffers active.
Read ogg samples into buffers until there are
384 active buffers. This keeps at least 128
ogg buffers (128 * 4096 Byte = 512 KByte) in
the memory. That's about 30 second of music
playback, more than enough to rule out buffer
underruns even at very, very, very low frame
rates. */
while ( active_buffers <= 384 )
buffering normal sfx _and_ ogg/vorbis samples. */
while ( active_buffers <= ogg_numbufs )
{
OGG_Read();
}
} else { // using DMA/SDL
} else { /* using DMA/SDL */
#endif
/* Read that number samples into the buffer, that
were played since the last call to this function.
@ -634,9 +644,9 @@ OGG_Stream ( void )
OGG_Read();
}
#ifdef USE_OPENAL
} // using DMA/SDL
} /* using DMA/SDL */
#endif
} // ogg_status == PLAY
} /* ogg_status == PLAY */
}
@ -722,6 +732,7 @@ OGG_PauseCmd ( void )
if ( ogg_status == PLAY )
{
ogg_status = PAUSE;
ogg_numbufs = 0;
}
}