Andrew Eikum : winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY.
Alexandre Julliard
julliard at winehq.org
Fri Jan 10 14:44:56 CST 2014
Module: wine
Branch: stable
Commit: 7d8624a9162ecd15fa6d925282a536c754487c57
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8624a9162ecd15fa6d925282a536c754487c57
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Mon Nov 18 14:23:02 2013 -0600
winmm: Also try MSACM conversions with WAVE_FORMAT_QUERY.
(cherry picked from commit 06c95af45726674847d12440d904568f59f627bc)
---
dlls/winmm/waveform.c | 66 +++++++++++++++++++++++++++----------------------
1 file changed, 36 insertions(+), 30 deletions(-)
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index 23adfc0..573411c 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -879,7 +879,7 @@ static inline BOOL WINMM_IsMapper(UINT device)
}
static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt,
- WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_out)
+ WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_query, BOOL is_out)
{
WAVEFORMATEX target, *closer_fmt = NULL;
HRESULT hr;
@@ -915,6 +915,9 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt,
return mr;
/* yes it can. initialize the audioclient and return success */
+ if(is_query)
+ return MMSYSERR_NOERROR;
+
hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED,
AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,
AC_BUFLEN, 0, &target, &device->parent->session);
@@ -933,7 +936,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt,
return MMSYSERR_NOERROR;
}
-static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out)
+static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_query, BOOL is_out)
{
MMRESULT mr;
WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)device->orig_fmt;
@@ -947,13 +950,13 @@ static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out)
/* convert to PCM format if it's not already */
mr = WINMM_TryDeviceMapping(device, device->orig_fmt,
device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec,
- 16, is_out);
+ 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
mr = WINMM_TryDeviceMapping(device, device->orig_fmt,
device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec,
- 8, is_out);
+ 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
}else{
@@ -962,90 +965,90 @@ static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_out)
/* first try just changing bit depth and channels */
channels = device->orig_fmt->nChannels;
mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels,
- device->orig_fmt->nSamplesPerSec, 16, is_out);
+ device->orig_fmt->nSamplesPerSec, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels,
- device->orig_fmt->nSamplesPerSec, 8, is_out);
+ device->orig_fmt->nSamplesPerSec, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
channels = (channels == 2) ? 1 : 2;
mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels,
- device->orig_fmt->nSamplesPerSec, 16, is_out);
+ device->orig_fmt->nSamplesPerSec, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels,
- device->orig_fmt->nSamplesPerSec, 8, is_out);
+ device->orig_fmt->nSamplesPerSec, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
/* that didn't work, so now try different sample rates */
channels = device->orig_fmt->nChannels;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
channels = (channels == 2) ? 1 : 2;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
channels = device->orig_fmt->nChannels;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
channels = (channels == 2) ? 1 : 2;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
- mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_out);
+ mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out);
if(mr == MMSYSERR_NOERROR)
return mr;
}
@@ -1114,7 +1117,10 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info,
AUDCLNT_SHAREMODE_SHARED, device->orig_fmt, &closer_fmt);
if(closer_fmt)
CoTaskMemFree(closer_fmt);
- ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr);
+ if((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !(info->flags & WAVE_FORMAT_DIRECT))
+ ret = WINMM_MapDevice(device, TRUE, is_out);
+ else
+ ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr);
goto error;
}
@@ -1123,7 +1129,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info,
AC_BUFLEN, 0, device->orig_fmt, &device->parent->session);
if(FAILED(hr)){
if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){
- ret = WINMM_MapDevice(device, is_out);
+ ret = WINMM_MapDevice(device, FALSE, is_out);
if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY)
goto error;
}else{
More information about the wine-cvs
mailing list