Add GL_ExtensionSupported in vid_null.c because vid_shared.c relies on
[xonotic/darkplaces.git] / snd_ogg.c
index 989903f..683d421 100644 (file)
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -1,5 +1,5 @@
 /*
-       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
 
 
 #include "quakedef.h"
+#include "snd_main.h"
 #include "snd_ogg.h"
 #include "snd_wav.h"
 
+#ifdef LINK_TO_LIBVORBIS
+#define OV_EXCLUDE_STATIC_CALLBACKS
+#include <ogg/ogg.h>
+#include <vorbis/vorbisfile.h>
+
+#define qov_clear ov_clear
+#define qov_info ov_info
+#define qov_comment ov_comment
+#define qov_open_callbacks ov_open_callbacks
+#define qov_pcm_seek ov_pcm_seek
+#define qov_pcm_total ov_pcm_total
+#define qov_read ov_read
+#define qvorbis_comment_query vorbis_comment_query
+
+qboolean OGG_OpenLibrary (void) {return true;}
+void OGG_CloseLibrary (void) {}
+#else
 
 /*
 =================================================================
@@ -159,6 +177,14 @@ typedef struct
 
 typedef struct
 {
+       char **user_comments;
+       int   *comment_lengths;
+       int    comments;
+       char  *vendor;
+} vorbis_comment;
+
+typedef struct
+{
        void                            *datasource;
        int                                     seekable;
        ogg_int64_t                     offset;
@@ -170,7 +196,7 @@ typedef struct
        long                            *serialnos;
        ogg_int64_t                     *pcmlengths;
        vorbis_info                     *vi;
-       void                            *vc;  // VOIDED POINTER
+       vorbis_comment          *vc;
        ogg_int64_t                     pcm_offset;
        int                                     ready_state;
        long                            current_serialno;
@@ -195,6 +221,8 @@ typedef struct
 // Functions exported from the vorbisfile library
 static int (*qov_clear) (OggVorbis_File *vf);
 static vorbis_info* (*qov_info) (OggVorbis_File *vf,int link);
+static vorbis_comment* (*qov_comment) (OggVorbis_File *vf,int link);
+static char * (*qvorbis_comment_query) (vorbis_comment *vc, const char *tag, int count);
 static int (*qov_open_callbacks) (void *datasource, OggVorbis_File *vf,
                                                                  char *initial, long ibytes,
                                                                  ov_callbacks callbacks);
@@ -203,27 +231,119 @@ static ogg_int64_t (*qov_pcm_total) (OggVorbis_File *vf,int i);
 static long (*qov_read) (OggVorbis_File *vf,char *buffer,int length,
                                                 int bigendianp,int word,int sgned,int *bitstream);
 
-static dllfunction_t oggvorbisfuncs[] =
+static dllfunction_t vorbisfilefuncs[] =
+{
+       {"ov_clear",                            (void **) &qov_clear},
+       {"ov_info",                                     (void **) &qov_info},
+       {"ov_comment",                          (void **) &qov_comment},
+       {"ov_open_callbacks",           (void **) &qov_open_callbacks},
+       {"ov_pcm_seek",                         (void **) &qov_pcm_seek},
+       {"ov_pcm_total",                        (void **) &qov_pcm_total},
+       {"ov_read",                                     (void **) &qov_read},
+       {NULL, NULL}
+};
+
+static dllfunction_t vorbisfuncs[] =
 {
-       {"ov_clear",                    (void **) &qov_clear},
-       {"ov_info",                             (void **) &qov_info},
-       {"ov_open_callbacks",   (void **) &qov_open_callbacks},
-       {"ov_pcm_seek",                 (void **) &qov_pcm_seek},
-       {"ov_pcm_total",                (void **) &qov_pcm_total},
-       {"ov_read",                             (void **) &qov_read},
+       {"vorbis_comment_query",        (void **) &qvorbis_comment_query},
        {NULL, NULL}
 };
 
-// Handle for the Vorbisfile DLL
+// Handles for the Vorbis and Vorbisfile DLLs
+static dllhandle_t vo_dll = NULL;
 static dllhandle_t vf_dll = NULL;
 
+
+/*
+=================================================================
+
+  DLL load & unload
+
+=================================================================
+*/
+
+/*
+====================
+OGG_OpenLibrary
+
+Try to load the VorbisFile DLL
+====================
+*/
+qboolean OGG_OpenLibrary (void)
+{
+       const char* dllnames_vo [] =
+       {
+#if defined(WIN32)
+               "libvorbis-0.dll",
+               "libvorbis.dll",
+               "vorbis.dll",
+#elif defined(MACOSX)
+               "libvorbis.dylib",
+#else
+               "libvorbis.so.0",
+               "libvorbis.so",
+#endif
+               NULL
+       };
+       const char* dllnames_vf [] =
+       {
+#if defined(WIN32)
+               "libvorbisfile-3.dll",
+               "libvorbisfile.dll",
+               "vorbisfile.dll",
+#elif defined(MACOSX)
+               "libvorbisfile.dylib",
+#else
+               "libvorbisfile.so.3",
+               "libvorbisfile.so",
+#endif
+               NULL
+       };
+
+       // Already loaded?
+       if (vf_dll)
+               return true;
+
+// COMMANDLINEOPTION: Sound: -novorbis disables ogg vorbis sound support
+       if (COM_CheckParm("-novorbis"))
+               return false;
+
+       // Load the DLLs
+       // We need to load both by hand because some OSes seem to not load
+       // the vorbis DLL automatically when loading the VorbisFile DLL
+       return Sys_LoadLibrary (dllnames_vo, &vo_dll, vorbisfuncs) && Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs);
+}
+
+
+/*
+====================
+OGG_CloseLibrary
+
+Unload the VorbisFile DLL
+====================
+*/
+void OGG_CloseLibrary (void)
+{
+       Sys_UnloadLibrary (&vf_dll);
+       Sys_UnloadLibrary (&vo_dll);
+}
+
+#endif
+
+/*
+=================================================================
+
+       Ogg Vorbis decoding
+
+=================================================================
+*/
+
 typedef struct
 {
-       qbyte *buffer;
+       unsigned char *buffer;
        ogg_int64_t ind, buffsize;
 } ov_decode_t;
 
