Commit 17be86aa authored by David Reid's avatar David Reid

Updates profiling and dithering tests.

parent 1acb96ed
...@@ -17,7 +17,7 @@ mal_uint32 on_convert_samples_in(mal_format_converter* pConverter, mal_uint32 fr ...@@ -17,7 +17,7 @@ mal_uint32 on_convert_samples_in(mal_format_converter* pConverter, mal_uint32 fr
mal_sine_wave* pSineWave = (mal_sine_wave*)pConverter->config.pUserData; mal_sine_wave* pSineWave = (mal_sine_wave*)pConverter->config.pUserData;
mal_assert(pSineWave); mal_assert(pSineWave);
return (mal_uint32)mal_sine_wave_read(pSineWave, frameCount, (float*)pFrames); return (mal_uint32)mal_sine_wave_read_f32(pSineWave, frameCount, (float*)pFrames);
} }
mal_uint32 on_convert_samples_out(mal_format_converter* pConverter, mal_uint32 frameCount, void* pFrames, void* pUserData) mal_uint32 on_convert_samples_out(mal_format_converter* pConverter, mal_uint32 frameCount, void* pFrames, void* pUserData)
...@@ -36,7 +36,7 @@ mal_uint32 on_send_to_device__original(mal_device* pDevice, mal_uint32 frameCoun ...@@ -36,7 +36,7 @@ mal_uint32 on_send_to_device__original(mal_device* pDevice, mal_uint32 frameCoun
mal_assert(pDevice->format == mal_format_f32); mal_assert(pDevice->format == mal_format_f32);
mal_assert(pDevice->channels == 1); mal_assert(pDevice->channels == 1);
return (mal_uint32)mal_sine_wave_read(&sineWave, frameCount, (float*)pFrames); return (mal_uint32)mal_sine_wave_read_f32(&sineWave, frameCount, (float*)pFrames);
} }
mal_uint32 on_send_to_device__dithered(mal_device* pDevice, mal_uint32 frameCount, void* pFrames) mal_uint32 on_send_to_device__dithered(mal_device* pDevice, mal_uint32 frameCount, void* pFrames)
......
...@@ -590,7 +590,7 @@ int do_profiling__format_conversion__profile_set(mal_format formatIn, mal_format ...@@ -590,7 +590,7 @@ int do_profiling__format_conversion__profile_set(mal_format formatIn, mal_format
mal_sine_wave sineWave; mal_sine_wave sineWave;
mal_sine_wave_init(1.0, 400, 48000, &sineWave); mal_sine_wave_init(1.0, 400, 48000, &sineWave);
mal_sine_wave_read(&sineWave, sampleCount, pSourceData); mal_sine_wave_read_f32(&sineWave, sampleCount, pSourceData);
void* pBaseData = mal_aligned_malloc(sampleCount * mal_get_bytes_per_sample(formatIn), MAL_SIMD_ALIGNMENT); void* pBaseData = mal_aligned_malloc(sampleCount * mal_get_bytes_per_sample(formatIn), MAL_SIMD_ALIGNMENT);
mal_pcm_convert(pBaseData, formatIn, pSourceData, mal_format_f32, sampleCount, mal_dither_mode_none); mal_pcm_convert(pBaseData, formatIn, pSourceData, mal_format_f32, sampleCount, mal_dither_mode_none);
...@@ -681,7 +681,7 @@ mal_uint32 channel_router_on_read(mal_channel_router* pRouter, mal_uint32 frameC ...@@ -681,7 +681,7 @@ mal_uint32 channel_router_on_read(mal_channel_router* pRouter, mal_uint32 frameC
for (mal_uint32 iChannel = 0; iChannel < pRouter->config.channelsIn; ++iChannel) { for (mal_uint32 iChannel = 0; iChannel < pRouter->config.channelsIn; ++iChannel) {
mal_sine_wave_init(1/(iChannel+1), 400, 48000, &g_sineWave); mal_sine_wave_init(1/(iChannel+1), 400, 48000, &g_sineWave);
mal_sine_wave_read(&g_sineWave, frameCount, ppSamplesOutF[iChannel]); mal_sine_wave_read_f32(&g_sineWave, frameCount, ppSamplesOutF[iChannel]);
} }
return frameCount; return frameCount;
...@@ -1071,7 +1071,7 @@ int do_profiling__src() ...@@ -1071,7 +1071,7 @@ int do_profiling__src()
mal_sine_wave sineWave; mal_sine_wave sineWave;
mal_sine_wave_init(1.0f, 400 + (iChannel*50), 48000, &sineWave); mal_sine_wave_init(1.0f, 400 + (iChannel*50), 48000, &sineWave);
mal_sine_wave_read(&sineWave, baseData.frameCount, baseData.pFrameData[iChannel]); mal_sine_wave_read_f32(&sineWave, baseData.frameCount, baseData.pFrameData[iChannel]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment