qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

this seems to fix the "end of file" issues on streams

Browse source
This commit is contained in:
Bill Currie 2003-04-26 04:30:07 +00:00
parent b6b5089ccc
commit 4a73d5dc45
5 changed files with 76 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/snd_render.h
View file

@ -60,6 +60,7 @@ struct sfxbuffer_s {
unsigned int bps; // bytes per sample: 1 2 4 usually unsigned int bps; // bytes per sample: 1 2 4 usually
void (*paint) (channel_t *ch, sfxbuffer_t *buffer, int count); void (*paint) (channel_t *ch, sfxbuffer_t *buffer, int count);
void (*advance) (sfxbuffer_t *buffer, unsigned int count); void (*advance) (sfxbuffer_t *buffer, unsigned int count);
void (*setpos) (sfxbuffer_t *buffer, unsigned int pos);
sfx_t *sfx; sfx_t *sfx;
byte data[4]; byte data[4];
}; };
@ -147,6 +148,7 @@ void SND_CacheRelease (sfx_t *sfx);
sfxbuffer_t *SND_StreamRetain (sfx_t *sfx); sfxbuffer_t *SND_StreamRetain (sfx_t *sfx);
void SND_StreamRelease (sfx_t *sfx); void SND_StreamRelease (sfx_t *sfx);
void SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count); void SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count);
void SND_StreamSetPos (sfxbuffer_t *buffer, unsigned int pos);
void SND_WriteLinearBlastStereo16 (void); void SND_WriteLinearBlastStereo16 (void);
void SND_PaintChannelFrom8 (channel_t *ch, sfxbuffer_t *sc, int count); void SND_PaintChannelFrom8 (channel_t *ch, sfxbuffer_t *sc, int count);

103
libs/audio/renderer/snd_mem.c
View file

@ -156,16 +156,77 @@ read_samples (sfxbuffer_t *buffer, int count, void *prev)
} }
} }
static void
fill_buffer (sfx_t *sfx, sfxstream_t *stream, sfxbuffer_t *buffer,
wavinfo_t *info, unsigned int headpos)
{
void *prev;
unsigned int samples;
unsigned int loop_samples = 0;
// find out how many samples can be read into the buffer
samples = buffer->tail - buffer->head - SAMPLE_GAP;
if (buffer->tail <= buffer->head)
samples += buffer->length;
if (headpos + samples > sfx->length) {
if (sfx->loopstart == (unsigned int)-1) {
samples = sfx->length - headpos;
} else {
loop_samples = headpos + samples - sfx->length;
samples -= loop_samples;
}
}
if (samples) {
if (buffer->head != buffer->tail) {
int s = buffer->head - 1;
if (!buffer->head)
s += buffer->length;
prev = buffer->data + s * buffer->bps;
} else {
prev = 0;
}
read_samples (buffer, samples, prev);
}
if (loop_samples) {
if (buffer->head != buffer->tail) {
int s = buffer->head - 1;
if (!buffer->head)
s += buffer->length;
prev = buffer->data + s * buffer->bps;
} else {
prev = 0;
}
stream->seek (stream->file, info->loopstart, info);
read_samples (buffer, loop_samples, prev);
}
}
void
SND_StreamSetPos (sfxbuffer_t *buffer, unsigned int pos)
{
float stepscale;
sfx_t *sfx = buffer->sfx;
sfxstream_t *stream = (sfxstream_t *) sfx->data;
wavinfo_t *info = &stream->wavinfo;
stepscale = (float) info->rate / shm->speed; // usually 0.5, 1, or 2
buffer->head = buffer->tail = 0;
buffer->pos = pos;
stream->pos = pos;
stream->seek (stream->file, buffer->pos * stepscale, info);
fill_buffer (sfx, stream, buffer, info, pos);
}
void void
SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count) SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count)
{ {
float stepscale; float stepscale;
unsigned int headpos, samples; unsigned int headpos, samples;
unsigned int loop_samples = 0;
sfx_t *sfx = buffer->sfx; sfx_t *sfx = buffer->sfx;
sfxstream_t *stream = (sfxstream_t *) sfx->data; sfxstream_t *stream = (sfxstream_t *) sfx->data;
wavinfo_t *info = &stream->wavinfo; wavinfo_t *info = &stream->wavinfo;
void *prev;
stream->pos += count; stream->pos += count;
count = (stream->pos - buffer->pos) & ~255; count = (stream->pos - buffer->pos) & ~255;
@ -223,43 +284,7 @@ SND_StreamAdvance (sfxbuffer_t *buffer, unsigned int count)
if (buffer->tail >= buffer->length) if (buffer->tail >= buffer->length)
buffer->tail -= buffer->length; buffer->tail -= buffer->length;
} }
fill_buffer (sfx, stream, buffer, info, headpos);
// find out how many samples can be read into the buffer
samples = buffer->tail - buffer->head - SAMPLE_GAP;
if (buffer->tail <= buffer->head)
samples += buffer->length;
if (headpos + samples > sfx->length) {
if (sfx->loopstart == (unsigned int)-1) {
samples = sfx->length - headpos;
} else {
loop_samples = headpos + samples - sfx->length;
samples -= loop_samples;
}
}
if (samples) {
if (buffer->head != buffer->tail) {
int s = buffer->head - 1;
if (!buffer->head)
s += buffer->length;
prev = buffer->data + s * buffer->bps;
} else {
prev = 0;
}
read_samples (buffer, samples, prev);
}
if (loop_samples) {
if (buffer->head != buffer->tail) {
int s = buffer->head - 1;
if (!buffer->head)
s += buffer->length;
prev = buffer->data + s * buffer->bps;
} else {
prev = 0;
}
stream->seek (stream->file, info->loopstart, info);
read_samples (buffer, loop_samples, prev);
}
} }
void void

