X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_ogg.c;h=fb21b93a16e48eb5397aa3f9bb60cb75ec8410b6;hb=f5b602ea082842a416c64c63e2b3e00585624945;hp=508614086ca88244115c5b8024718f83a1fc63b9;hpb=78ab889bd7db440684fdf33877e4b56005047609;p=xonotic%2Fdarkplaces.git

diff --git a/snd_ogg.c b/snd_ogg.c
index 50861408..fb21b93a 100644
--- a/snd_ogg.c
+++ b/snd_ogg.c
@@ -25,7 +25,6 @@
 #include "quakedef.h"
 #include "snd_main.h"
 #include "snd_ogg.h"
-#include "snd_wav.h"
 
 
 /*
@@ -219,7 +218,6 @@ static dllfunction_t vorbisfilefuncs[] =
 	{"ov_clear",				(void **) &qov_clear},
 	{"ov_info",					(void **) &qov_info},
 	{"ov_comment",				(void **) &qov_comment},
-	{"vorbis_comment_query",	(void **) &qvorbis_comment_query},
 	{"ov_open_callbacks",		(void **) &qov_open_callbacks},
 	{"ov_pcm_seek",				(void **) &qov_pcm_seek},
 	{"ov_pcm_total",			(void **) &qov_pcm_total},
@@ -354,16 +352,7 @@ qboolean OGG_OpenLibrary (void)
 	// 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, vorbisfuncs) ||
-		! Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs))
-	{
-		Sys_UnloadLibrary (&vo_dll);
-		Con_Printf ("Ogg Vorbis support disabled\n");
-		return false;
-	}
-
-	Con_Printf ("Ogg Vorbis support enabled\n");
-	return true;
+	return Sys_LoadLibrary (dllnames_vo, &vo_dll, vorbisfuncs) && Sys_LoadLibrary (dllnames_vf, &vf_dll, vorbisfilefuncs);
 }
 
 
@@ -389,20 +378,14 @@ void OGG_CloseLibrary (void)
 =================================================================
 */
 
