mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-12 00:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(audio_mixer.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-08 18:37:31 +02:00
parent 4a7c81b353
commit de6e138d15
1 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
libretro-common/audio/audio_mixer.c
View File

@ -125,13 +125,13 @@ static bool wav2float(const rwav_t* wav, float** pcm, size_t* samples_out)
*pcm = f; *pcm = f;
if (wav->numchannels == 1) if (wav->bitspersample == 8)
{ {
if (wav->bitspersample == 8) float sample = 0.0f;
{ const uint8_t *u8 = (const uint8_t*)wav->samples;
float sample = 0.0f;
const uint8_t *u8 = (const uint8_t*)wav->samples;
if (wav->numchannels == 1)
{
for (i = wav->numsamples; i != 0; i--) for (i = wav->numsamples; i != 0; i--)
{ {
sample = (float)*u8++ / 255.0f; sample = (float)*u8++ / 255.0f;
@ -140,14 +140,29 @@ static bool wav2float(const rwav_t* wav, float** pcm, size_t* samples_out)
*f++ = sample; *f++ = sample;
} }
} }
else else if (wav->numchannels == 2)
{ {
/* TODO/FIXME note to leiradel - can we use audio/conversion/s16_to_float for (i = wav->numsamples; i != 0; i--)
* functions here? */ {
sample = (float)*u8++ / 255.0f;
sample = sample * 2.0f - 1.0f;
*f++ = sample;
sample = (float)*u8++ / 255.0f;
sample = sample * 2.0f - 1.0f;
*f++ = sample;
}
}
}
else
{
/* TODO/FIXME note to leiradel - can we use audio/conversion/s16_to_float
* functions here? */
float sample = 0.0f; float sample = 0.0f;
const int16_t *s16 = (const int16_t*)wav->samples; const int16_t *s16 = (const int16_t*)wav->samples;
if (wav->numchannels == 1)
{
for (i = wav->numsamples; i != 0; i--) for (i = wav->numsamples; i != 0; i--)
{ {
sample = (float)((int)*s16++ + 32768) / 65535.0f; sample = (float)((int)*s16++ + 32768) / 65535.0f;
@ -156,32 +171,8 @@ static bool wav2float(const rwav_t* wav, float** pcm, size_t* samples_out)
*f++ = sample; *f++ = sample;
} }
} }
} else if (wav->numchannels == 2)
else if (wav->numchannels == 2)
{
if (wav->bitspersample == 8)
{ {
float sample = 0.0f;
const uint8_t *u8 = (const uint8_t*)wav->samples;
for (i = wav->numsamples; i != 0; i--)
{
sample = (float)*u8++ / 255.0f;
sample = sample * 2.0f - 1.0f;
*f++ = sample;
sample = (float)*u8++ / 255.0f;
sample = sample * 2.0f - 1.0f;
*f++ = sample;
}
}
else
{
/* TODO/FIXME note to leiradel - can we use audio/conversion/s16_to_float
* functions here? */
float sample = 0.0f;
const int16_t *s16 = (const int16_t*)wav->samples;
for (i = wav->numsamples; i != 0; i--) for (i = wav->numsamples; i != 0; i--)
{ {
sample = (float)((int)*s16++ + 32768) / 65535.0f; sample = (float)((int)*s16++ + 32768) / 65535.0f;
@ -261,27 +252,28 @@ audio_mixer_sound_t* audio_mixer_load_wav(const char* path)
ssize_t size = 0; ssize_t size = 0;
/* WAV samples converted to float */ /* WAV samples converted to float */
float* pcm = NULL; float* pcm = NULL;
float* resampled = NULL;
size_t samples = 0; size_t samples = 0;
/* Result */ /* Result */
audio_mixer_sound_t* sound = NULL; audio_mixer_sound_t* sound = NULL;
int rwav_ret = 0;
if (filestream_read_file(path, &buffer, &size) == 0) if (filestream_read_file(path, &buffer, &size) == 0)
return NULL; return NULL;
if (rwav_load(&wav, buffer, size) != RWAV_ITERATE_DONE) rwav_ret = rwav_load(&wav, buffer, size);
{
free(buffer);
return NULL;
}
free(buffer); free(buffer);
if (rwav_ret != RWAV_ITERATE_DONE)
return NULL;
if (!wav2float(&wav, &pcm, &samples)) if (!wav2float(&wav, &pcm, &samples))
return NULL; return NULL;
if (wav.samplerate != s_rate) if (wav.samplerate != s_rate)
{ {
float* resampled = NULL;
if (!one_shot_resample(pcm, samples, if (!one_shot_resample(pcm, samples,
wav.samplerate, &resampled, &samples)) wav.samplerate, &resampled, &samples))
return NULL; return NULL;
@ -303,6 +295,7 @@ audio_mixer_sound_t* audio_mixer_load_wav(const char* path)
sound->types.wav.pcm = pcm; sound->types.wav.pcm = pcm;
rwav_free(&wav); rwav_free(&wav);
return sound; return sound;
} }