UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support 32bit wav data

Browse source
This commit is contained in:
Ray 2017-01-19 13:18:04 +01:00
parent 7cd24d2706
commit 7586031410
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/audio.c
View file

@ -459,7 +459,15 @@ void SetSoundPitch(Sound sound, float pitch)
void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels) void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
{ {
// Format sample rate // Format sample rate
if (wave->sampleRate != sampleRate) wave->sampleRate = sampleRate; // NOTE: Only supported 22050 <--> 44100
if (wave->sampleRate != sampleRate)
{
// TODO: Resample wave data (upsampling or downsampling)
// NOTE 1: To downsample, you have to drop samples or average them.
// NOTE 2: To upsample, you have to interpolate new samples.
wave->sampleRate = sampleRate;
}
// Format sample size // Format sample size
// NOTE: Only supported 8 bit <--> 16 bit <--> 32 bit // NOTE: Only supported 8 bit <--> 16 bit <--> 32 bit
@ -1078,23 +1086,23 @@ static Wave LoadWAV(const char *fileName)
else else
{ {
// Allocate memory for data // Allocate memory for data
wave.data = (unsigned char *)malloc(sizeof(unsigned char)*wavData.subChunkSize); wave.data = malloc(wavData.subChunkSize);
// Read in the sound data into the soundData variable // Read in the sound data into the soundData variable
fread(wave.data, wavData.subChunkSize, 1, wavFile); fread(wave.data, 1, wavData.subChunkSize, wavFile);
// Store wave parameters // Store wave parameters
wave.sampleRate = wavFormat.sampleRate; wave.sampleRate = wavFormat.sampleRate;
wave.sampleSize = wavFormat.bitsPerSample; wave.sampleSize = wavFormat.bitsPerSample;
wave.channels = wavFormat.numChannels; wave.channels = wavFormat.numChannels;
// NOTE: Only support up to 16 bit sample sizes // NOTE: Only support 8 bit, 16 bit and 32 bit sample sizes
if (wave.sampleSize > 16) if ((wave.sampleSize != 8) && (wave.sampleSize != 16) && (wave.sampleSize != 32))
{ {
WaveFormat(&wave, wave.sampleRate, 16, wave.channels);
TraceLog(WARNING, "[%s] WAV sample size (%ibit) not supported, converted to 16bit", fileName, wave.sampleSize); TraceLog(WARNING, "[%s] WAV sample size (%ibit) not supported, converted to 16bit", fileName, wave.sampleSize);
WaveFormat(&wave, wave.sampleRate, 16, wave.channels);
} }
// NOTE: Only support up to 2 channels (mono, stereo) // NOTE: Only support up to 2 channels (mono, stereo)
if (wave.channels > 2) if (wave.channels > 2)
{ {