Andrew Eikum : xaudio2: Fix mmdevapi buffer size calculation.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Sep 25 15:22:02 CDT 2015
Module: wine
Branch: master
Commit: 2decbcc05f62dd58cfe978a7f1edc187b74f72dc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2decbcc05f62dd58cfe978a7f1edc187b74f72dc
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Thu Sep 24 14:33:05 2015 -0500
xaudio2: Fix mmdevapi buffer size calculation.
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
---
dlls/xaudio2_7/xaudio_dll.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c
index ccbcd21..4f8c76b 100644
--- a/dlls/xaudio2_7/xaudio_dll.c
+++ b/dlls/xaudio2_7/xaudio_dll.c
@@ -1798,7 +1798,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface,
HRESULT hr;
WAVEFORMATEX *fmt;
ALCint attrs[7];
- REFERENCE_TIME period;
+ REFERENCE_TIME period, bufdur;
TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This,
ppMasteringVoice, inputChannels, inputSampleRate, flags,
@@ -1885,18 +1885,21 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface,
CoTaskMemFree(fmt);
- hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED,
- AUDCLNT_STREAMFLAGS_EVENTCALLBACK, inputSampleRate /* 1s buffer */,
- 0, &This->fmt.Format, NULL);
+ hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL);
if(FAILED(hr)){
- WARN("Initialize failed: %08x\n", hr);
+ WARN("GetDevicePeriod failed: %08x\n", hr);
hr = XAUDIO2_E_DEVICE_INVALIDATED;
goto exit;
}
- hr = IAudioClient_GetDevicePeriod(This->aclient, &period, NULL);
+ /* 3 periods or 0.1 seconds */
+ bufdur = max(3 * period, 1000000);
+
+ hr = IAudioClient_Initialize(This->aclient, AUDCLNT_SHAREMODE_SHARED,
+ AUDCLNT_STREAMFLAGS_EVENTCALLBACK, bufdur,
+ 0, &This->fmt.Format, NULL);
if(FAILED(hr)){
- WARN("GetDevicePeriod failed: %08x\n", hr);
+ WARN("Initialize failed: %08x\n", hr);
hr = XAUDIO2_E_DEVICE_INVALIDATED;
goto exit;
}
More information about the wine-cvs
mailing list