mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more work on audio...

Browse Source
This commit is contained in:
Ray 2016-09-09 01:34:30 +02:00
parent 0c58c1198f
commit 94142ecce5
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/audio.c
View File

@ -535,6 +535,7 @@ void SetSoundPitch(Sound sound, float pitch)
} }
// Convert wave data to desired format // Convert wave data to desired format
// TODO: Consider channels (mono - stereo)
void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels) void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
{ {
if (wave->sampleSize != sampleSize) if (wave->sampleSize != sampleSize)
@ -543,7 +544,11 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
free(wave->data); free(wave->data);
//image->format = newFormat; wave->sampleSize = sampleSize;
//sample *= 4.0f; // Arbitrary gain to get reasonable output volume...
//if (sample > 1.0f) sample = 1.0f;
//if (sample < -1.0f) sample = -1.0f;
if (sampleSize == 8) if (sampleSize == 8)
{ {
@ -551,7 +556,7 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
for (int i = 0; i < wave->sampleCount; i++) for (int i = 0; i < wave->sampleCount; i++)
{ {
((unsigned char *)wave->data)[i] = (unsigned char)((float)samples[i]); // TODO: review conversion ((unsigned char *)wave->data)[i] = (unsigned char)((float)samples[i]*127 + 128);
} }
} }
else if (sampleSize == 16) else if (sampleSize == 16)
@ -560,7 +565,7 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
for (int i = 0; i < wave->sampleCount; i++) for (int i = 0; i < wave->sampleCount; i++)
{ {
((short *)wave->data)[i] = (short)((float)samples[i]); // TODO: review conversion ((short *)wave->data)[i] = (short)((float)samples[i]*32000); // SHRT_MAX = 32767
} }
} }
else if (sampleSize == 32) else if (sampleSize == 32)
@ -569,13 +574,17 @@ void WaveFormat(Wave *wave, int sampleRate, int sampleSize, int channels)
for (int i = 0; i < wave->sampleCount; i++) for (int i = 0; i < wave->sampleCount; i++)
{ {
((float *)wave->data)[i] = (float)samples[i]; // TODO: review conversion ((float *)wave->data)[i] = (float)samples[i];
} }
} }
else TraceLog(WARNING, "Wave formatting: Sample size not supported"); else TraceLog(WARNING, "Wave formatting: Sample size not supported");
} }
// TODO: Consider channels (mono vs stereo) // NOTE: Only supported 1 or 2 channels (mono or stereo)
if ((channels > 0) && (channels < 3) && (wave->channels != channels))
{
// TODO: Add/remove channels interlaced data if required...
}
} }
// Copy a wave to a new wave // Copy a wave to a new wave
@ -626,15 +635,16 @@ void WaveCrop(Wave *wave, int initSample, int finalSample)
} }
// Get samples data from wave as a floats array // Get samples data from wave as a floats array
// NOTE: Returned sample values are normalized to range [-1..1]
float *GetWaveData(Wave wave) float *GetWaveData(Wave wave)
{ {
float *samples = (float *)malloc(wave.sampleCount*sizeof(float)); float *samples = (float *)malloc(wave.sampleCount*sizeof(float));
for (int i = 0; i < wave.sampleCount; i++) for (int i = 0; i < wave.sampleCount; i++)
{ {
if (wave.sampleSize == 8) samples[i] = (float)((unsigned char *)wave.data)[i]; // TODO: review conversion if (wave.sampleSize == 8) samples[i] = (float)(((unsigned char *)wave.data)[i] - 127)/256.0f;
else if (wave.sampleSize == 16) samples[i] = (float)((short *)wave.data)[i]; // TODO: review conversion else if (wave.sampleSize == 16) samples[i] = (float)((short *)wave.data)[i]/32767.0f;
else if (wave.sampleSize == 32) samples[i] = ((float *)wave.data)[i]; // TODO: review conversion else if (wave.sampleSize == 32) samples[i] = ((float *)wave.data)[i];
} }
return samples; return samples;