Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move function to convert raw data to 44khzx16bitx2channels to sound_server.c so it can be used with ogg/flac/mp3/wav

Browse source
This commit is contained in:
nehalmistry 2003-04-17 21:39:16 +00:00
parent ff90eb6fab
commit 3c03e0e986
2 changed files with 56 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/sound/sound_server.cpp
View file

@ -311,6 +311,55 @@ local int MixSampleToStereo32(Sample* sample,int index,unsigned char volume,
return ri;
}
/**
** Convert RAW sound data to 44100 hz, Stereo, 16 bits per channel
**
** // FIXME
** @param src Source buffer
** @param dest Destination buffer
** @param frequency Frequency of source
** @param chansize Bitrate in bytes per channel of source
** @param channels Number of channels of source
** @param bytes Number of compressed bytes to read
**
** @return Number of bytes written in 'dest'
*/
global int ConvertToStereo32(const char *src, char *dest, int frequency,
int chansize, int channels, int bytes)
{
int s; // sample index
int b; // byte index
int c; // channel index
int freqratio;
int chanratio;
int brratio;
int samplesize; // number of bytes per sample
int divide;
int offset;
freqratio = 44100 / frequency;
samplesize = chansize * channels;
brratio = 4 / samplesize;
chanratio = 2 / channels;
divide = freqratio * brratio / chanratio;
// s is the sample
for (s = 0; s < bytes*divide; s += 4) {
// c is the channel in the sample
for (c = 0; c < 2; ++c) {
// b is the byte in the channel
for (b = 0; b < 2; ++b) {
offset=( ((s/4)/freqratio)*samplesize*chanratio +
(c/chanratio)*chansize + b/(2/chansize));
dest[s + c*2 + b] = src[offset] + (chansize == 1 ? 127 : 0);
// FIXME: should this be 127 or 128?
}
}
}
return bytes*divide;
}
global SoundChannel Channels[MaxChannels];
global int NextFreeChannel;

32
src/sound/wav.cpp
View file

@ -67,16 +67,12 @@ local int WavReadStream(Sample *sample, void *buf, int len)
char sndbuf[WAV_BUFFER_SIZE];
int unc; // number of uncompressed bytes to read
int comp; // number of compressed bytes actually read
int s; // sample index
int b; // byte index
int c; // channel index
int freqratio;
int chanratio;
int brratio;
int chansize; // number of bytes per channel
int samplesize; // number of bytes per sample
int divide;
int offset;
int i;
data = (WavData*) sample->User;
@ -90,30 +86,16 @@ local int WavReadStream(Sample *sample, void *buf, int len)
freqratio = (44100 / sample->Frequency);
samplesize = sample->SampleSize / 8;
brratio = 4 / samplesize;
chansize = samplesize / sample->Channels;
brratio = 4 / (samplesize * sample->Channels);
chanratio = 2 / sample->Channels;
divide = freqratio*brratio/chanratio;
comp = CLread(data->WavFile, sndbuf, unc/divide);
// s is the sample
for (s = 0; s < comp*divide; s += 4) {
// c is the channel in the sample
for (c = 0; c < 2; ++c) {
// b is the byte in the channel
for (b = 0; b < 2; ++b) {
offset=( ((s/4)/freqratio)*samplesize*chanratio +
(c/chanratio)*chansize + b/(2/chansize));
data->PointerInBuffer[sample->Length + s + c*2 + b] =
sndbuf[offset] + (chansize == 1 ? 127 : 0);
// FIXME: should this be 127 or 128?
}
}
}
sample->Length += comp*divide;
sample->Length += ConvertToStereo32(sndbuf,
&data->PointerInBuffer[sample->Length],
sample->Frequency, sample->SampleSize / 8,
sample->Channels, comp);
if (sample->Length < len) {
len = sample->Length;
@ -272,7 +254,7 @@ global Sample* LoadWav(const char* name, int flags __attribute__((unused)))
//
sample = malloc(sizeof(*sample) + WAV_BUFFER_SIZE*wavfmt.Channels);
sample->Channels = wavfmt.Channels;
sample->SampleSize = wavfmt.SampleSize * 8;
sample->SampleSize = wavfmt.SampleSize * 8 / sample->Channels;
sample->Frequency = wavfmt.Frequency;
sample->Length = 0;