ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-22 23:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix WASAPI resampling when the sample rate significantly differs from the mix format

Browse source
This commit is contained in:
Cameron Gutman 2018-10-14 13:27:10 -07:00 committed by Andrew Kelley
parent 03d33a8419
commit fb23636c95
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/wasapi.c
View file

@ -1268,11 +1268,11 @@ static int outstream_do_open(struct SoundIoPrivate *si, struct SoundIoOutStreamP
if (FAILED(hr = IAudioClient_GetMixFormat(osw->audio_client, (WAVEFORMATEX **)&mix_format))) { if (FAILED(hr = IAudioClient_GetMixFormat(osw->audio_client, (WAVEFORMATEX **)&mix_format))) {
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
wave_format.Format.nSamplesPerSec = mix_format->Format.nSamplesPerSec; wave_format.Format.nSamplesPerSec = (DWORD)outstream->sample_rate;
osw->need_resample = (mix_format->Format.nSamplesPerSec != wave_format.Format.nSamplesPerSec);
CoTaskMemFree(mix_format); CoTaskMemFree(mix_format);
mix_format = NULL; mix_format = NULL;
osw->need_resample = (wave_format.Format.nSamplesPerSec != (DWORD)outstream->sample_rate); flags = osw->need_resample ? AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY : 0;
flags = osw->need_resample ? AUDCLNT_STREAMFLAGS_RATEADJUST : 0;
share_mode = AUDCLNT_SHAREMODE_SHARED; share_mode = AUDCLNT_SHAREMODE_SHARED;
periodicity = 0; periodicity = 0;
buffer_duration = to_reference_time(4.0); buffer_duration = to_reference_time(4.0);
@ -1300,11 +1300,11 @@ static int outstream_do_open(struct SoundIoPrivate *si, struct SoundIoOutStreamP
if (FAILED(hr = IAudioClient_GetMixFormat(osw->audio_client, (WAVEFORMATEX **)&mix_format))) { if (FAILED(hr = IAudioClient_GetMixFormat(osw->audio_client, (WAVEFORMATEX **)&mix_format))) {
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
wave_format.Format.nSamplesPerSec = mix_format->Format.nSamplesPerSec; wave_format.Format.nSamplesPerSec = (DWORD)outstream->sample_rate;
osw->need_resample = (mix_format->Format.nSamplesPerSec != wave_format.Format.nSamplesPerSec);
CoTaskMemFree(mix_format); CoTaskMemFree(mix_format);
mix_format = NULL; mix_format = NULL;
osw->need_resample = (wave_format.Format.nSamplesPerSec != (DWORD)outstream->sample_rate); flags = osw->need_resample ? AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY : 0;
flags = osw->need_resample ? AUDCLNT_STREAMFLAGS_RATEADJUST : 0;
to_wave_format_layout(&outstream->layout, &wave_format); to_wave_format_layout(&outstream->layout, &wave_format);
to_wave_format_format(outstream->format, &wave_format); to_wave_format_format(outstream->format, &wave_format);
complete_wave_format_data(&wave_format); complete_wave_format_data(&wave_format);
@ -1349,17 +1349,6 @@ static int outstream_do_open(struct SoundIoPrivate *si, struct SoundIoOutStreamP
if (FAILED(hr = IAudioClient_SetEventHandle(osw->audio_client, osw->h_event))) { if (FAILED(hr = IAudioClient_SetEventHandle(osw->audio_client, osw->h_event))) {
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
} else if (osw->need_resample) {
if (FAILED(hr = IAudioClient_GetService(osw->audio_client, IID_IAUDIOCLOCKADJUSTMENT,
(void**)&osw->audio_clock_adjustment)))
{
return SoundIoErrorOpeningDevice;
}
if (FAILED(hr = IAudioClockAdjustment_SetSampleRate(osw->audio_clock_adjustment,
outstream->sample_rate)))
{
return SoundIoErrorOpeningDevice;
}
} }
if (outstream->name) { if (outstream->name) {