/*
- Copyright (C) 2003-2004 Mathieu Olivier
+ Copyright (C) 2003-2005 Mathieu Olivier
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
{
const char* dllnames_vo [] =
{
-#ifdef WIN32
+#if defined(WIN64)
+ "vorbis64.dll",
+#elif defined(WIN32)
"vorbis.dll",
#elif defined(MACOSX)
"libvorbis.dylib",
};
const char* dllnames_vf [] =
{
-#ifdef WIN32
+#if defined(WIN64)
+ "vorbisfile64.dll",
+#elif defined(WIN32)
"vorbisfile.dll",
#elif defined(MACOSX)
"libvorbisfile.dylib",
*/
#define STREAM_BUFFER_DURATION 1.5f // 1.5 sec
+#define STREAM_BUFFER_SIZE(format_ptr) (ceil (STREAM_BUFFER_DURATION * ((format_ptr)->speed * (format_ptr)->width * (format_ptr)->channels)))
// We work with 1 sec sequences, so this buffer must be able to contain
// 1 sec of sound of the highest quality (48 KHz, 16 bit samples, stereo)
ogg_stream_perchannel_t* per_ch;
sfxbuffer_t* sb;
sfx_t* sfx;
+ snd_format_t* format;
ogg_stream_persfx_t* per_sfx;
int newlength, done, ret, bigendian;
unsigned int factor;
size_t buff_len;
- per_ch = ch->fetcher_data;
+ per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
sfx = ch->sfx;
- per_sfx = sfx->fetcher_data;
- buff_len = ceil (STREAM_BUFFER_DURATION * (sfx->format.speed * sfx->format.width * sfx->format.channels));
+ per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+ format = &sfx->format;
+ buff_len = STREAM_BUFFER_SIZE(format);
// If there's no fetcher structure attached to the channel yet
if (per_ch == NULL)
{
+ size_t memsize;
ogg_stream_persfx_t* per_sfx;
- per_ch = Mem_Alloc (sfx->mempool, sizeof (*per_ch) - sizeof (per_ch->sb.data) + buff_len);
- per_sfx = sfx->fetcher_data;
+ memsize = sizeof (*per_ch) - sizeof (per_ch->sb.data) + buff_len;
+ per_ch = (ogg_stream_perchannel_t *)Mem_Alloc (snd_mempool, memsize);
+ sfx->memsize += memsize;
+ per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
// Open it with the VorbisFile API
per_ch->ov_decode.buffer = per_sfx->file;
if (sb->offset <= start && sb->offset + sb->length >= start + nbsamples)
return sb;
- newlength = sb->offset + sb->length - start;
+ newlength = (int)(sb->offset + sb->length) - start;
// If we need to skip some data before decompressing the rest, or if the stream has looped
if (newlength < 0 || sb->offset > start)
newlength = per_sfx->format.speed * factor; // -> 1 sec of sound before resampling
// Decompress in the resampling_buffer
-#if BYTE_ORDER == LITTLE_ENDIAN
- bigendian = 0;
-#else
+#if BYTE_ORDER == BIG_ENDIAN
bigendian = 1;
+#else
+ bigendian = 0;
#endif
done = 0;
- while ((ret = qov_read (&per_ch->vf, &resampling_buffer[done], (int)(newlength - done), bigendian, 2, 1, &per_ch->bs)) > 0)
+ while ((ret = qov_read (&per_ch->vf, (char *)&resampling_buffer[done], (int)(newlength - done), bigendian, 2, 1, &per_ch->bs)) > 0)
done += ret;
// Resample in the sfxbuffer
- newlength = ResampleSfx (resampling_buffer, (size_t)done / factor, &per_sfx->format, sb->data + sb->length * factor, sfx->name);
- sb->length += newlength;
+ newlength = (int)ResampleSfx (resampling_buffer, (size_t)done / (size_t)factor, &per_sfx->format, sb->data + sb->length * (size_t)factor, sfx->name);
+ sb->length += newlength;
return sb;
}
{
ogg_stream_perchannel_t* per_ch;
- per_ch = ch->fetcher_data;
+ per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
if (per_ch != NULL)
{
+ size_t buff_len;
+ snd_format_t* format;
+
// Free the ogg vorbis decoder
qov_clear (&per_ch->vf);
Mem_Free (per_ch);
ch->fetcher_data = NULL;
+
+ format = &ch->sfx->format;
+ buff_len = STREAM_BUFFER_SIZE(format);
+ ch->sfx->memsize -= sizeof (*per_ch) - sizeof (per_ch->sb.data) + buff_len;
}
}
-static const snd_fetcher_t ogg_fetcher = { OGG_FetchSound, OGG_FetchEnd };
+
+/*
+====================
+OGG_FreeSfx
+====================
+*/
+static void OGG_FreeSfx (sfx_t* sfx)
+{
+ ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+
+ // Free the Ogg Vorbis file
+ Mem_Free(per_sfx->file);
+ sfx->memsize -= per_sfx->filesize;
+
+ // Free the stream structure
+ Mem_Free(per_sfx);
+ sfx->memsize -= sizeof (*per_sfx);
+
+ sfx->fetcher_data = NULL;
+ sfx->fetcher = NULL;
+}
+
+static const snd_fetcher_t ogg_fetcher = { OGG_FetchSound, OGG_FetchEnd, OGG_FreeSfx };
/*
if (!vf_dll)
return false;
- Mem_FreePool (&s->mempool);
- s->mempool = Mem_AllocPool (s->name, 0, NULL);
+ // Already loaded?
+ if (s->fetcher != NULL)
+ return true;
// Load the file
- data = FS_LoadFile (filename, s->mempool, false);
+ data = FS_LoadFile (filename, snd_mempool, false);
if (data == NULL)
- {
- Mem_FreePool (&s->mempool);
return false;
- }
Con_DPrintf ("Loading Ogg Vorbis file \"%s\"\n", filename);
if (qov_open_callbacks (&ov_decode, &vf, NULL, 0, callbacks) < 0)
{
Con_Printf ("error while opening Ogg Vorbis file \"%s\"\n", filename);
- Mem_FreePool (&s->mempool);
+ Mem_Free(data);
return false;
}
Con_Printf("%s has an unsupported number of channels (%i)\n",
s->name, vi->channels);
qov_clear (&vf);
- Mem_FreePool (&s->mempool);
+ Mem_Free(data);
return false;
}
// Decide if we go for a stream or a simple PCM cache
buff_len = ceil (STREAM_BUFFER_DURATION * (shm->format.speed * 2 * vi->channels));
- if (snd_streaming.integer && len > fs_filesize + 3 * buff_len)
+ if (snd_streaming.integer && len > (ogg_int64_t)fs_filesize + 3 * buff_len)
{
ogg_stream_persfx_t* per_sfx;
Con_DPrintf ("\"%s\" will be streamed\n", filename);
- per_sfx = Mem_Alloc (s->mempool, sizeof (*per_sfx));
+ per_sfx = (ogg_stream_persfx_t *)Mem_Alloc (snd_mempool, sizeof (*per_sfx));
+ s->memsize += sizeof (*per_sfx);
per_sfx->file = data;
per_sfx->filesize = fs_filesize;
+ s->memsize += fs_filesize;
per_sfx->format.speed = vi->rate;
per_sfx->format.width = 2; // We always work with 16 bits samples
int bs, bigendian;
long ret;
sfxbuffer_t *sb;
+ size_t memsize;
Con_DPrintf ("\"%s\" will be cached\n", filename);
// Decode it
- buff = Mem_Alloc (s->mempool, (int)len);
+ buff = (char *)Mem_Alloc (snd_mempool, (int)len);
done = 0;
bs = 0;
#if BYTE_ORDER == LITTLE_ENDIAN
len = (double)done * (double)shm->format.speed / (double)vi->rate;
// Resample it
- sb = Mem_Alloc (s->mempool, (size_t)len + sizeof (*sb) - sizeof (sb->data));
+ memsize = (size_t)len + sizeof (*sb) - sizeof (sb->data);
+ sb = (sfxbuffer_t *)Mem_Alloc (snd_mempool, memsize);
+ s->memsize += memsize;
s->fetcher_data = sb;
s->fetcher = &wav_fetcher;
s->format.speed = vi->rate;
s->loopstart = -1;
s->flags &= ~SFXFLAG_STREAMED;
- sb->length = ResampleSfx (buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
+ sb->length = (unsigned int)ResampleSfx ((qbyte *)buff, (size_t)done / (vi->channels * 2), &s->format, sb->data, s->name);
s->format.speed = shm->format.speed;
s->total_length = sb->length;
sb->offset = 0;
projects / xonotic / darkplaces.git / blobdiff