-
 static size_t ovcb_read (void *ptr, size_t size, size_t nb, void *datasource)
 {
        ov_decode_t *ov_decode = (ov_decode_t*)datasource;
@@ -274,85 +394,11 @@ static long ovcb_tell (void *ov_decode)
        return ((ov_decode_t*)ov_decode)->ind;
 }
 
-
-/*
-=================================================================
-
-  DLL load & unload
-
-=================================================================
-*/
-
-/*
-====================
-OGG_OpenLibrary
-
-Try to load the VorbisFile DLL
-====================
-*/
-qboolean OGG_OpenLibrary (void)
-{
-       const char* dllname;
-
-       // Already loaded?
-       if (vf_dll)
-               return true;
-
-       if (COM_CheckParm("-novorbis"))
-               return false;
-
-#ifdef WIN32
-       dllname = "vorbisfile.dll";
-#else
-       dllname = "libvorbisfile.so";
-#endif
-
-       // Load the DLL
-       if (! Sys_LoadLibrary (dllname, &vf_dll, oggvorbisfuncs))
-       {
-               Con_Printf ("Ogg Vorbis support disabled\n");
-               return false;
-       }
-
-       Con_Printf ("Ogg Vorbis support enabled\n");
-       return true;
-}
-
-
-/*
-====================
-OGG_CloseLibrary
-
-Unload the VorbisFile DLL
-====================
-*/
-void OGG_CloseLibrary (void)
-{
-       Sys_UnloadLibrary (&vf_dll);
-}
-
-
-/*
-=================================================================
-
-       Ogg Vorbis decoding
-
-=================================================================
-*/
-
-#define STREAM_BUFFER_DURATION 1.5f    // 1.5 sec
-
-// 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)
-static qbyte resampling_buffer [48000 * 2 * 2];
-
-
 // Per-sfx data structure
 typedef struct
 {
-       qbyte                   *file;
+       unsigned char   *file;
        size_t                  filesize;
-       snd_format_t    format;
 } ogg_stream_persfx_t;
 
 // Per-channel data structure
