2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-1997 Id Software, Inc.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2011-05-15 13:23:13 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// snd_mem.c: sound caching
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
|
|
|
|
|
|
|
#include "winquake.h"
|
2012-11-27 03:23:19 +00:00
|
|
|
#include "fs.h"
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
int rate;
|
|
|
|
int width;
|
|
|
|
int numchannels;
|
|
|
|
int loopstart;
|
|
|
|
int samples;
|
|
|
|
int dataofs; // chunk starts this many bytes from file start
|
|
|
|
} wavinfo_t;
|
|
|
|
|
|
|
|
static wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength);
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
int cache_full_cycle;
|
|
|
|
|
|
|
|
qbyte *S_Alloc (int size);
|
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
#define LINEARUPSCALE(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
outnlsamps = floor(1.0 / scale); \
|
|
|
|
outsamps -= outnlsamps; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
2006-06-04 03:50:24 +00:00
|
|
|
*out = ((0xFFFF - inaccum)*in[0] + inaccum*in[1]) >> (16 - outlshift + outrshift); \
|
2006-06-04 01:43:52 +00:00
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16); \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out++; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
while (outnlsamps) \
|
|
|
|
{ \
|
|
|
|
*out = (*in >> outrshift) << outlshift; \
|
|
|
|
out++; \
|
|
|
|
outnlsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
#define LINEARUPSCALESTEREO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
outnlsamps = floor(1.0 / scale); \
|
|
|
|
outsamps -= outnlsamps; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
2006-06-04 03:50:24 +00:00
|
|
|
out[0] = ((0xFFFF - inaccum)*in[0] + inaccum*in[2]) >> (16 - outlshift + outrshift); \
|
|
|
|
out[1] = ((0xFFFF - inaccum)*in[1] + inaccum*in[3]) >> (16 - outlshift + outrshift); \
|
2006-06-04 01:43:52 +00:00
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16) * 2; \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out += 2; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
while (outnlsamps) \
|
|
|
|
{ \
|
|
|
|
out[0] = (in[0] >> outrshift) << outlshift; \
|
|
|
|
out[1] = (in[1] >> outrshift) << outlshift; \
|
|
|
|
out += 2; \
|
|
|
|
outnlsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
#define LINEARUPSCALESTEREOTOMONO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
outnlsamps = floor(1.0 / scale); \
|
|
|
|
outsamps -= outnlsamps; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
|
|
|
*out = ((((0xFFFF - inaccum)*in[0] + inaccum*in[2]) >> (16 - outlshift + outrshift)) + \
|
|
|
|
(((0xFFFF - inaccum)*in[1] + inaccum*in[3]) >> (16 - outlshift + outrshift))) >> 1; \
|
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16) * 2; \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out++; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
while (outnlsamps) \
|
|
|
|
{ \
|
|
|
|
out[0] = (((in[0] >> outrshift) << outlshift) + ((in[1] >> outrshift) << outlshift)) >> 1; \
|
|
|
|
out++; \
|
|
|
|
outnlsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-06-04 03:50:24 +00:00
|
|
|
#define LINEARDOWNSCALE(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = outrate / (double)inrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
inaccum = 0; \
|
|
|
|
insamps--; \
|
|
|
|
outsampleft = 0; \
|
|
|
|
\
|
|
|
|
while (insamps) \
|
|
|
|
{ \
|
|
|
|
inaccum += infrac; \
|
|
|
|
if (inaccum >> 16) \
|
|
|
|
{ \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
outsampleft += (infrac - inaccum) * (*in); \
|
|
|
|
*out = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
out++; \
|
|
|
|
outsampleft = inaccum * (*in); \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
outsampleft += infrac * (*in); \
|
|
|
|
in++; \
|
|
|
|
insamps--; \
|
|
|
|
} \
|
|
|
|
outsampleft += (0xFFFF - inaccum) * (*in);\
|
|
|
|
*out = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define LINEARDOWNSCALESTEREO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = outrate / (double)inrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
inaccum = 0; \
|
|
|
|
insamps--; \
|
|
|
|
outsampleft = 0; \
|
|
|
|
outsampright = 0; \
|
|
|
|
\
|
|
|
|
while (insamps) \
|
|
|
|
{ \
|
|
|
|
inaccum += infrac; \
|
|
|
|
if (inaccum >> 16) \
|
|
|
|
{ \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
outsampleft += (infrac - inaccum) * in[0]; \
|
|
|
|
outsampright += (infrac - inaccum) * in[1]; \
|
|
|
|
out[0] = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
out[1] = outsampright >> (16 - outlshift + outrshift); \
|
|
|
|
out += 2; \
|
|
|
|
outsampleft = inaccum * in[0]; \
|
|
|
|
outsampright = inaccum * in[1]; \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
{ \
|
|
|
|
outsampleft += infrac * in[0]; \
|
|
|
|
outsampright += infrac * in[1]; \
|
|
|
|
} \
|
|
|
|
in += 2; \
|
|
|
|
insamps--; \
|
|
|
|
} \
|
|
|
|
outsampleft += (0xFFFF - inaccum) * in[0];\
|
|
|
|
outsampright += (0xFFFF - inaccum) * in[1];\
|
|
|
|
out[0] = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
out[1] = outsampright >> (16 - outlshift + outrshift); \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define LINEARDOWNSCALESTEREOTOMONO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = outrate / (double)inrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
inaccum = 0; \
|
|
|
|
insamps--; \
|
|
|
|
outsampleft = 0; \
|
|
|
|
\
|
|
|
|
while (insamps) \
|
|
|
|
{ \
|
|
|
|
inaccum += infrac; \
|
|
|
|
if (inaccum >> 16) \
|
|
|
|
{ \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
outsampleft += (infrac - inaccum) * ((in[0] + in[1]) >> 1); \
|
|
|
|
*out = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
out++; \
|
|
|
|
outsampleft = inaccum * ((in[0] + in[1]) >> 1); \
|
|
|
|
} \
|
|
|
|
else \
|
|
|
|
outsampleft += infrac * ((in[0] + in[1]) >> 1); \
|
|
|
|
in += 2; \
|
|
|
|
insamps--; \
|
|
|
|
} \
|
|
|
|
outsampleft += (0xFFFF - inaccum) * ((in[0] + in[1]) >> 1);\
|
|
|
|
*out = outsampleft >> (16 - outlshift + outrshift); \
|
|
|
|
}
|
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
#define STANDARDRESCALE(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
|
|
|
*out = (*in >> outrshift) << outlshift; \
|
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16); \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out++; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define STANDARDRESCALESTEREO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
|
|
|
out[0] = (in[0] >> outrshift) << outlshift; \
|
|
|
|
out[1] = (in[1] >> outrshift) << outlshift; \
|
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16) * 2; \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out += 2; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
#define STANDARDRESCALESTEREOTOMONO(in, inrate, insamps, out, outrate, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
scale = inrate / (double)outrate; \
|
|
|
|
infrac = floor(scale * 65536); \
|
|
|
|
outsamps = insamps / scale; \
|
|
|
|
inaccum = 0; \
|
|
|
|
\
|
|
|
|
while (outsamps) \
|
|
|
|
{ \
|
|
|
|
out[0] = (((in[0] >> outrshift) << outlshift) + ((in[1] >> outrshift) << outlshift)) >> 1; \
|
|
|
|
inaccum += infrac; \
|
|
|
|
in += (inaccum >> 16) * 2; \
|
|
|
|
inaccum &= 0xFFFF; \
|
|
|
|
out++; \
|
|
|
|
outsamps--; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define QUICKCONVERT(in, insamps, out, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
while (insamps) \
|
|
|
|
{ \
|
|
|
|
*out = (*in >> outrshift) << outlshift; \
|
|
|
|
out++; \
|
|
|
|
in++; \
|
|
|
|
insamps--; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define QUICKCONVERTSTEREOTOMONO(in, insamps, out, outlshift, outrshift) \
|
|
|
|
{ \
|
|
|
|
while (insamps) \
|
|
|
|
{ \
|
|
|
|
*out = (((in[0] >> outrshift) << outlshift) + ((in[1] >> outrshift) << outlshift)) >> 1; \
|
|
|
|
out++; \
|
|
|
|
in += 2; \
|
|
|
|
insamps--; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
// SND_ResampleStream: takes a sound stream and converts with given parameters. Limited to
|
2006-06-04 03:50:24 +00:00
|
|
|
// 8-16-bit signed conversions and mono-to-mono/stereo-to-stereo conversions.
|
2006-06-04 01:43:52 +00:00
|
|
|
// Not an in-place algorithm.
|
|
|
|
void SND_ResampleStream (void *in, int inrate, int inwidth, int inchannels, int insamps, void *out, int outrate, int outwidth, int outchannels, int resampstyle)
|
|
|
|
{
|
|
|
|
double scale;
|
|
|
|
signed char *in8 = (signed char *)in;
|
|
|
|
short *in16 = (short *)in;
|
|
|
|
signed char *out8 = (signed char *)out;
|
|
|
|
short *out16 = (short *)out;
|
2006-06-04 03:50:24 +00:00
|
|
|
int outsamps, outnlsamps, outsampleft, outsampright;
|
2006-06-04 01:43:52 +00:00
|
|
|
int infrac, inaccum;
|
|
|
|
|
|
|
|
if (insamps <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (inchannels == outchannels && inwidth == outwidth && inrate == outrate)
|
|
|
|
{
|
|
|
|
memcpy(out, in, inwidth*insamps*inchannels);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (inchannels == 1 && outchannels == 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (inwidth == 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (outwidth == 1)
|
|
|
|
{
|
|
|
|
if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALE(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALE(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (inrate == outrate) // quick convert
|
|
|
|
QUICKCONVERT(in8, insamps, out16, 8, 0)
|
|
|
|
else if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALE(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALE(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
return;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
else // 16-bit
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (outwidth == 2)
|
|
|
|
{
|
|
|
|
if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALE(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALE(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (inrate == outrate) // quick convert
|
|
|
|
QUICKCONVERT(in16, insamps, out8, 0, 8)
|
|
|
|
else if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALE(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
}
|
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALE(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
else
|
|
|
|
STANDARDRESCALE(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
return;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
}
|
|
|
|
else if (outchannels == 2 && inchannels == 2)
|
|
|
|
{
|
|
|
|
if (inwidth == 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (outwidth == 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (inrate < outrate) // upsample
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREO(in8, inrate, insamps, out8, outrate, 0, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
STANDARDRESCALESTEREO(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALESTEREO(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREO(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (inrate == outrate) // quick convert
|
|
|
|
{
|
|
|
|
insamps *= 2;
|
|
|
|
QUICKCONVERT(in8, insamps, out16, 8, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
else if (inrate < outrate) // upsample
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREO(in8, inrate, insamps, out16, outrate, 8, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
STANDARDRESCALESTEREO(in8, inrate, insamps, out16, outrate, 8, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALESTEREO(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREO(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else // 16-bit
|
|
|
|
{
|
|
|
|
if (outwidth == 2)
|
|
|
|
{
|
|
|
|
if (inrate < outrate) // upsample
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREO(in16, inrate, insamps, out16, outrate, 0, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
STANDARDRESCALESTEREO(in16, inrate, insamps, out16, outrate, 0, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALESTEREO(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREO(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
}
|
2011-05-15 13:23:13 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
{
|
|
|
|
if (inrate == outrate) // quick convert
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
insamps *= 2;
|
|
|
|
QUICKCONVERT(in16, insamps, out8, 0, 8)
|
|
|
|
}
|
|
|
|
else if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREO(in16, inrate, insamps, out8, outrate, 0, 8)
|
2006-05-08 06:44:47 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
STANDARDRESCALESTEREO(in16, inrate, insamps, out8, outrate, 0, 8)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
else // downsample
|
2006-06-04 03:50:24 +00:00
|
|
|
{
|
|
|
|
if (resampstyle > 1)
|
|
|
|
LINEARDOWNSCALESTEREO(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREO(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-06-04 03:50:24 +00:00
|
|
|
#if 0
|
2006-06-04 01:43:52 +00:00
|
|
|
else if (outchannels == 1 && inchannels == 2)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (inwidth == 1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (outwidth == 1)
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREOTOMONO(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in8, inrate, insamps, out8, outrate, 0, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in8, inrate, insamps, out8, outrate, 0, 0)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2006-05-08 06:44:47 +00:00
|
|
|
{
|
2006-06-04 01:43:52 +00:00
|
|
|
if (inrate == outrate) // quick convert
|
|
|
|
QUICKCONVERTSTEREOTOMONO(in8, insamps, out16, 8, 0)
|
|
|
|
else if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREOTOMONO(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in8, inrate, insamps, out16, outrate, 8, 0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else // 16-bit
|
|
|
|
{
|
|
|
|
if (outwidth == 2)
|
|
|
|
{
|
|
|
|
if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREOTOMONO(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
}
|
|
|
|
else // downsample
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in16, inrate, insamps, out16, outrate, 0, 0)
|
|
|
|
}
|
2011-05-15 13:23:13 +00:00
|
|
|
else
|
2006-06-04 01:43:52 +00:00
|
|
|
{
|
|
|
|
if (inrate == outrate) // quick convert
|
|
|
|
QUICKCONVERTSTEREOTOMONO(in16, insamps, out8, 0, 8)
|
|
|
|
else if (inrate < outrate) // upsample
|
|
|
|
{
|
|
|
|
if (resampstyle)
|
|
|
|
LINEARUPSCALESTEREOTOMONO(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
else
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in16, inrate, insamps, out8, outrate, 0, 8)
|
|
|
|
}
|
|
|
|
else // downsample
|
|
|
|
STANDARDRESCALESTEREOTOMONO(in16, inrate, insamps, out8, outrate, 0, 8)
|
2006-05-08 06:44:47 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2006-06-04 03:50:24 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2006-06-04 01:43:52 +00:00
|
|
|
/*
|
|
|
|
================
|
|
|
|
ResampleSfx
|
|
|
|
================
|
|
|
|
*/
|
2016-07-12 00:40:13 +00:00
|
|
|
static qboolean ResampleSfx (sfx_t *sfx, int inrate, int inchannels, int inwidth, int insamps, int inloopstart, qbyte *data)
|
2006-06-04 01:43:52 +00:00
|
|
|
{
|
|
|
|
extern cvar_t snd_linearresample;
|
|
|
|
double scale;
|
|
|
|
sfxcache_t *sc;
|
2010-11-28 19:14:21 +00:00
|
|
|
int outsamps;
|
|
|
|
int len;
|
|
|
|
int outwidth;
|
2006-06-04 01:43:52 +00:00
|
|
|
|
|
|
|
scale = snd_speed / (double)inrate;
|
|
|
|
outsamps = insamps * scale;
|
2010-11-28 19:14:21 +00:00
|
|
|
if (loadas8bit.ival < 0)
|
|
|
|
outwidth = 2;
|
|
|
|
else if (loadas8bit.ival)
|
|
|
|
outwidth = 1;
|
|
|
|
else
|
|
|
|
outwidth = inwidth;
|
|
|
|
len = outsamps * outwidth * inchannels;
|
|
|
|
|
2012-02-27 12:23:15 +00:00
|
|
|
sfx->decoder.buf = sc = BZ_Malloc(len + sizeof(sfxcache_t));
|
2010-11-28 19:14:21 +00:00
|
|
|
if (!sc)
|
|
|
|
{
|
2012-02-27 12:23:15 +00:00
|
|
|
return false;
|
2010-11-28 19:14:21 +00:00
|
|
|
}
|
2006-06-04 01:43:52 +00:00
|
|
|
|
2010-11-28 19:14:21 +00:00
|
|
|
sc->numchannels = inchannels;
|
|
|
|
sc->width = outwidth;
|
2006-06-04 01:43:52 +00:00
|
|
|
sc->speed = snd_speed;
|
2010-11-28 19:14:21 +00:00
|
|
|
sc->length = outsamps;
|
2012-02-27 12:23:15 +00:00
|
|
|
sc->soundoffset = 0;
|
|
|
|
sc->data = (qbyte*)(sc+1);
|
2010-11-28 19:14:21 +00:00
|
|
|
if (inloopstart == -1)
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
sfx->loopstart = inloopstart;
|
2006-06-04 01:43:52 +00:00
|
|
|
else
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
sfx->loopstart = inloopstart * scale;
|
2006-06-04 01:43:52 +00:00
|
|
|
|
2011-05-15 13:23:13 +00:00
|
|
|
SND_ResampleStream (data,
|
|
|
|
inrate,
|
|
|
|
inwidth,
|
|
|
|
inchannels,
|
|
|
|
insamps,
|
|
|
|
sc->data,
|
|
|
|
sc->speed,
|
|
|
|
sc->width,
|
|
|
|
sc->numchannels,
|
2009-11-04 21:16:50 +00:00
|
|
|
snd_linearresample.ival);
|
2012-02-27 12:23:15 +00:00
|
|
|
|
|
|
|
return true;
|
2006-06-04 01:43:52 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//=============================================================================
|
2017-02-19 00:15:42 +00:00
|
|
|
#ifdef PACKAGE_DOOMWAD
|
2008-09-11 03:39:34 +00:00
|
|
|
#define DSPK_RATE 140
|
|
|
|
#define DSPK_BASE 170.0
|
|
|
|
#define DSPK_EXP 0.0433
|
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
/*
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
qboolean QDECL S_LoadDoomSpeakerSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed)
|
2006-05-08 02:03:41 +00:00
|
|
|
{
|
|
|
|
sfxcache_t *sc;
|
|
|
|
|
|
|
|
// format data from Unofficial Doom Specs v1.6
|
|
|
|
unsigned short *dataus;
|
2008-09-11 03:39:34 +00:00
|
|
|
int samples, len, inrate, inaccum;
|
2006-05-08 02:03:41 +00:00
|
|
|
qbyte *outdata;
|
|
|
|
qbyte towrite;
|
2008-09-11 03:39:34 +00:00
|
|
|
double timeraccum, timerfreq;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
|
|
|
if (datalen < 4)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dataus = (unsigned short*)data;
|
|
|
|
|
|
|
|
if (LittleShort(dataus[0]) != 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
samples = LittleShort(dataus[1]);
|
|
|
|
|
|
|
|
data += 4;
|
|
|
|
datalen -= 4;
|
|
|
|
|
|
|
|
if (datalen != samples)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
len = (int)((double)samples * (double)snd_speed / DSPK_RATE);
|
|
|
|
|
|
|
|
sc = Cache_Alloc (&s->cache, len + sizeof(sfxcache_t), s->name);
|
|
|
|
if (!sc)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
sc->length = len;
|
|
|
|
sc->loopstart = -1;
|
|
|
|
sc->numchannels = 1;
|
|
|
|
sc->width = 1;
|
|
|
|
sc->speed = snd_speed;
|
|
|
|
|
|
|
|
timeraccum = 0;
|
|
|
|
outdata = sc->data;
|
|
|
|
towrite = 0x40;
|
|
|
|
inrate = (int)((double)snd_speed / DSPK_RATE);
|
|
|
|
inaccum = inrate;
|
2008-09-11 03:39:34 +00:00
|
|
|
if (*data)
|
|
|
|
timerfreq = DSPK_BASE * pow((double)2.0, DSPK_EXP * (*data));
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
else
|
|
|
|
timerfreq = 0;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
|
|
|
while (len > 0)
|
|
|
|
{
|
2008-09-11 03:39:34 +00:00
|
|
|
timeraccum += timerfreq;
|
|
|
|
if (timeraccum > (float)snd_speed)
|
2006-05-08 02:03:41 +00:00
|
|
|
{
|
|
|
|
towrite ^= 0xFF; // swap speaker component
|
2008-09-11 03:39:34 +00:00
|
|
|
timeraccum -= (float)snd_speed;
|
2006-05-08 02:03:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
inaccum--;
|
|
|
|
if (!inaccum)
|
|
|
|
{
|
|
|
|
data++;
|
2008-09-11 03:39:34 +00:00
|
|
|
if (*data)
|
|
|
|
timerfreq = DSPK_BASE * pow((double)2.0, DSPK_EXP * (*data));
|
2006-05-08 02:03:41 +00:00
|
|
|
inaccum = inrate;
|
|
|
|
}
|
|
|
|
*outdata = towrite;
|
|
|
|
outdata++;
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
|
|
|
|
return sc;
|
|
|
|
}
|
2012-07-05 19:42:36 +00:00
|
|
|
*/
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
static qboolean QDECL S_LoadDoomSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed)
|
2006-05-08 02:03:41 +00:00
|
|
|
{
|
|
|
|
// format data from Unofficial Doom Specs v1.6
|
|
|
|
unsigned short *dataus;
|
2012-01-17 07:57:46 +00:00
|
|
|
int samples, rate;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
|
|
|
if (datalen < 8)
|
2012-07-05 19:42:36 +00:00
|
|
|
return false;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
|
|
|
dataus = (unsigned short*)data;
|
|
|
|
|
|
|
|
if (LittleShort(dataus[0]) != 3)
|
2012-07-05 19:42:36 +00:00
|
|
|
return false;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
|
|
|
rate = LittleShort(dataus[1]);
|
|
|
|
samples = LittleShort(dataus[2]);
|
|
|
|
|
|
|
|
data += 8;
|
|
|
|
datalen -= 8;
|
|
|
|
|
|
|
|
if (datalen != samples)
|
2012-07-05 19:42:36 +00:00
|
|
|
return false;
|
2006-05-08 02:03:41 +00:00
|
|
|
|
2012-01-17 07:57:46 +00:00
|
|
|
COM_CharBias(data, datalen);
|
2006-05-08 02:03:41 +00:00
|
|
|
|
2012-07-05 19:42:36 +00:00
|
|
|
return ResampleSfx (s, rate, 1, 1, samples, -1, data);
|
2006-05-08 02:03:41 +00:00
|
|
|
}
|
2006-05-08 23:06:50 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
static qboolean QDECL S_LoadWavSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed)
|
2005-11-30 01:20:53 +00:00
|
|
|
{
|
|
|
|
wavinfo_t info;
|
|
|
|
|
2007-06-20 00:02:54 +00:00
|
|
|
if (datalen < 4 || strncmp(data, "RIFF", 4))
|
2012-02-27 12:23:15 +00:00
|
|
|
return false;
|
2007-06-20 00:02:54 +00:00
|
|
|
|
2005-11-30 01:20:53 +00:00
|
|
|
info = GetWavinfo (s->name, data, datalen);
|
|
|
|
if (info.numchannels < 1 || info.numchannels > 2)
|
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
s->loadstate = SLS_FAILED;
|
2005-11-30 01:20:53 +00:00
|
|
|
Con_Printf ("%s has an unsupported quantity of channels.\n",s->name);
|
2012-02-27 12:23:15 +00:00
|
|
|
return false;
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
|
|
|
|
2010-11-28 19:14:21 +00:00
|
|
|
if (info.width == 1)
|
|
|
|
COM_CharBias(data + info.dataofs, info.samples*info.numchannels);
|
|
|
|
else if (info.width == 2)
|
|
|
|
COM_SwapLittleShortBlock((short *)(data + info.dataofs), info.samples*info.numchannels);
|
2005-11-30 01:20:53 +00:00
|
|
|
|
2012-02-27 12:23:15 +00:00
|
|
|
return ResampleSfx (s, info.rate, info.numchannels, info.width, info.samples, info.loopstart, data + info.dataofs);
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
|
|
|
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
qboolean QDECL S_LoadOVSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed);
|
2005-11-30 01:20:53 +00:00
|
|
|
|
2015-04-21 04:12:00 +00:00
|
|
|
#ifdef FTE_TARGET_WEB
|
|
|
|
//web browsers contain their own decoding libraries that our openal stuff can use.
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
static qboolean QDECL S_LoadBrowserFile (sfx_t *s, qbyte *data, size_t datalen, int sndspeed)
|
2015-04-21 04:12:00 +00:00
|
|
|
{
|
|
|
|
sfxcache_t *sc;
|
|
|
|
s->decoder.buf = sc = BZ_Malloc(sizeof(sfxcache_t) + datalen);
|
|
|
|
sc->data = (qbyte*)(sc+1);
|
|
|
|
sc->length = datalen;
|
|
|
|
sc->width = 0; //ie: not pcm
|
|
|
|
sc->loopstart = -1;
|
|
|
|
sc->speed = sndspeed;
|
|
|
|
sc->numchannels = 2;
|
|
|
|
sc->soundoffset = 0;
|
|
|
|
memcpy(sc->data, data, datalen);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//highest priority is last.
|
2016-07-12 00:40:13 +00:00
|
|
|
static S_LoadSound_t AudioInputPlugins[10] =
|
2005-11-30 01:20:53 +00:00
|
|
|
{
|
2015-04-21 04:12:00 +00:00
|
|
|
#ifdef FTE_TARGET_WEB
|
|
|
|
S_LoadBrowserFile,
|
|
|
|
#endif
|
2005-11-30 01:20:53 +00:00
|
|
|
#ifdef AVAIL_OGGVORBIS
|
2006-02-06 01:06:17 +00:00
|
|
|
S_LoadOVSound,
|
2005-11-30 01:20:53 +00:00
|
|
|
#endif
|
2006-05-08 02:03:41 +00:00
|
|
|
S_LoadWavSound,
|
2017-02-19 00:15:42 +00:00
|
|
|
#ifdef PACKAGE_DOOMWAD
|
2006-05-08 02:03:41 +00:00
|
|
|
S_LoadDoomSound,
|
2012-07-05 19:42:36 +00:00
|
|
|
// S_LoadDoomSpeakerSound,
|
2006-05-08 23:06:50 +00:00
|
|
|
#endif
|
2005-11-30 01:20:53 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
qboolean S_RegisterSoundInputPlugin(S_LoadSound_t loadfnc)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < sizeof(AudioInputPlugins)/sizeof(AudioInputPlugins[0]); i++)
|
|
|
|
{
|
|
|
|
if (!AudioInputPlugins[i])
|
|
|
|
{
|
|
|
|
AudioInputPlugins[i] = loadfnc;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static void S_LoadedOrFailed (void *ctx, void *ctxdata, size_t a, size_t b)
|
2015-04-14 23:12:17 +00:00
|
|
|
{
|
2015-07-14 14:47:00 +00:00
|
|
|
sfx_t *s = ctx;
|
|
|
|
s->loadstate = a;
|
2015-04-14 23:12:17 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
==============
|
|
|
|
S_LoadSound
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static void S_LoadSoundWorker (void *ctx, void *ctxdata, size_t a, size_t b)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
sfx_t *s = ctx;
|
2015-04-14 23:12:17 +00:00
|
|
|
char namebuffer[256];
|
2004-08-23 00:15:46 +00:00
|
|
|
qbyte *data;
|
2005-11-30 01:20:53 +00:00
|
|
|
int i;
|
2011-05-15 13:23:13 +00:00
|
|
|
size_t result;
|
2005-11-30 01:20:53 +00:00
|
|
|
char *name = s->name;
|
2014-10-05 20:04:11 +00:00
|
|
|
size_t filesize;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
|
|
|
s->loopstart = -1;
|
|
|
|
|
|
|
|
if (s->syspath)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2012-11-27 03:23:19 +00:00
|
|
|
vfsfile_t *f;
|
2005-11-30 01:20:53 +00:00
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
if ((f = VFSOS_Open(name, "rb")))
|
2005-11-30 01:20:53 +00:00
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
filesize = VFS_GETLEN(f);
|
|
|
|
data = BZ_Malloc (filesize);
|
|
|
|
result = VFS_READ(f, data, filesize);
|
2011-05-30 04:32:04 +00:00
|
|
|
|
2014-10-05 20:04:11 +00:00
|
|
|
if (result != filesize)
|
2016-02-10 23:23:43 +00:00
|
|
|
Con_SafePrintf("S_LoadSound() fread: Filename: %s, expected %"PRIuSIZE", result was %"PRIuSIZE"\n", name, filesize, result);
|
2011-05-30 04:32:04 +00:00
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
VFS_CLOSE(f);
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Con_SafePrintf ("Couldn't load %s\n", namebuffer);
|
2016-02-15 06:01:17 +00:00
|
|
|
COM_AddWork(WG_MAIN, S_LoadedOrFailed, s, NULL, SLS_FAILED, 0);
|
2015-04-21 23:11:26 +00:00
|
|
|
return;
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-11-30 01:20:53 +00:00
|
|
|
//Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
|
|
|
|
// load it in
|
2016-11-15 22:22:04 +00:00
|
|
|
const char *prefixes[] = {"sound/", ""};
|
|
|
|
const char *extensions[] = {".wav", ".ogg"};
|
|
|
|
char altname[sizeof(namebuffer)];
|
|
|
|
char orig[16];
|
|
|
|
size_t pre, ex;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-02-22 23:39:07 +00:00
|
|
|
data = NULL;
|
2014-10-05 20:04:11 +00:00
|
|
|
filesize = 0;
|
2009-04-01 22:03:56 +00:00
|
|
|
if (*name == '*') //q2 sexed sounds
|
2005-11-30 01:20:53 +00:00
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
//clq2_parsestartsound detects this also, and should not try playing these sounds.
|
|
|
|
s->loadstate = SLS_FAILED;
|
2015-04-21 23:11:26 +00:00
|
|
|
return;
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
|
|
|
|
2016-11-15 22:22:04 +00:00
|
|
|
for (pre = 0; !data && pre < countof(prefixes); pre++)
|
2007-06-20 00:02:54 +00:00
|
|
|
{
|
2016-11-15 22:22:04 +00:00
|
|
|
if (name[0] == '.' && name[1] == '.' && name[2] == '/')
|
|
|
|
{ //someone's being specific. disable prefixes entirely.
|
|
|
|
if (pre)
|
|
|
|
break;
|
|
|
|
//not relative to sound/
|
|
|
|
Q_snprintfz(namebuffer, sizeof(namebuffer), "%s", name+3);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Q_snprintfz(namebuffer, sizeof(namebuffer), "%s%s", prefixes[pre], name);
|
|
|
|
|
|
|
|
data = COM_LoadFile(namebuffer, 5, &filesize);
|
2007-06-20 00:02:54 +00:00
|
|
|
if (data)
|
2016-11-15 22:22:04 +00:00
|
|
|
break;
|
|
|
|
COM_FileExtension(namebuffer, orig, sizeof(orig));
|
|
|
|
COM_StripExtension(namebuffer, altname, sizeof(altname));
|
|
|
|
for (ex = 0; ex < countof(extensions); ex++)
|
|
|
|
{
|
|
|
|
if (!strcmp(orig, extensions[ex]+1))
|
|
|
|
continue;
|
|
|
|
Q_snprintfz(namebuffer, sizeof(namebuffer), "%s%s", altname, extensions[ex]);
|
|
|
|
data = COM_LoadFile(namebuffer, 5, &filesize);
|
|
|
|
if (data)
|
|
|
|
{
|
|
|
|
Con_DPrintf("found a mangled name: %s\n", namebuffer);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2007-06-20 00:02:54 +00:00
|
|
|
}
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (!data)
|
|
|
|
{
|
2009-04-01 22:03:56 +00:00
|
|
|
//FIXME: check to see if queued for download.
|
2016-11-15 22:22:04 +00:00
|
|
|
if (name[0] == '.' && name[1] == '.' && name[2] == '/')
|
|
|
|
Con_DPrintf ("Couldn't load %s\n", name+3);
|
|
|
|
else
|
|
|
|
Con_DPrintf ("Couldn't load sound/%s\n", name);
|
2016-02-15 06:01:17 +00:00
|
|
|
COM_AddWork(WG_MAIN, S_LoadedOrFailed, s, NULL, SLS_FAILED, 0);
|
2015-04-21 23:11:26 +00:00
|
|
|
return;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-30 01:20:53 +00:00
|
|
|
for (i = sizeof(AudioInputPlugins)/sizeof(AudioInputPlugins[0])-1; i >= 0; i--)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-11-30 01:20:53 +00:00
|
|
|
if (AudioInputPlugins[i])
|
|
|
|
{
|
2014-10-05 20:04:11 +00:00
|
|
|
if (AudioInputPlugins[i](s, data, filesize, snd_speed))
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
//wake up the main thread in case it decided to wait for us.
|
2016-02-15 06:01:17 +00:00
|
|
|
COM_AddWork(WG_MAIN, S_LoadedOrFailed, s, NULL, SLS_LOADED, 0);
|
2014-10-05 20:04:11 +00:00
|
|
|
BZ_Free(data);
|
2015-04-21 23:11:26 +00:00
|
|
|
return;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2005-11-30 01:20:53 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-10-05 22:11:17 +00:00
|
|
|
|
2014-10-05 20:04:11 +00:00
|
|
|
if (s->loadstate != SLS_FAILED)
|
2007-06-20 00:02:54 +00:00
|
|
|
Con_Printf ("Format not recognised: %s\n", namebuffer);
|
|
|
|
|
2016-02-15 06:01:17 +00:00
|
|
|
COM_AddWork(WG_MAIN, S_LoadedOrFailed, s, NULL, SLS_FAILED, 0);
|
2014-10-05 20:04:11 +00:00
|
|
|
BZ_Free(data);
|
2015-04-21 23:11:26 +00:00
|
|
|
return;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2014-10-05 20:04:11 +00:00
|
|
|
qboolean S_LoadSound (sfx_t *s)
|
|
|
|
{
|
|
|
|
if (s->loadstate == SLS_NOTLOADED && sndcardinfo)
|
|
|
|
{
|
|
|
|
s->loadstate = SLS_LOADING;
|
2016-02-15 06:01:17 +00:00
|
|
|
COM_AddWork(WG_LOADER, S_LoadSoundWorker, s, NULL, 0, 0);
|
2014-10-05 20:04:11 +00:00
|
|
|
}
|
|
|
|
if (s->loadstate == SLS_FAILED)
|
|
|
|
return false; //it failed to load once before, don't bother trying again.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2014-10-05 20:04:11 +00:00
|
|
|
return true; //loaded okay, or still loading
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
WAV loading
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
char *wavname;
|
|
|
|
qbyte *data_p;
|
|
|
|
qbyte *iff_end;
|
|
|
|
qbyte *last_chunk;
|
|
|
|
qbyte *iff_data;
|
|
|
|
int iff_chunk_len;
|
|
|
|
} wavctx_t;
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static short GetLittleShort(wavctx_t *ctx)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
short val = 0;
|
2015-04-14 23:12:17 +00:00
|
|
|
val = *ctx->data_p;
|
|
|
|
val = val + (*(ctx->data_p+1)<<8);
|
|
|
|
ctx->data_p += 2;
|
2004-08-23 00:15:46 +00:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static int GetLittleLong(wavctx_t *ctx)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int val = 0;
|
2015-04-14 23:12:17 +00:00
|
|
|
val = *ctx->data_p;
|
|
|
|
val = val + (*(ctx->data_p+1)<<8);
|
|
|
|
val = val + (*(ctx->data_p+2)<<16);
|
|
|
|
val = val + (*(ctx->data_p+3)<<24);
|
|
|
|
ctx->data_p += 4;
|
2004-08-23 00:15:46 +00:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static unsigned int FindNextChunk(wavctx_t *ctx, char *name)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-05-01 11:59:22 +00:00
|
|
|
unsigned int dataleft;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
while (1)
|
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
dataleft = ctx->iff_end - ctx->last_chunk;
|
2008-05-01 11:59:22 +00:00
|
|
|
if (dataleft < 8)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // didn't find the chunk
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->data_p = NULL;
|
2009-07-27 07:38:11 +00:00
|
|
|
return 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2008-05-01 11:59:22 +00:00
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->data_p=ctx->last_chunk;
|
|
|
|
ctx->data_p += 4;
|
2008-05-01 11:59:22 +00:00
|
|
|
dataleft-= 8;
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->iff_chunk_len = GetLittleLong(ctx);
|
|
|
|
if (ctx->iff_chunk_len < 0)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->data_p = NULL;
|
2009-07-27 07:38:11 +00:00
|
|
|
return 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2015-04-14 23:12:17 +00:00
|
|
|
if (ctx->iff_chunk_len > dataleft)
|
2009-07-27 07:38:11 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
Con_DPrintf ("\"%s\" seems truncated by %i bytes\n", ctx->wavname, ctx->iff_chunk_len-dataleft);
|
2009-07-27 07:38:11 +00:00
|
|
|
#if 1
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->iff_chunk_len = dataleft;
|
2009-07-27 07:38:11 +00:00
|
|
|
#else
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->data_p = NULL;
|
2009-07-27 07:38:11 +00:00
|
|
|
return 0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
dataleft-= ctx->iff_chunk_len;
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (iff_chunk_len > 1024*1024)
|
|
|
|
// Sys_Error ("FindNextChunk: %i length is past the 1 meg sanity limit", iff_chunk_len);
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->data_p -= 8;
|
|
|
|
ctx->last_chunk = ctx->data_p + 8 + ctx->iff_chunk_len;
|
|
|
|
if ((ctx->iff_chunk_len&1) && dataleft)
|
|
|
|
ctx->last_chunk++;
|
|
|
|
if (!Q_strncmp(ctx->data_p, name, 4))
|
|
|
|
return ctx->iff_chunk_len;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-12 00:40:13 +00:00
|
|
|
static unsigned int FindChunk(wavctx_t *ctx, char *name)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx->last_chunk = ctx->iff_data;
|
|
|
|
return FindNextChunk (ctx, name);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
2016-07-12 00:40:13 +00:00
|
|
|
static void DumpChunks(void)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
char str[5];
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
str[4] = 0;
|
|
|
|
data_p=iff_data;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
memcpy (str, data_p, 4);
|
|
|
|
data_p += 4;
|
|
|
|
iff_chunk_len = GetLittleLong();
|
|
|
|
Con_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
|
|
|
|
data_p += (iff_chunk_len + 1) & ~1;
|
|
|
|
} while (data_p < iff_end);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
GetWavinfo
|
|
|
|
============
|
|
|
|
*/
|
2016-07-12 00:40:13 +00:00
|
|
|
static wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
wavinfo_t info;
|
2015-04-14 23:12:17 +00:00
|
|
|
int i;
|
|
|
|
int format;
|
2004-08-23 00:15:46 +00:00
|
|
|
int samples;
|
2009-07-27 07:38:11 +00:00
|
|
|
int chunklen;
|
2015-04-14 23:12:17 +00:00
|
|
|
wavctx_t ctx;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
memset (&info, 0, sizeof(info));
|
|
|
|
|
|
|
|
if (!wav)
|
|
|
|
return info;
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.data_p = NULL;
|
|
|
|
ctx.last_chunk = NULL;
|
|
|
|
ctx.iff_chunk_len = 0;
|
|
|
|
|
|
|
|
ctx.iff_data = wav;
|
|
|
|
ctx.iff_end = wav + wavlength;
|
|
|
|
ctx.wavname = name;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// find "RIFF" chunk
|
2015-04-14 23:12:17 +00:00
|
|
|
chunklen = FindChunk(&ctx, "RIFF");
|
|
|
|
if (chunklen < 4 || Q_strncmp(ctx.data_p+8, "WAVE", 4))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-07-27 07:38:11 +00:00
|
|
|
Con_Printf("Missing RIFF/WAVE chunks in %s\n", name);
|
2004-08-23 00:15:46 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
// get "fmt " chunk
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.iff_data = ctx.data_p + 12;
|
2004-08-23 00:15:46 +00:00
|
|
|
// DumpChunks ();
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
chunklen = FindChunk(&ctx, "fmt ");
|
2009-07-27 07:38:11 +00:00
|
|
|
if (chunklen < 24-8)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-07-27 07:38:11 +00:00
|
|
|
Con_Printf("Missing/truncated fmt chunk\n");
|
2004-08-23 00:15:46 +00:00
|
|
|
return info;
|
|
|
|
}
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.data_p += 8;
|
|
|
|
format = GetLittleShort(&ctx);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (format != 1)
|
|
|
|
{
|
|
|
|
Con_Printf("Microsoft PCM format only\n");
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
info.numchannels = GetLittleShort(&ctx);
|
|
|
|
info.rate = GetLittleLong(&ctx);
|
|
|
|
ctx.data_p += 4+2;
|
|
|
|
info.width = GetLittleShort(&ctx) / 8;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// get cue chunk
|
2015-04-14 23:12:17 +00:00
|
|
|
chunklen = FindChunk(&ctx, "cue ");
|
2009-07-27 07:38:11 +00:00
|
|
|
if (chunklen >= 36-8)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.data_p += 32;
|
|
|
|
info.loopstart = GetLittleLong(&ctx);
|
2004-08-23 00:15:46 +00:00
|
|
|
// Con_Printf("loopstart=%d\n", sfx->loopstart);
|
|
|
|
|
|
|
|
// if the next chunk is a LIST chunk, look for a cue length marker
|
2015-04-14 23:12:17 +00:00
|
|
|
chunklen = FindNextChunk (&ctx, "LIST");
|
2009-07-27 07:38:11 +00:00
|
|
|
if (chunklen >= 32-8)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2015-04-14 23:12:17 +00:00
|
|
|
if (!strncmp (ctx.data_p + 28, "mark", 4))
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // this is not a proper parse, but it works with cooledit...
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.data_p += 24;
|
|
|
|
i = GetLittleLong (&ctx); // samples in loop
|
2004-08-23 00:15:46 +00:00
|
|
|
info.samples = info.loopstart + i;
|
|
|
|
// Con_Printf("looped length: %i\n", i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info.loopstart = -1;
|
|
|
|
|
|
|
|
// find data chunk
|
2015-04-14 23:12:17 +00:00
|
|
|
chunklen = FindChunk(&ctx, "data");
|
|
|
|
if (!ctx.data_p)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-07-27 07:38:11 +00:00
|
|
|
Con_Printf("Missing data chunk in %s\n", name);
|
2004-08-23 00:15:46 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
ctx.data_p += 8;
|
2009-07-27 07:38:11 +00:00
|
|
|
samples = chunklen / info.width /info.numchannels;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (info.samples)
|
|
|
|
{
|
|
|
|
if (samples < info.samples)
|
2009-07-27 07:38:11 +00:00
|
|
|
{
|
|
|
|
info.samples = samples;
|
|
|
|
Con_Printf ("Sound %s has a bad loop length\n", name);
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
info.samples = samples;
|
|
|
|
|
2009-07-27 07:38:11 +00:00
|
|
|
if (info.loopstart > info.samples)
|
|
|
|
{
|
|
|
|
Con_Printf ("Sound %s has a bad loop start\n", name);
|
|
|
|
info.loopstart = info.samples;
|
|
|
|
}
|
|
|
|
|
2015-04-14 23:12:17 +00:00
|
|
|
info.dataofs = ctx.data_p - wav;
|
2011-05-15 13:23:13 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
return info;
|
|
|
|
}
|