24
libs/audio/renderer/snd_mix.c
View file

@ -423,11 +423,9 @@ SND_PaintChannelFrom8 (channel_t *ch, sfxbuffer_t *sc, int count)
unsigned int pos; unsigned int pos;
byte *samps; byte *samps;
if (ch->pos < sc->pos)
sc->setpos (sc, ch->pos);
pos = (ch->pos - sc->pos + sc->tail) % sc->length; pos = (ch->pos - sc->pos + sc->tail) % sc->length;
if (pos < 0) { // FIXME need a better way to handle shared streams
pos = sc->tail;
ch->pos = sc->pos;
}
samps = sc->data + pos; samps = sc->data + pos;
if (pos + count > sc->length) { if (pos + count > sc->length) {
@ -446,11 +444,9 @@ SND_PaintChannelFrom16 (channel_t *ch, sfxbuffer_t *sc, int count)
unsigned int pos; unsigned int pos;
short *samps; short *samps;
if (ch->pos < sc->pos)
sc->setpos (sc, ch->pos);
pos = (ch->pos - sc->pos + sc->tail) % sc->length; pos = (ch->pos - sc->pos + sc->tail) % sc->length;
if (pos < 0) { // FIXME need a better way to handle shared streams
pos = sc->tail;
ch->pos = sc->pos;
}
samps = (short *) sc->data + pos; samps = (short *) sc->data + pos;
if (pos + count > sc->length) { if (pos + count > sc->length) {
@ -469,11 +465,9 @@ SND_PaintChannelStereo8 (channel_t *ch, sfxbuffer_t *sc, int count)
unsigned int pos; unsigned int pos;
short *samps; short *samps;
if (ch->pos < sc->pos)
sc->setpos (sc, ch->pos);
pos = (ch->pos - sc->pos + sc->tail) % sc->length; pos = (ch->pos - sc->pos + sc->tail) % sc->length;
if (pos < 0) { // FIXME need a better way to handle shared streams
pos = sc->tail;
ch->pos = sc->pos;
}
samps = (short *) sc->data + pos; samps = (short *) sc->data + pos;
if (pos + count > sc->length) { if (pos + count > sc->length) {
@ -492,11 +486,9 @@ SND_PaintChannelStereo16 (channel_t *ch, sfxbuffer_t *sc, int count)
unsigned int pos; unsigned int pos;
int *samps; int *samps;
if (ch->pos < sc->pos)
sc->setpos (sc, ch->pos);
pos = (ch->pos - sc->pos + sc->tail) % sc->length; pos = (ch->pos - sc->pos + sc->tail) % sc->length;
if (pos < 0) { // FIXME need a better way to handle shared streams
pos = sc->tail;
ch->pos = sc->pos;
}
samps = (int *) sc->data + pos; samps = (int *) sc->data + pos;
if (pos + count > sc->length) { if (pos + count > sc->length) {

1
libs/audio/renderer/vorbis.c
View file

@ -298,6 +298,7 @@ vorbis_stream_open (sfx_t *_sfx)
stream->buffer.length = samples; stream->buffer.length = samples;
stream->buffer.advance = SND_StreamAdvance; stream->buffer.advance = SND_StreamAdvance;
stream->buffer.setpos = SND_StreamSetPos;
stream->buffer.sfx = sfx; stream->buffer.sfx = sfx;
stream->resample (&stream->buffer, 0, 0, 0); // get sfx setup properly stream->resample (&stream->buffer, 0, 0, 0); // get sfx setup properly

1
libs/audio/renderer/wav.c
View file

@ -162,6 +162,7 @@ wav_stream_open (sfx_t *_sfx)
stream->buffer.length = samples; stream->buffer.length = samples;
stream->buffer.advance = SND_StreamAdvance; stream->buffer.advance = SND_StreamAdvance;
stream->buffer.setpos = SND_StreamSetPos;
stream->buffer.sfx = sfx; stream->buffer.sfx = sfx;
stream->resample (&stream->buffer, 0, 0, 0); // get sfx setup properly stream->resample (&stream->buffer, 0, 0, 0); // get sfx setup properly