Refactor resampler code. Use Quake 3 wav codec

and delete most of snd_mem.c.

MacOSX/QuakeSpasm.xcodeproj/project.pbxproj

@@ -108,6 +108,7 @@
 		66A5470F12E3CF8100FFA7D5 /* snd_codec_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 66A5470C12E3CF8100FFA7D5 /* snd_codec_ogg.c */; };
 		66A5487A12E3EA6900FFA7D5 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66A5487912E3EA6900FFA7D5 /* Ogg.framework */; };
 		66A5487C12E3EA6E00FFA7D5 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66A5487B12E3EA6E00FFA7D5 /* Vorbis.framework */; };
+		66A54A4F12E429B800FFA7D5 /* snd_resample.c in Sources */ = {isa = PBXBuildFile; fileRef = 66A54A4E12E429B800FFA7D5 /* snd_resample.c */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -288,6 +289,7 @@
 		66A5470C12E3CF8100FFA7D5 /* snd_codec_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_codec_ogg.c; path = ../Quake/snd_codec_ogg.c; sourceTree = SOURCE_ROOT; };
 		66A5487912E3EA6900FFA7D5 /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Library/Frameworks/Ogg.framework; sourceTree = SDKROOT; };
 		66A5487B12E3EA6E00FFA7D5 /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = Library/Frameworks/Vorbis.framework; sourceTree = SDKROOT; };
+		66A54A4E12E429B800FFA7D5 /* snd_resample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_resample.c; path = ../Quake/snd_resample.c; sourceTree = SOURCE_ROOT; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -495,6 +497,7 @@
 				66A5470A12E3CF8100FFA7D5 /* snd_codec.c */,
 				66A5470B12E3CF8100FFA7D5 /* snd_codec_wav.c */,
 				66A5470C12E3CF8100FFA7D5 /* snd_codec_ogg.c */,
+				66A54A4E12E429B800FFA7D5 /* snd_resample.c */,
 			);
 			name = Sound;
 			sourceTree = "<group>";
@@ -770,6 +773,7 @@
 				66A5470D12E3CF8100FFA7D5 /* snd_codec.c in Sources */,
 				66A5470E12E3CF8100FFA7D5 /* snd_codec_wav.c in Sources */,
 				66A5470F12E3CF8100FFA7D5 /* snd_codec_ogg.c in Sources */,