-#define STREAM_BUFFER_DURATION 1.5f	// 1.5 sec
-#define STREAM_BUFFER_SIZE(format_ptr) ((int)(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)
-static unsigned char resampling_buffer [48000 * 2 * 2];
-
-
 // Per-sfx data structure
 typedef struct
 {
 	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
@@ -423,20 +406,15 @@ static const ov_callbacks callbacks = {ovcb_read, ovcb_seek, ovcb_close, ovcb_te
 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;
+	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;
-
 	// If there's no fetcher structure attached to the channel yet
 	if (per_ch == NULL)
 	{
@@ -450,7 +428,6 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 		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;
@@ -458,7 +435,7 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 		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;
 		}
@@ -469,7 +446,7 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 		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;
@@ -500,10 +477,10 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 		ogg_int64_t ogg_start;
 		int err;
 
-		if (real_start > (unsigned int)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;
 		}
 
@@ -519,7 +496,7 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 		}
 		sb->nbframes = 0;
 
-		real_start = (float)ogg_start / per_sfx->format.speed * snd_renderbuffer->format.speed;
+		real_start = (unsigned int) ((float)ogg_start / per_sfx->format.speed * snd_renderbuffer->format.speed);
 		if (*start - real_start + nbsampleframes > sb->maxframes)
 		{
 			Con_Printf ("OGG_FetchSound: stream buffer too small after seek (%u sample frames required)\n",
@@ -537,16 +514,19 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 
 	per_ch->sb_offset = real_start;
 
-	// 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 (sb->format.speed + sb->nbframes > sb->maxframes)
+	// We add more than one frame of sound to the buffer:
+	// 1- to ensure we won't lose many samples during the resampling process
+	// 2- to reduce calls to OGG_FetchSound to regulate workload
+	newlength = (int)(per_sfx->format.speed*STREAM_BUFFER_FILL);
+	if (newlength + sb->nbframes > sb->maxframes)
 	{
 		Con_Printf ("OGG_FetchSound: stream buffer overflow (%u sample frames / %u)\n",
 					sb->format.speed + sb->nbframes, sb->maxframes);
 		return NULL;
 	}
-	newlength = per_sfx->format.speed * factor;  // -> 1 sec of sound before resampling
+	newlength *= factor; // convert from sample frames to bytes
+	if(newlength > (int)sizeof(resampling_buffer))
+		newlength = sizeof(resampling_buffer);
 
 	// Decompress in the resampling_buffer
 #if BYTE_ORDER == BIG_ENDIAN
@@ -570,23 +550,16 @@ static const snd_buffer_t* OGG_FetchSound (channel_t* ch, unsigned int* start, u
 OGG_FetchEnd
 ====================
 */
-static void OGG_FetchEnd (channel_t* ch)
+static void OGG_FetchEnd (void *chfetcherdata)
 {
-	ogg_stream_perchannel_t* per_ch;
+	ogg_stream_perchannel_t* per_ch = (ogg_stream_perchannel_t *)chfetcherdata;
 
-	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;
 	}
 }
 
@@ -596,20 +569,15 @@ static void OGG_FetchEnd (channel_t* ch)
 OGG_FreeSfx
 ====================
 */
-static void OGG_FreeSfx (sfx_t* sfx)
+static void OGG_FreeSfx (void *sfxfetcherdata)
 {
-	ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfx->fetcher_data;
+	ogg_stream_persfx_t* per_sfx = (ogg_stream_persfx_t *)sfxfetcherdata;
 
 	// 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;
 }
 
 
@@ -626,6 +594,56 @@ static const snd_format_t* OGG_GetFormat (sfx_t* sfx)
 
 static const snd_fetcher_t ogg_fetcher = { OGG_FetchSound, OGG_FetchEnd, OGG_FreeSfx, OGG_GetFormat };
 
+static void OGG_DecodeTags(vorbis_comment *vc, unsigned int *start, unsigned int *length, double samplesfactor, 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)
+	{
+		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
+		}
+	}
+
+	if(startcomment)
+	{
+		*start = (unsigned int) bound(0, atof(startcomment) * samplesfactor, numsamples);
+		if(endcomment)
+			*length = (unsigned int) bound(0, atof(endcomment) * samplesfactor, numsamples);
+		else if(lengthcomment)
+			*length = (unsigned int) bound(0, *start + atof(lengthcomment) * samplesfactor, numsamples);
+	}
+}
 
 /*
 ====================
@@ -637,13 +655,14 @@ Load an Ogg Vorbis file into memory
 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;
+	ogg_stream_persfx_t* per_sfx;
 	vorbis_info *vi;
 	vorbis_comment *vc;
-	ogg_int64_t len, buff_len;
+	ogg_int64_t len;
+	double peak, gaindb;
 
 	if (!vf_dll)
 		return false;
@@ -657,7 +676,8 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
 	if (data == NULL)
 		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;
@@ -683,91 +703,34 @@ qboolean OGG_LoadVorbisFile (const char *filename, sfx_t *sfx)
 
 	len = qov_pcm_total (&vf, -1) * vi->channels * 2;  // 16 bits => "* 2"
 
-	// Decide if we go for a stream or a simple PCM cache
-	buff_len = (int)ceil (STREAM_BUFFER_DURATION * (snd_renderbuffer->format.speed * 2 * vi->channels));
-	if (snd_streaming.integer && len > (ogg_int64_t)filesize + 3 * buff_len)
+	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));
+	strlcpy(per_sfx->name, sfx->name, sizeof(per_sfx->name));
+	sfx->memsize += sizeof (*per_sfx);
+	per_sfx->file = data;
+	per_sfx->filesize = filesize;
+	sfx->memsize += 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;
+
+	sfx->fetcher_data = per_sfx;
+	sfx->fetcher = &ogg_fetcher;
+	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));
+	vc = qov_comment(&vf, -1);
+	OGG_DecodeTags(vc, &sfx->loopstart, &sfx->total_length, (double)snd_renderbuffer->format.speed / (double)per_sfx->format.speed, sfx->total_length, &peak, &gaindb);
+	per_sfx->total_length = sfx->total_length;
+	qov_clear (&vf);
+
+	if(peak)
 	{
-		ogg_stream_persfx_t* per_sfx;
-
-		Con_DPrintf ("\"%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 = filesize;
-		sfx->memsize += 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;
-
-		sfx->fetcher_data = per_sfx;
-		sfx->fetcher = &ogg_fetcher;
-		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));
-		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
-	{
-		char *buff;
-		ogg_int64_t done;
-		int bs, bigendian;
-		long ret;
-		snd_buffer_t *sb;
-		snd_format_t ogg_format;
-
-		Con_DPrintf ("\"%s\" will be cached\n", filename);
-
-		// Decode it
-		buff = (char *)Mem_Alloc (snd_mempool, (int)len);
-		done = 0;
-		bs = 0;
-#if BYTE_ORDER == BIG_ENDIAN
-		bigendian = 1;
-#else
-		bigendian = 0;
-#endif
-		while ((ret = qov_read (&vf, &buff[done], (int)(len - done), bigendian, 2, 1, &bs)) > 0)
-			done += ret;
-
-		// Build the sound buffer
-		ogg_format.speed = vi->rate;
-		ogg_format.channels = vi->channels;
-		ogg_format.width = 2;  // We always work with 16 bits samples
-		sb = Snd_CreateSndBuffer ((unsigned char *)buff, (size_t)done / (vi->channels * 2), &ogg_format, snd_renderbuffer->format.speed);
-		if (sb == NULL)
-		{
-			qov_clear (&vf);
-			Mem_Free (data);
-			Mem_Free (buff);
-			return false;
-		}
-
-		sfx->fetcher = &wav_fetcher;
-		sfx->fetcher_data = sb;
-
-		sfx->total_length = sb->nbframes;
-		sfx->memsize += sb->maxframes * sb->format.channels * sb->format.width + sizeof (*sb) - sizeof (sb->samples);
-
-		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);
-		Mem_Free (buff);
+		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);
 	}
 
 	return true;