@@ -361,7 +407,9 @@ typedef struct
        OggVorbis_File  vf;
        ov_decode_t             ov_decode;
        int                             bs;
-       sfxbuffer_t             sb;             // must be at the end due to its dynamically allocated size
+       int                             buffer_firstframe;
+       int                             buffer_numframes;
+       unsigned char   buffer[STREAM_BUFFERSIZE*4];
 } ogg_stream_perchannel_t;
 
 
@@ -369,136 +417,182 @@ static const ov_callbacks callbacks = {ovcb_read, ovcb_seek, ovcb_close, ovcb_te
 
 /*
 ====================
-OGG_FetchSound
+OGG_GetSamplesFloat
 ====================
 */
-static const sfxbuffer_t* OGG_FetchSound (channel_t* ch, unsigned int start, unsigned int nbsamples)
+static void OGG_GetSamplesFloat (channel_t *ch, sfx_t *sfx, int firstsampleframe, int numsampleframes, float *outsamplesfloat)
 {
-       ogg_stream_perchannel_t* per_ch;
-       sfxbuffer_t* sb;
-       sfx_t* sfx;
-       ogg_stream_persfx_t* per_sfx;
-       int newlength, done, ret, bigendian;
-       unsigned int factor;
-       size_t buff_len;
-
-       per_ch = 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));
-
-       // If there's no fetcher structure attached to the channel yet
+       ogg_stream_perchannel_t *per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
+       ogg_stream_persfx_t *per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+       int f = sfx->format.width * sfx->format.channels; // bytes per frame in the buffer
+       short *buf;
+       int i, len;
+       int newlength, done, ret;
+
+       // if this channel does not yet have a channel fetcher, make one
        if (per_ch == NULL)
        {
-               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;
-
-               // Open it with the VorbisFile API
+               // allocate a struct to keep track of our file position and buffer
+               per_ch = (ogg_stream_perchannel_t *)Mem_Alloc(snd_mempool, sizeof(*per_ch));
+               // begin decoding the file
                per_ch->ov_decode.buffer = per_sfx->file;
                per_ch->ov_decode.ind = 0;
                per_ch->ov_decode.buffsize = per_sfx->filesize;
-               if (qov_open_callbacks (&per_ch->ov_decode, &per_ch->vf, NULL, 0, callbacks) < 0)
+               if (qov_open_callbacks(&per_ch->ov_decode, &per_ch->vf, NULL, 0, callbacks) < 0)
                {
-                       Con_Printf("error while reading Ogg Vorbis stream \"%s\"\n", sfx->name);
-                       Mem_Free (per_ch);
-                       return NULL;
+                       // this never happens - this function succeeded earlier on the same data
+                       Mem_Free(per_ch);
+                       return;
                }
-
-               per_ch->sb.offset = 0;
-               per_ch->sb.length = 0;
                per_ch->bs = 0;
-
-               ch->fetcher_data = per_ch;
+               per_ch->buffer_firstframe = 0;
+               per_ch->buffer_numframes = 0;
+               // attach the struct to our channel
+               ch->fetcher_data = (void *)per_ch;
        }
 