+				66A54A4F12E429B800FFA7D5 /* snd_resample.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Quake/snd_codec.h

@@ -32,6 +32,7 @@ typedef struct snd_info_s
 	int samples;
 	int size;
 	int dataofs;
+	int loopstart; // -1 if not looped
 } snd_info_t;
 
 typedef struct snd_codec_s snd_codec_t;

Quake/snd_codec_wav.c

@@ -171,6 +171,31 @@ static qboolean S_ReadRIFFHeader( int file, snd_info_t *info)
 		Sys_FileSeekRelative( file, fmtlen );
 	}
 
+	// get cue chunk
+	// FIXME: port code
+	/*
+	FindChunk("cue ");
+	if (data_p)
+	{
+		data_p += 32;
+		info.loopstart = GetLittleLong();
+		
+		// if the next chunk is a LIST chunk, look for a cue length marker
+		FindNextChunk ("LIST");
+		if (data_p)
+		{
+			if (!strncmp (data_p + 28, "mark", 4))
+			{	// this is not a proper parse, but it works with cooledit...
+				data_p += 24;
+				i = GetLittleLong ();	// samples in loop
+				info.samples = info.loopstart + i;
+				//				Con_Printf("looped length: %i\n", i);
+			}
+		}
+	}
+	else*/
+		info->loopstart = -1;
+	
 	// Scan for the data chunk
 	if( (info->size = S_FindRIFFChunk(file, "data")) < 0)
 	{

Quake/snd_mem.c

@@ -21,74 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // snd_mem.c: sound caching
 
 #include "quakedef.h"
-
+#include "snd_codec.h"
-int			cache_full_cycle;
-
-byte *S_Alloc (int size);
-
-/*
-================
-ResampleSfx
-================
-*/
-void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
-{
-	int		outcount;
-	int		srcsample;
-	float	stepscale;
-	int		i;
-	int		sample, samplefrac, fracstep;
-	sfxcache_t	*sc;
-
-	sc = (sfxcache_t *) Cache_Check (&sfx->cache);
-	if (!sc)
-		return;
-
-	stepscale = (float)inrate / shm->speed;	// this is usually 0.5, 1, or 2
-
-	outcount = sc->length / stepscale;
-	sc->length = outcount;
-	if (sc->loopstart != -1)
-		sc->loopstart = sc->loopstart / stepscale;
-
-	sc->speed = shm->speed;
-	if (loadas8bit.value)
-		sc->width = 1;
-	else
-		sc->width = inwidth;
-	sc->stereo = 0;
-
-// resample / decimate to the current source rate
-
-	if (stepscale == 1 && inwidth == 1 && sc->width == 1)
-	{
-// fast special case
-		for (i=0 ; i<outcount ; i++)
-			((signed char *)sc->data)[i]
-			= (int)( (unsigned char)(data[i]) - 128);
-	}
-	else
-	{
-// general case
-		samplefrac = 0;
-		fracstep = stepscale*256;
-		for (i=0 ; i<outcount ; i++)
-		{
-			srcsample = samplefrac >> 8;
-			samplefrac += fracstep;
-			if (inwidth == 2)
-				sample = LittleShort ( ((short *)data)[srcsample] );
-			else
-				sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-			if (sc->width == 2)
-				((short *)sc->data)[i] = sample;
-			else
-				((signed char *)sc->data)[i] = sample >> 8;
-		}
-	}
-}
-
-//=============================================================================
 
 /*
 ==============
@@ -97,13 +30,11 @@ S_LoadSound
 */
 sfxcache_t *S_LoadSound (sfx_t *s)
 {
+	snd_info_t	info;
 	char	namebuffer[256];
 	byte	*data;
-	wavinfo_t	info;
 	int		len;
-	float	stepscale;
 	sfxcache_t	*sc;
-	byte	stackbuf[1*1024];		// avoid dirtying the cache heap
 
 // see if still in memory
 	sc = (sfxcache_t *) Cache_Check (&s->cache);
@@ -117,225 +48,41 @@ sfxcache_t *S_LoadSound (sfx_t *s)
 
 //	Con_Printf ("loading %s\n",namebuffer);
 
-	data = COM_LoadStackFile(namebuffer, stackbuf, sizeof(stackbuf));
+	// load it in
-
+	data = S_CodecLoad(namebuffer, &info);
 	if (!data)
 	{
 		Con_Printf ("Couldn't load %s\n", namebuffer);
 		return NULL;
 	}
-
+	
-	info = GetWavinfo (s->name, data, com_filesize);
 	if (info.channels != 1)
 	{
 		Con_Printf ("%s is a stereo sample\n",s->name);
 		return NULL;
 	}
 
-	stepscale = (float)info.rate / shm->speed;
+	int resampledNumSamples;
-	len = info.samples / stepscale;
+	void *resampled = Snd_Resample(info.rate, info.width, info.samples, info.channels, data, shm->speed, shm->samplebits/8, &resampledNumSamples);
-
+	
-	len = len * info.width * info.channels;
+	len = resampledNumSamples * (shm->samplebits/8) * info.channels;
 
 	sc = (sfxcache_t *) Cache_Alloc ( &s->cache, len + sizeof(sfxcache_t), s->name);
 	if (!sc)
 		return NULL;
 
-	sc->length = info.samples;
+	float ratio = info.rate / shm->speed;
-	sc->loopstart = info.loopstart;
+	
-	sc->speed = info.rate;
+	sc->length = resampledNumSamples;
-	sc->width = info.width;
+	sc->loopstart = (info.loopstart == -1 ? -1 : info.loopstart / ratio); // reposition loop marker to take resampling into account
+	sc->speed = shm->speed;
+	sc->width = (shm->samplebits/8);
 	sc->stereo = info.channels;
-
+    memcpy(sc->data, resampled, len);
-	ResampleSfx (s, sc->speed, sc->width, data + info.dataofs);
+	
-
+	free(resampled);
+	Z_Free(data);
+	
 	return sc;
 }
 
-
-
-/*
-===============================================================================
-
-WAV loading
-
-===============================================================================
-*/
-
-
-byte	*data_p;
-byte 	*iff_end;
-byte 	*last_chunk;
-byte 	*iff_data;
-int 	iff_chunk_len;
-
-
-short GetLittleShort(void)
-{
-	short val = 0;
-	val = *data_p;
-	val = val + (*(data_p+1)<<8);
-	data_p += 2;
-	return val;
-}
-
-int GetLittleLong(void)
-{
-	int val = 0;
-	val = *data_p;
-	val = val + (*(data_p+1)<<8);
-	val = val + (*(data_p+2)<<16);
-	val = val + (*(data_p+3)<<24);
-	data_p += 4;
-	return val;
-}
-
-void FindNextChunk(const char *name)
-{
-	while (1)
-	{
-	// Need at least 8 bytes for a chunk
-		if (last_chunk + 8 >= iff_end)
-		{
-			data_p = NULL;
-			return;
-		}
-
-		data_p = last_chunk + 4;
-		iff_chunk_len = GetLittleLong();
-		if (iff_chunk_len < 0 || iff_chunk_len > iff_end - data_p)
-		{
-			data_p = NULL;
-			Con_DPrintf("Bad \"%s\" chunk length (%d) in wav file\n", name, iff_chunk_len);
-			return;
-		}
-//		if (iff_chunk_len > 1024*1024)
-//			Sys_Error ("FindNextChunk: %i length is past the 1 meg sanity limit", iff_chunk_len);
-		last_chunk = data_p + ((iff_chunk_len + 1) & ~1);
-		data_p -= 8;
-		if (!Q_strncmp((char *)data_p, name, 4))
-			return;
-	}
-}
-
-void FindChunk(const char *name)
-{
-	last_chunk = iff_data;
-	FindNextChunk (name);
-}
-
-
-void DumpChunks(void)
-{
-	char	str[5];
-
-	str[4] = 0;
-	data_p=iff_data;
-	do
-	{
-		memcpy (str, data_p, 4);
-		data_p += 4;
-		iff_chunk_len = GetLittleLong();
-		Con_Printf ("%p : %s (%d)\n", (data_p - 4), str, iff_chunk_len);
-		data_p += (iff_chunk_len + 1) & ~1;
-	} while (data_p < iff_end);
-}
-
-/*
-============
-GetWavinfo
-============
-*/
-wavinfo_t GetWavinfo (const char *name, byte *wav, int wavlength)
-{
-	wavinfo_t	info;
-	int     i;
-	int     format;
-	int		samples;
-
-	memset (&info, 0, sizeof(info));
-
-	if (!wav)
-		return info;
-
-	iff_data = wav;
-	iff_end = wav + wavlength;
-
-// find "RIFF" chunk
-	FindChunk("RIFF");
-	if (!(data_p && !Q_strncmp((char *)data_p + 8, "WAVE", 4)))
-	{
-		Con_Printf("Missing RIFF/WAVE chunks\n");
-		return info;
-	}
-
-// get "fmt " chunk
-	iff_data = data_p + 12;
-// DumpChunks ();
-
-	FindChunk("fmt ");
-	if (!data_p)
-	{
-		Con_Printf("Missing fmt chunk\n");
-		return info;
-	}
-	data_p += 8;
-	format = GetLittleShort();
-	if (format != 1)
-	{
-		Con_Printf("Microsoft PCM format only\n");
-		return info;
-	}
-
-	info.channels = GetLittleShort();
-	info.rate = GetLittleLong();
-	data_p += 4+2;
-	info.width = GetLittleShort() / 8;
-
-// get cue chunk
-	FindChunk("cue ");
-	if (data_p)
-	{
-		data_p += 32;
-		info.loopstart = GetLittleLong();
-
-	// if the next chunk is a LIST chunk, look for a cue length marker
-		FindNextChunk ("LIST");
-		if (data_p)
-		{
-			if (!strncmp((char *)data_p + 28, "mark", 4))
-			{	// this is not a proper parse, but it works with cooledit...
-				data_p += 24;
-				i = GetLittleLong ();	// samples in loop
-				info.samples = info.loopstart + i;
-//				Con_Printf("looped length: %i\n", i);
-			}
-		}
-	}
-	else
-		info.loopstart = -1;
-
-// find data chunk
-	FindChunk("data");
-	if (!data_p)
-	{
-		Con_Printf("Missing data chunk\n");
-		return info;
-	}
-
-	data_p += 4;
-	samples = GetLittleLong () / info.width;
-
-	if (info.samples)
-	{
-		if (samples < info.samples)
-			Sys_Error ("Sound %s has a bad loop length", name);
-	}
-	else
-		info.samples = samples;
-
-	info.dataofs = data_p - wav;
-
-	return info;
-}
-

Quake/snd_resample.c

@@ -0,0 +1,45 @@
+#include "quakedef.h"
+#include "sound.h"
+
+// FIXME: call a real resampler :-)
+
+void *Snd_Resample(int inrate, int inwidth, int innumsamples, int channels, const void *indata,
+				   int outrate, int outwidth, int *outnumsamples)
+{
+	char *outdata;
+	int		i;
+	int		sample, samplefrac, fracstep;
+	
+	float stepscale = ((float)inrate) / ((float)outrate);	
+	*outnumsamples = innumsamples / stepscale;	
+
+	outdata = malloc((*outnumsamples) * channels * outwidth);
+	
+	// resample / decimate to the current source rate
+
+	samplefrac = 0;
+	fracstep = stepscale*256;
+	for (i=0 ; i<(*outnumsamples) ; i++)
+	{
+		int srcsample = samplefrac >> 8;
+		samplefrac += fracstep;
+		if (inwidth == 2)
+			sample = LittleShort ( ((short *)indata)[srcsample] );
+		else
+			sample = (int)( (((unsigned char *)indata)[srcsample]) - 128) << 8;
+		if (outwidth == 2)
+			((short *)outdata)[i] = sample;
+		else
+			((signed char *)outdata)[i] = sample >> 8;
+	}
+	
+	return outdata;
+}
+
+void *Snd_ResamplerInit(int inrate, int inwidth, int outrate, int outwidth, int channels) { return NULL; }
+
+void Snd_ResamplerClose(void *resampler) {}
+
+void Snd_ResampleStream(void *resampler,
+						int *innumsamples, void *indata,
+						int *outnumsamples, void *outdata) {}

Quake/sound.h

@@ -149,6 +149,24 @@ qboolean S_Base_StartBackgroundTrack( const char *intro, qboolean loop, S_Backgr
 void S_UpdateBackgroundTrack( void );
 qboolean S_BackgroundTrackIsPlaying( void );
 
+/* resamples a whole file. return value must be freed with free() */
+void *Snd_Resample(int inrate, int inwidth, int innumsamples, int channels, const void *indata,
+				   int outrate, int outwidth, int *outnumsamples);
+
+/* creates a new stream resampler for the specified rates and number of channels. returns a handle */
+void *Snd_ResamplerInit(int inrate, int inwidth, int outrate, int outwidth, int channels);
+
+/* closes a resampler handle */
+void Snd_ResamplerClose(void *resampler);
+
+/* performs resampling on samples in the given channel. numinsamples takes
+   the number of samples to process, and returns the number actually processed.
+ */
+void Snd_ResampleStream(void *resampler,
+						 int *innumsamples, void *indata,
+						 int *outnumsamples, void *outdata);
+
+
 // ====================================================================
 // User-setable variables
 // ====================================================================