void *internal;
} vorbis_block;
+typedef struct
+{
+ char **user_comments;
+ int *comment_lengths;
+ int comments;
+ char *vendor;
+} vorbis_comment;
+
typedef struct
{
void *datasource;
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;
// 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, char *tag, int count);
static int (*qov_open_callbacks) (void *datasource, OggVorbis_File *vf,
char *initial, long ibytes,
ov_callbacks callbacks);
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_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},
+ {"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[] =
+{
+ {"vorbis_comment_query", (void **) &qvorbis_comment_query},
{NULL, NULL}
};
// 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
- if (! Sys_LoadLibrary (dllnames_vo, &vo_dll, NULL) ||
- ! Sys_LoadLibrary (dllnames_vf, &vf_dll, oggvorbisfuncs))
+ if (! Sys_LoadLibrary (dllnames_vo, &vo_dll, vorbisfuncs) ||
+ ! Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs))
{
Sys_UnloadLibrary (&vo_dll);
Con_Printf ("Ogg Vorbis support disabled\n");
unsigned char *file;
size_t filesize;
snd_format_t format;
+ unsigned int total_length;
+ char name[128];
} ogg_stream_persfx_t;
// Per-channel data structure
OGG_FetchSound
====================
*/
-static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, unsigned int nbsampleframes)
+static const snd_buffer_t* OGG_FetchSound (void *sfxfetcher, void **chfetcherpointer, unsigned int *start, unsigned int nbsampleframes)
{
- ogg_stream_perchannel_t* per_ch;
- sfx_t* sfx;
- ogg_stream_persfx_t* per_sfx;
- snd_format_t* ogg_format;
+ ogg_stream_perchannel_t* per_ch = (ogg_stream_perchannel_t *)*chfetcherpointer;
+ ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfxfetcher;
snd_buffer_t* sb;
int newlength, done, ret, bigendian;
unsigned int real_start;
unsigned int factor;
- per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
- sfx = ch->sfx;
- per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
- ogg_format = &per_sfx->format;
-
// If there's no fetcher structure attached to the channel yet
if (per_ch == NULL)
{
size_t buff_len, memsize;
+ snd_format_t sb_format;
+
+ sb_format.speed = snd_renderbuffer->format.speed;
+ sb_format.width = per_sfx->format.width;
+ sb_format.channels = per_sfx->format.channels;
- buff_len = STREAM_BUFFER_SIZE(ogg_format);
+ buff_len = STREAM_BUFFER_SIZE(&sb_format);
memsize = sizeof (*per_ch) - sizeof (per_ch->sb.samples) + buff_len;
per_ch = (ogg_stream_perchannel_t *)Mem_Alloc (snd_mempool, memsize);
- sfx->memsize += memsize;
// Open it with the VorbisFile API
per_ch->ov_decode.buffer = per_sfx->file;
per_ch->ov_decode.buffsize = per_sfx->filesize;
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);
+ Con_Printf("error while reading Ogg Vorbis stream \"%s\"\n", per_sfx->name);
Mem_Free (per_ch);
return NULL;
}
per_ch->bs = 0;
per_ch->sb_offset = 0;
- per_ch->sb.format.speed = snd_renderbuffer->format.speed;
- per_ch->sb.format.width = ogg_format->width;
- per_ch->sb.format.channels = ogg_format->channels;
+ per_ch->sb.format = sb_format;
per_ch->sb.nbframes = 0;
per_ch->sb.maxframes = buff_len / (per_ch->sb.format.channels * per_ch->sb.format.width);
- ch->fetcher_data = per_ch;
+ *chfetcherpointer = per_ch;
}
-
+
real_start = *start;
sb = &per_ch->sb;
unsigned int time_start;
ogg_int64_t ogg_start;
int err;
-
- if (real_start > sfx->total_length)
+
+ if (real_start > (unsigned int)per_sfx->total_length)
{
Con_Printf ("OGG_FetchSound: asked for a start position after the end of the sfx! (%u > %u)\n",
- real_start, sfx->total_length);
+ real_start, per_sfx->total_length);
return NULL;
}
return NULL;
}
newlength = per_sfx->format.speed * factor; // -> 1 sec of sound before resampling
+ if(newlength > (int)sizeof(resampling_buffer))
+ newlength = sizeof(resampling_buffer);
// Decompress in the resampling_buffer
#if BYTE_ORDER == BIG_ENDIAN
OGG_FetchEnd
====================
*/
-static void OGG_FetchEnd (channel_t* ch)
+static void OGG_FetchEnd (void **chfetcherpointer)
{
- ogg_stream_perchannel_t* per_ch;
+ ogg_stream_perchannel_t* per_ch = (ogg_stream_perchannel_t *)*chfetcherpointer;
- per_ch = (ogg_stream_perchannel_t *)ch->fetcher_data;
if (per_ch != NULL)
{
- size_t buff_len;
-
// Free the ogg vorbis decoder
qov_clear (&per_ch->vf);
- buff_len = per_ch->sb.maxframes * per_ch->sb.format.channels * per_ch->sb.format.width;
- ch->sfx->memsize -= sizeof (*per_ch) - sizeof (per_ch->sb.samples) + buff_len;
-
Mem_Free (per_ch);
- ch->fetcher_data = NULL;
}
+ *chfetcherpointer = NULL;
}
qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
{
unsigned char *data;
+ const char *loopcomment;
fs_offset_t filesize;
ov_decode_t ov_decode;
OggVorbis_File vf;
vorbis_info *vi;
+ vorbis_comment *vc;
ogg_int64_t len, buff_len;
if (!vf_dll)
Con_DPrintf ("\"%s\" will be streamed\n", filename);
per_sfx = (ogg_stream_persfx_t *)Mem_Alloc (snd_mempool, sizeof (*per_sfx));
+ strlcpy(per_sfx->name, sfx->name, sizeof(per_sfx->name));
sfx->memsize += sizeof (*per_sfx);
per_sfx->file = data;
per_sfx->filesize = filesize;
sfx->fetcher_data = per_sfx;
sfx->fetcher = &ogg_fetcher;
- sfx->loopstart = -1;
sfx->flags |= SFXFLAG_STREAMED;
- sfx->total_length = (int)((size_t)len / (per_sfx->format.channels * 2) * ((double)snd_renderbuffer->format.speed / per_sfx->format.speed));
+ per_sfx->total_length = sfx->total_length = (int)((size_t)len / (per_sfx->format.channels * 2) * ((double)snd_renderbuffer->format.speed / per_sfx->format.speed));
+ sfx->loopstart = sfx->total_length;
+ vc = qov_comment(&vf, -1);
+ if(vc)
+ {
+ loopcomment = qvorbis_comment_query(vc, "LOOP_START", 0);
+ if(loopcomment)
+ sfx->loopstart = bound(0, (unsigned int) (atof(loopcomment) * (double)snd_renderbuffer->format.speed / (double)per_sfx->format.speed), sfx->total_length);
+ }
}
else
{
sfx->total_length = sb->nbframes;
sfx->memsize += sb->maxframes * sb->format.channels * sb->format.width + sizeof (*sb) - sizeof (sb->samples);
- sfx->loopstart = -1;
+ sfx->loopstart = sfx->total_length;
sfx->flags &= ~SFXFLAG_STREAMED;
+ vc = qov_comment(&vf, -1);
+ if(vc)
+ {
+ loopcomment = qvorbis_comment_query(vc, "LOOP_START", 0);
+ if(loopcomment)
+ sfx->loopstart = bound(0, (unsigned int) (atoi(loopcomment) * (double)snd_renderbuffer->format.speed / (double)sb->format.speed), sfx->total_length);
+ }
qov_clear (&vf);
Mem_Free (data);
projects / xonotic / darkplaces.git / blobdiff