-       sb = &per_ch->sb;
-       factor = per_sfx->format.width * per_sfx->format.channels;
-
-       // If the stream buffer can't contain that much samples anyway
-       if (nbsamples * factor > buff_len)
+       // if the request is too large for our buffer, loop...
+       while (numsampleframes * f > (int)sizeof(per_ch->buffer))
        {
-               Con_Printf ("OGG_FetchSound: stream buffer too small (%u bytes required)\n", nbsamples * factor);
-               return NULL;
+               done = sizeof(per_ch->buffer) / f;
+               OGG_GetSamplesFloat(ch, sfx, firstsampleframe, done, outsamplesfloat);
+               firstsampleframe += done;
+               numsampleframes -= done;
+               outsamplesfloat += done * sfx->format.channels;
        }
 
-       // If the data we need has already been decompressed in the sfxbuffer, just return it
-       if (sb->offset <= start && sb->offset + sb->length >= start + nbsamples)
-               return sb;
-
-       newlength = 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)
+       // seek if the request is before the current buffer (loop back)
+       // seek if the request starts beyond the current buffer by at least one frame (channel was zero volume for a while)
+       // do not seek if the request overlaps the buffer end at all (expected behavior)
+       if (per_ch->buffer_firstframe > firstsampleframe || per_ch->buffer_firstframe + per_ch->buffer_numframes < firstsampleframe)
        {
-               if (qov_pcm_seek (&per_ch->vf, (ogg_int64_t)start) != 0)
-                       return NULL;
-
-               sb->offset = start;
-               sb->length = 0;
-               newlength = 0;
-       }
-       // Else, move forward the samples we need to keep in the sfxbuffer
-       else
-       {
-               memmove (sb->data, sb->data + (start - sb->offset) * factor, newlength * factor);
-               sb->offset = start;
-               sb->length = newlength;
+               // we expect to decode forward from here so this will be our new buffer start
+               per_ch->buffer_firstframe = firstsampleframe;
+               per_ch->buffer_numframes = 0;
+               ret = qov_pcm_seek(&per_ch->vf, (ogg_int64_t)firstsampleframe);
+               if (ret != 0)
+               {
+                       // LordHavoc: we can't Con_Printf here, not thread safe...
+                       //Con_Printf("OGG_FetchSound: qov_pcm_seek(..., %d) returned %d\n", firstsampleframe, ret);
+                       return;
+               }
        }
 
-       // We add exactly 1 sec of sound to the buffer:
-       // 1- to ensure we won't lose any sample during the resampling process
-       // 2- to force one call to OGG_FetchSound per second to regulate the workload
-       if ((sfx->format.speed + sb->length) * factor > buff_len)
+       // decompress the file as needed
+       if (firstsampleframe + numsampleframes > per_ch->buffer_firstframe + per_ch->buffer_numframes)
        {
-               Con_Printf ("OGG_FetchSound: stream buffer overflow (%u bytes / %u)\n",
-                                       (sfx->format.speed + sb->length) * factor, buff_len);
-               return NULL;
+               // first slide the buffer back, discarding any data preceding the range we care about
+               int offset = firstsampleframe - per_ch->buffer_firstframe;
+               int keeplength = per_ch->buffer_numframes - offset;
+               if (keeplength > 0)
+                       memmove(per_ch->buffer, per_ch->buffer + offset * sfx->format.width * sfx->format.channels, keeplength * sfx->format.width * sfx->format.channels);
+               per_ch->buffer_firstframe = firstsampleframe;
+               per_ch->buffer_numframes -= offset;
+               // decompress as much as we can fit in the buffer
+               newlength = sizeof(per_ch->buffer) - per_ch->buffer_numframes * f;
+               done = 0;
+               while (newlength > done && (ret = qov_read(&per_ch->vf, (char *)per_ch->buffer + per_ch->buffer_numframes * f + done, (int)(newlength - done), mem_bigendian, 2, 1, &per_ch->bs)) > 0)
+                       done += ret;
+               // clear the missing space if any
+               if (done < newlength)
+                       memset(per_ch->buffer + done, 0, newlength - done);
+               // we now have more data in the buffer
+               per_ch->buffer_numframes += done / f;
        }
-       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
-       bigendian = 1;
-#endif
-       done = 0;
-       while ((ret = qov_read (&per_ch->vf, &resampling_buffer[done], (int)(newlength - done), bigendian, 2, 1, &per_ch->bs)) > 0)
-               done += ret;
+       // convert the sample format for the caller
+       buf = (short *)((char *)per_ch->buffer + (firstsampleframe - per_ch->buffer_firstframe) * f);
+       len = numsampleframes * sfx->format.channels;
+       for (i = 0;i < len;i++)
+               outsamplesfloat[i] = buf[i] * (1.0f / 32768.0f);
+}
 
-       // 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;
 
-       return sb;
+/*
+====================
+OGG_StopChannel
+====================
+*/
+static void OGG_StopChannel(channel_t *ch)
+{
+       ogg_stream_perchannel_t *per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
+       if (per_ch != NULL)
+       {
+               // release the vorbis decompressor
+               qov_clear(&per_ch->vf);
+               Mem_Free(per_ch);
+       }
 }
 
 
 /*
 ====================
-OGG_FetchEnd
+OGG_FreeSfx
 ====================
 */
-static void OGG_FetchEnd (channel_t* ch)
+static void OGG_FreeSfx(sfx_t *sfx)
 {
-       ogg_stream_perchannel_t* per_ch;
+       ogg_stream_persfx_t *per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+       // free the complete file we were keeping around
+       Mem_Free(per_sfx->file);
+       // free the file information structure
+       Mem_Free(per_sfx);
+}
 
-       per_ch = ch->fetcher_data;
-       if (per_ch != NULL)
+
+static const snd_fetcher_t ogg_fetcher = {OGG_GetSamplesFloat, OGG_StopChannel, OGG_FreeSfx};
+
+static void OGG_DecodeTags(vorbis_comment *vc, unsigned int *start, unsigned int *length, unsigned int numsamples, double *peak, double *gaindb)
+{
+       const char *startcomment = NULL, *lengthcomment = NULL, *endcomment = NULL, *thiscomment = NULL;
+
+       *start = numsamples;
+       *length = numsamples;
+       *peak = 0.0;
+       *gaindb = 0.0;
+
+       if(!vc)
+               return;
+
+       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_PEAK", 0);
+       if(thiscomment)
+               *peak = atof(thiscomment);
+       thiscomment = qvorbis_comment_query(vc, "REPLAYGAIN_TRACK_GAIN", 0);
+       if(thiscomment)
+               *gaindb = atof(thiscomment);
+       
+       startcomment = qvorbis_comment_query(vc, "LOOP_START", 0); // DarkPlaces, and some Japanese app
+       if(startcomment)
        {
-               // Free the ogg vorbis decoder
-               qov_clear (&per_ch->vf);
+               endcomment = qvorbis_comment_query(vc, "LOOP_END", 0);
+               if(!endcomment)
+                       lengthcomment = qvorbis_comment_query(vc, "LOOP_LENGTH", 0);
+       }
+       else
+       {
+               startcomment = qvorbis_comment_query(vc, "LOOPSTART", 0); // RPG Maker VX
+               if(startcomment)
+               {
+                       lengthcomment = qvorbis_comment_query(vc, "LOOPLENGTH", 0);
+                       if(!lengthcomment)
+                               endcomment = qvorbis_comment_query(vc, "LOOPEND", 0);
+               }
+               else
+               {
+                       startcomment = qvorbis_comment_query(vc, "LOOPPOINT", 0); // Sonic Robo Blast 2
+               }
+       }
 
-               Mem_Free (per_ch);
-               ch->fetcher_data = NULL;
+       if(startcomment)
+       {
+               *start = (unsigned int) bound(0, atof(startcomment), numsamples);
+               if(endcomment)
+                       *length = (unsigned int) bound(0, atof(endcomment), numsamples);
+               else if(lengthcomment)
+                       *length = (unsigned int) bound(0, *start + atof(lengthcomment), numsamples);
        }
 }
 
-static const snd_fetcher_t ogg_fetcher = { OGG_FetchSound, OGG_FetchEnd };
-
-
 /*
 ====================
 OGG_LoadVorbisFile
@@ -506,121 +600,118 @@ OGG_LoadVorbisFile
 Load an Ogg Vorbis file into memory
 ====================
 */
-qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *s)
+qboolean OGG_LoadVorbisFile(const char *filename, sfx_t *sfx)
 {
-       qbyte *data;
+       unsigned char *data;
+       fs_offset_t filesize;
        ov_decode_t ov_decode;
        OggVorbis_File vf;
        vorbis_info *vi;
-       ogg_int64_t len, buff_len;
+       vorbis_comment *vc;
+       double peak, gaindb;
 
+#ifndef LINK_TO_LIBVORBIS
        if (!vf_dll)
                return false;
+#endif
 
-       Mem_FreePool (&s->mempool);
-       s->mempool = Mem_AllocPool (s->name, 0, NULL);
+       // Return if already loaded
+       if (sfx->fetcher != NULL)
+               return true;
 
-       // Load the file
-       data = FS_LoadFile (filename, s->mempool, false);
+       // Load the file completely
+       data = FS_LoadFile(filename, snd_mempool, false, &filesize);
        if (data == NULL)
-       {
-               Mem_FreePool (&s->mempool);
                return false;
-       }
 
-       Con_DPrintf ("Loading Ogg Vorbis file \"%s\"\n", filename);
+       if (developer_loading.integer >= 2)
+               Con_Printf("Loading Ogg Vorbis file \"%s\"\n", filename);
 
        // Open it with the VorbisFile API
        ov_decode.buffer = data;
        ov_decode.ind = 0;
-       ov_decode.buffsize = fs_filesize;
-       if (qov_open_callbacks (&ov_decode, &vf, NULL, 0, callbacks) < 0)
+       ov_decode.buffsize = filesize;
+       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);
+               Con_Printf("error while opening Ogg Vorbis file \"%s\"\n", filename);
+               Mem_Free(data);
                return false;
        }
 
        // Get the stream information
-       vi = qov_info (&vf, -1);
+       vi = qov_info(&vf, -1);
        if (vi->channels < 1 || vi->channels > 2)
        {
                Con_Printf("%s has an unsupported number of channels (%i)\n",
-                                       s->name, vi->channels);
+                                       sfx->name, vi->channels);
                qov_clear (&vf);
-               Mem_FreePool (&s->mempool);
+               Mem_Free(data);
                return false;
        }
 
-       len = qov_pcm_total (&vf, -1) * vi->channels * 2;  // 16 bits => "* 2"
+       sfx->format.speed = vi->rate;
+       sfx->format.channels = vi->channels;
+       sfx->format.width = 2;  // We always work with 16 bits samples
 
-       // 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)
+       sfx->total_length = qov_pcm_total(&vf, -1);
+
+       if (snd_streaming.integer && (snd_streaming.integer >= 2 || sfx->total_length > max(sizeof(ogg_stream_perchannel_t), snd_streaming_length.value * sfx->format.speed)))
        {
+               // large sounds use the OGG fetcher to decode the file on demand (but the entire file is held in memory)
                ogg_stream_persfx_t* per_sfx;
-
-               Con_DPrintf ("\"%s\" will be streamed\n", filename);
-               per_sfx = Mem_Alloc (s->mempool, sizeof (*per_sfx));
+               if (developer_loading.integer >= 2)
+                       Con_Printf("Ogg sound file \"%s\" will be streamed\n", filename);
+               per_sfx = (ogg_stream_persfx_t *)Mem_Alloc(snd_mempool, sizeof(*per_sfx));
+               sfx->memsize += sizeof (*per_sfx);
                per_sfx->file = data;
-               per_sfx->filesize = fs_filesize;
-
-               per_sfx->format.speed = vi->rate;
-               per_sfx->format.width = 2;  // We always work with 16 bits samples
-               per_sfx->format.channels = vi->channels;
-               s->format.speed = shm->format.speed;
-               s->format.width = per_sfx->format.width;
-               s->format.channels = per_sfx->format.channels;
-
-               s->fetcher_data = per_sfx;
-               s->fetcher = &ogg_fetcher;
-               s->loopstart = -1;
-               s->flags |= SFXFLAG_STREAMED;
-               s->total_length = (size_t)len / per_sfx->format.channels / 2 * ((float)s->format.speed / per_sfx->format.speed);
+               per_sfx->filesize = filesize;
+               sfx->memsize += filesize;
+               sfx->fetcher_data = per_sfx;
+               sfx->fetcher = &ogg_fetcher;
+               sfx->flags |= SFXFLAG_STREAMED;
+               vc = qov_comment(&vf, -1);
+               OGG_DecodeTags(vc, &sfx->loopstart, &sfx->total_length, sfx->total_length, &peak, &gaindb);
+               qov_clear(&vf);
        }
        else
        {
+               // small sounds are entirely loaded and use the PCM fetcher
                char *buff;
+               ogg_int64_t len;
                ogg_int64_t done;
-               int bs, bigendian;
+               int bs;
                long ret;
-               sfxbuffer_t *sb;
-
-               Con_DPrintf ("\"%s\" will be streamed\n", filename);
-
-               // Decode it
-               buff = Mem_Alloc (s->mempool, (int)len);
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" will be cached\n", filename);
+               len = sfx->total_length * sfx->format.channels * sfx->format.width;
+               sfx->flags &= ~SFXFLAG_STREAMED;
+               sfx->memsize += len;
+               sfx->fetcher = &wav_fetcher;
+               sfx->fetcher_data = Mem_Alloc(snd_mempool, (size_t)len);
+               buff = (char *)sfx->fetcher_data;
                done = 0;
                bs = 0;
-#if BYTE_ORDER == LITTLE_ENDIAN
-               bigendian = 0;
-#else
-               bigendian = 1;
-#endif
-               while ((ret = qov_read (&vf, &buff[done], (int)(len - done), bigendian, 2, 1, &bs)) > 0)
+               while ((ret = qov_read(&vf, &buff[done], (int)(len - done), mem_bigendian, 2, 1, &bs)) > 0)
                        done += ret;
+               vc = qov_comment(&vf, -1);
+               OGG_DecodeTags(vc, &sfx->loopstart, &sfx->total_length, sfx->total_length, &peak, &gaindb);
+               qov_clear(&vf);
+               Mem_Free(data);
+       }
 
-               // Calculate resampled length
-               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));
-               s->fetcher_data = sb;
-               s->fetcher = &wav_fetcher;
-               s->format.speed = vi->rate;
-               s->format.width = 2;  // We always work with 16 bits samples
-               s->format.channels = vi->channels;
-               s->loopstart = -1;
-               s->flags &= ~SFXFLAG_STREAMED;
-
-               sb->length = ResampleSfx (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;
-
-               qov_clear (&vf);
-               Mem_Free (data);
-               Mem_Free (buff);
+       if(peak)
+       {
+               sfx->volume_mult = min(1.0f / peak, exp(gaindb * 0.05f * log(10.0f)));
+               sfx->volume_peak = peak;
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" uses ReplayGain (gain %f, peak %f)\n", filename, sfx->volume_mult, sfx->volume_peak);
+       }
+       else if(gaindb != 0)
+       {
+               sfx->volume_mult = min(1.0f / peak, exp(gaindb * 0.05f * log(10.0f)));
+               sfx->volume_peak = 1.0; // if peak is not defined, we won't trust it
+               if (developer_loading.integer >= 2)
+                       Con_Printf ("Ogg sound file \"%s\" uses ReplayGain (gain %f, peak not defined and assumed to be %f)\n", filename, sfx->volume_mult, sfx->volume_peak);
        }
 
        return true;