December 2006 - Wine-commits

Ken Thomases : winecoreaudio: Implement widStop.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: c47c82a20b2945cca2fd7085c5d5a2508c841218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47c82a20b2945cca2fd7085c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:07:02 2006 -0600 winecoreaudio: Implement widStop. --- dlls/winmm/winecoreaudio/audio.c | 52 ++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 63d18ce..b8e060e 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -1885,6 +1885,11 @@ static DWORD widStart(WORD wDevID) */ static DWORD widStop(WORD wDevID) { + DWORD ret = MMSYSERR_NOERROR; + WINE_WAVEIN* wwi; + WAVEHDR* lpWaveHdr = NULL; + OSStatus err; + TRACE("(%u);\n", wDevID); if (wDevID >= MAX_WAVEINDRV) { @@ -1892,8 +1897,51 @@ static DWORD widStop(WORD wDevID) return MMSYSERR_INVALHANDLE; } - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + wwi = &WInDev[wDevID]; + + /* The order of the following operations is important since we can't hold + * the mutex while we make an Audio Unit call. Stop the Audio Unit before + * setting the STOPPED state. In widStart, the order is reversed. This + * guarantees that we can't get into a situation where the state is + * PLAYING but the Audio Unit isn't running. Although we can be in STOPPED + * state with the Audio Unit still running, that's harmless because the + * input callback will just throw away the sound data. + */ + err = AudioOutputUnitStop(wwi->audioUnit); + if (err != noErr) + WARN("Failed to stop AU: %08lx\n", err); + + TRACE("Recording stopped.\n"); + + OSSpinLockLock(&wwi->lock); + + if (wwi->state == WINE_WS_CLOSED) + { + WARN("Trying to stop closed device.\n"); + ret = MMSYSERR_INVALHANDLE; + } + else if (wwi->state != WINE_WS_STOPPED) + { + wwi->state = WINE_WS_STOPPED; + /* If there's a buffer in progress, it's done. Remove it from the + * queue so that we can return it to the app, below. */ + if (wwi->lpQueuePtr) + { + lpWaveHdr = wwi->lpQueuePtr; + wwi->lpQueuePtr = lpWaveHdr->lpNext; + } + } + + OSSpinLockUnlock(&wwi->lock); + + if (lpWaveHdr) + { + lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdr->dwFlags |= WHDR_DONE; + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + } + + return ret; }

1 0

Ken Thomases : winecoreaudio: Implement widStart.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 959ec2aa446df10ec142095f1b6c984793d6533f URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ec2aa446df10ec142095f1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:07:08 2006 -0600 winecoreaudio: Implement widStart. --- dlls/winmm/winecoreaudio/audio.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index b8e060e..ee1a62f 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -1868,6 +1868,9 @@ static DWORD widAddBuffer(WORD wDevID, L */ static DWORD widStart(WORD wDevID) { + DWORD ret = MMSYSERR_NOERROR; + WINE_WAVEIN* wwi; + TRACE("(%u);\n", wDevID); if (wDevID >= MAX_WAVEINDRV) { @@ -1875,8 +1878,38 @@ static DWORD widStart(WORD wDevID) return MMSYSERR_INVALHANDLE; } - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + /* The order of the following operations is important since we can't hold + * the mutex while we make an Audio Unit call. Set the PLAYING state + * before starting the Audio Unit. In widStop, the order is reversed. + * This guarantees that we can't get into a situation where the state is + * PLAYING but the Audio Unit isn't running. Although we can be in STOPPED + * state with the Audio Unit still running, that's harmless because the + * input callback will just throw away the sound data. + */ + wwi = &WInDev[wDevID]; + OSSpinLockLock(&wwi->lock); + + if (wwi->state == WINE_WS_CLOSED) + { + WARN("Trying to start closed device.\n"); + ret = MMSYSERR_INVALHANDLE; + } + else + wwi->state = WINE_WS_PLAYING; + + OSSpinLockUnlock(&wwi->lock); + + if (ret == MMSYSERR_NOERROR) + { + /* Start pulling for audio data */ + OSStatus err = AudioOutputUnitStart(wwi->audioUnit); + if (err != noErr) + ERR("Failed to start AU: %08lx\n", err); + + TRACE("Recording started...\n"); + } + + return ret; }

1 0

Ken Thomases : winecoreaudio: Changed widReset to stop the audio unit.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 335ab8c1a2e04e44bd845500310765b6123218c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335ab8c1a2e04e44bd8455003… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:56 2006 -0600 winecoreaudio: Changed widReset to stop the audio unit. --- dlls/winmm/winecoreaudio/audio.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 10a01fc..63d18ce 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -1931,6 +1931,15 @@ static DWORD widReset(WORD wDevID) OSSpinLockUnlock(&wwi->lock); + if (ret == MMSYSERR_NOERROR) + { + OSStatus err = AudioOutputUnitStop(wwi->audioUnit); + if (err != noErr) + WARN("Failed to stop AU: %08lx\n", err); + + TRACE("Recording stopped.\n"); + } + while (lpWaveHdr) { WAVEHDR* lpNext = lpWaveHdr->lpNext;

1 0

Ken Thomases : winecoreaudio: Add widHelper_NotifyCompletions.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 9ef54e4ebee50a6cdef70138ba22db6b3167e2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef54e4ebee50a6cdef70138b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:43 2006 -0600 winecoreaudio: Add widHelper_NotifyCompletions. It scans for completed input wavehdrs, removes them from the queue, and notifies the application that they're done. --- dlls/winmm/winecoreaudio/audio.c | 50 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 2a13f8d..607b711 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -202,6 +202,7 @@ static CFMessagePortRef Port_SendToMessa static void wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo); static void wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force); +static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi); extern int AudioUnit_CreateDefaultAudioUnit(void *wwo, AudioUnit *au); extern int AudioUnit_CloseAudioUnit(AudioUnit au); @@ -1504,6 +1505,55 @@ static DWORD widNotifyClient(WINE_WAVEIN /************************************************************************** + * widHelper_NotifyCompletions [internal] + */ +static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi) +{ + LPWAVEHDR lpWaveHdr; + LPWAVEHDR lpFirstDoneWaveHdr = NULL; + LPWAVEHDR lpLastDoneWaveHdr = NULL; + + OSSpinLockLock(&wwi->lock); + + /* First, excise all of the done headers from the queue into + * a free-standing list. */ + + /* Start from lpQueuePtr and keep notifying until: + * - we hit an unfilled wavehdr + * - we hit the end of the list + */ + for ( + lpWaveHdr = wwi->lpQueuePtr; + lpWaveHdr && + lpWaveHdr->dwBytesRecorded >= lpWaveHdr->dwBufferLength; + lpWaveHdr = lpWaveHdr->lpNext + ) + { + if (!lpFirstDoneWaveHdr) + lpFirstDoneWaveHdr = lpWaveHdr; + lpLastDoneWaveHdr = lpWaveHdr; + } + + if (lpLastDoneWaveHdr) + { + wwi->lpQueuePtr = lpLastDoneWaveHdr->lpNext; + lpLastDoneWaveHdr->lpNext = NULL; + } + + OSSpinLockUnlock(&wwi->lock); + + /* Now, send the "done" notification for each header in our list. */ + for (lpWaveHdr = lpFirstDoneWaveHdr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) + { + lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; + lpWaveHdr->dwFlags |= WHDR_DONE; + + widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + } +} + + +/************************************************************************** * widGetDevCaps [internal] */ static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize)

1 0

Ken Thomases : winecoreaudio: Add mechanism for cross-thread call of widHelper_NotifyCompletions.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: cff4da8db8a152535a0e20110618ea8815e67e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cff4da8db8a152535a0e20110… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:51 2006 -0600 winecoreaudio: Add mechanism for cross-thread call of widHelper_NotifyCompletions. wodSendNotifyInputCompletionsMessage sends the kWaveInNotifyCompletionsMessage to the message thread, which calls widHelper_NotifyCompletions. --- dlls/winmm/winecoreaudio/audio.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 607b711..10a01fc 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -284,7 +284,7 @@ static const char * getMessage(UINT msg) #define kStopLoopMessage 0 #define kWaveOutNotifyCompletionsMessage 1 -#define kWaveInCallbackMessage 2 +#define kWaveInNotifyCompletionsMessage 2 /* Mach Message Handling */ static CFDataRef wodMessageHandler(CFMessagePortRef port_ReceiveInMessageThread, SInt32 msgid, CFDataRef data, void *info) @@ -297,7 +297,10 @@ static CFDataRef wodMessageHandler(CFMes buffer = (UInt32 *) CFDataGetBytePtr(data); wodHelper_NotifyCompletions(&WOutDev[buffer[0]], FALSE); break; - case kWaveInCallbackMessage: + case kWaveInNotifyCompletionsMessage: + buffer = (UInt32 *) CFDataGetBytePtr(data); + widHelper_NotifyCompletions(&WInDev[buffer[0]]); + break; default: CFRunLoopStop(CFRunLoopGetCurrent()); break; @@ -342,6 +345,25 @@ static void wodSendNotifyCompletionsMess CFRelease(data); } +/************************************************************************** +* wodSendNotifyInputCompletionsMessage [internal] +* Call from AudioUnit IO thread can't use Wine debug channels. +*/ +static void wodSendNotifyInputCompletionsMessage(WINE_WAVEIN* wwi) +{ + CFDataRef data; + UInt32 buffer; + + buffer = (UInt32) wwi->wiID; + + data = CFDataCreate(kCFAllocatorDefault, (UInt8 *)&buffer, sizeof(buffer)); + if (!data) + return; + + CFMessagePortSendRequest(Port_SendToMessageThread, kWaveInNotifyCompletionsMessage, data, 0.0, 0.0, NULL, NULL); + CFRelease(data); +} + static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, PCMWAVEFORMAT* format) {

1 0

Ken Thomases : winecoreaudio: Store the device ID in the WINE_WAVEOUT structure.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 19c75a4ec6228d1f23b2dfa477b6c2cd16337ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c75a4ec6228d1f23b2dfa47… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:35 2006 -0600 winecoreaudio: Store the device ID in the WINE_WAVEOUT structure. --- dlls/winmm/winecoreaudio/audio.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 4389bc1..2a13f8d 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -158,6 +158,9 @@ typedef struct { } WINE_WAVEOUT; typedef struct { + /* This device's device number */ + DWORD wiID; + /* Access to the following fields is synchronized across threads. */ volatile int state; LPWAVEHDR lpQueuePtr; @@ -534,6 +537,7 @@ LONG CoreAudio_WaveInit(void) for (i = 0; i < MAX_WAVEINDRV; ++i) { memset(&WInDev[i], 0, sizeof(WInDev[i])); + WInDev[i].wiID = i; /* Establish preconditions for widOpen */ WInDev[i].state = WINE_WS_CLOSED;

1 0

Ken Thomases : winecoreaudio: Do additional setup in AudioUnit_CreateInputUnit.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 4b904bbf13f0954a5e61355e8930404c8e7794f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b904bbf13f0954a5e61355e8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:23 2006 -0600 winecoreaudio: Do additional setup in AudioUnit_CreateInputUnit. It now returns in an output parameter the frame count that the AU will use. Also, initialize the Audio Unit. --- dlls/winmm/winecoreaudio/audio.c | 8 +++++--- dlls/winmm/winecoreaudio/audiounit.c | 28 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index a1398af..6aac76d 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -211,7 +211,8 @@ extern int AudioUnit_SetVolume(AudioUnit extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); extern int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, - WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample); + WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample, + UInt32* outFrameCount); OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, @@ -1522,7 +1523,8 @@ static DWORD widGetDevCaps(WORD wDevID, */ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { - WINE_WAVEIN* wwi; + WINE_WAVEIN* wwi; + UInt32 frameCount; TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) @@ -1592,7 +1594,7 @@ static DWORD widOpen(WORD wDevID, LPWAVE if (!AudioUnit_CreateInputUnit(wwi, &wwi->audioUnit, wwi->format.wf.nChannels, wwi->format.wf.nSamplesPerSec, - wwi->format.wBitsPerSample)) + wwi->format.wBitsPerSample, &frameCount)) { ERR("AudioUnit_CreateInputUnit failed\n"); OSSpinLockUnlock(&wwi->lock); diff --git a/dlls/winmm/winecoreaudio/audiounit.c b/dlls/winmm/winecoreaudio/audiounit.c index 03b4d00..433cab1 100644 --- a/dlls/winmm/winecoreaudio/audiounit.c +++ b/dlls/winmm/winecoreaudio/audiounit.c @@ -131,7 +131,8 @@ int AudioUnit_GetVolume(AudioUnit au, fl int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, - WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample) + WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample, + UInt32* outFrameCount) { OSStatus err = noErr; ComponentDescription description; @@ -143,6 +144,12 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioStreamBasicDescription desiredFormat; + if (!outFrameCount) + { + ERR("Invalid parameter\n"); + return 0; + } + /* Open the AudioOutputUnit */ description.componentType = kAudioUnitType_Output; description.componentSubType = kAudioUnitSubType_HALOutput; @@ -244,6 +251,25 @@ int AudioUnit_CreateInputUnit(void* wwi, goto error; } + /* Get the number of frames in the IO buffer(s) */ + param = sizeof(*outFrameCount); + err = AudioUnitGetProperty(au, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, 0, outFrameCount, &param); + if (err != noErr) + { + ERR("Failed to get audio sample size: %08lx\n", err); + goto error; + } + + TRACE("Frame count: %lu\n", *outFrameCount); + + /* Initialize the AU */ + err = AudioUnitInitialize(au); + if (err != noErr) + { + ERR("Failed to initialize AU: %08lx\n", err); + goto error; + } + *out_au = au; return 1;

1 0

Ken Thomases : winecoreaudio: Allocate/deallocate audio buffers in widOpen/ widClose.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 127523d7a2b7dbe3b04ca13c76dae0d4568b21af URL: http://source.winehq.org/git/wine.git/?a=commit;h=127523d7a2b7dbe3b04ca13c7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:29 2006 -0600 winecoreaudio: Allocate/deallocate audio buffers in widOpen/widClose. --- dlls/winmm/winecoreaudio/audio.c | 67 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 6aac76d..4389bc1 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -176,6 +176,7 @@ typedef struct { PCMWAVEFORMAT format; AudioUnit audioUnit; + AudioBufferList*bufferList; /* Record state of debug channels at open. Used to control fprintf's since * we can't use Wine debug channel calls in non-Wine AudioUnit threads. */ @@ -1519,12 +1520,61 @@ static DWORD widGetDevCaps(WORD wDevID, /************************************************************************** + * widHelper_DestroyAudioBufferList [internal] + * Convenience function to dispose of our audio buffers + */ +static void widHelper_DestroyAudioBufferList(AudioBufferList* list) +{ + if (list) + { + UInt32 i; + for (i = 0; i < list->mNumberBuffers; i++) + { + if (list->mBuffers[i].mData) + HeapFree(GetProcessHeap(), 0, list->mBuffers[i].mData); + } + HeapFree(GetProcessHeap(), 0, list); + } +} + + +/************************************************************************** + * widHelper_AllocateAudioBufferList [internal] + * Convenience function to allocate our audio buffers + */ +static AudioBufferList* widHelper_AllocateAudioBufferList(UInt32 numChannels, UInt32 size) +{ + AudioBufferList* list; + UInt32 i; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioBufferList) + numChannels * sizeof(AudioBuffer)); + if (list == NULL) + return NULL; + + list->mNumberBuffers = numChannels; + for (i = 0; i < numChannels; ++i) + { + list->mBuffers[i].mNumberChannels = 1; + list->mBuffers[i].mDataByteSize = size; + list->mBuffers[i].mData = HeapAlloc(GetProcessHeap(), 0, size); + if (list->mBuffers[i].mData == NULL) + { + widHelper_DestroyAudioBufferList(list); + return NULL; + } + } + return list; +} + + +/************************************************************************** * widOpen [internal] */ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { WINE_WAVEIN* wwi; UInt32 frameCount; + UInt32 bytesPerFrame; TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) @@ -1601,6 +1651,19 @@ static DWORD widOpen(WORD wDevID, LPWAVE return MMSYSERR_ERROR; } + /* Allocate our audio buffers */ + /* For interleaved audio, we allocate one buffer for all channels. */ + bytesPerFrame = wwi->format.wBitsPerSample * wwi->format.wf.nChannels / 8; + wwi->bufferList = widHelper_AllocateAudioBufferList(1, wwi->format.wf.nChannels * frameCount * bytesPerFrame); + if (wwi->bufferList == NULL) + { + ERR("Failed to allocate buffer list\n"); + AudioUnitUninitialize(wwi->audioUnit); + AudioUnit_CloseAudioUnit(wwi->audioUnit); + OSSpinLockUnlock(&wwi->lock); + return MMSYSERR_NOMEM; + } + OSSpinLockUnlock(&wwi->lock); return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); @@ -1658,6 +1721,10 @@ static DWORD widClose(WORD wDevID) ERR("Can't close AudioUnit\n"); } + /* Dellocate our audio buffers */ + widHelper_DestroyAudioBufferList(wwi->bufferList); + wwi->bufferList = NULL; + ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); }

1 0

Ken Thomases : winecoreaudio: Implement widDevInterfaceSize and widDevInterface.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 5c489283c9e422749afec4515581729144db50d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c489283c9e422749afec4515… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:06:16 2006 -0600 winecoreaudio: Implement widDevInterfaceSize and widDevInterface. --- dlls/winmm/winecoreaudio/audio.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 94120e6..a1398af 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -168,6 +168,7 @@ typedef struct { /* Capabilities description */ WAVEINCAPSW caps; + char interface_name[32]; /* Record the arguments used when opening the device. */ WAVEOPENDESC waveDesc; @@ -543,6 +544,7 @@ LONG CoreAudio_WaveInit(void) snprintf(szPname, sizeof(szPname), "CoreAudio WaveIn %d", i); MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); + snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winecoreaudio in: %d", i); WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M08; WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; @@ -1815,8 +1817,9 @@ static DWORD widDevInterfaceSize(UINT wD { TRACE("(%u, %p)\n", wDevID, dwParam1); - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + NULL, 0 ) * sizeof(WCHAR); + return MMSYSERR_NOERROR; } @@ -1825,8 +1828,14 @@ static DWORD widDevInterfaceSize(UINT wD */ static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) { - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + NULL, 0 ) * sizeof(WCHAR)) + { + MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + dwParam1, dwParam2 / sizeof(WCHAR)); + return MMSYSERR_NOERROR; + } + return MMSYSERR_INVALPARAM; }

1 0

Ken Thomases : winecoreaudio: Implement widOpen and widClose.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 5432adaaac04ca76891f396b3d0966918db08a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5432adaaac04ca76891f396b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 28 11:05:31 2006 -0600 winecoreaudio: Implement widOpen and widClose. --- dlls/winmm/winecoreaudio/audio.c | 132 +++++++++++++++++++++++++++++++++++-- 1 files changed, 124 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/winecoreaudio/audio.c b/dlls/winmm/winecoreaudio/audio.c index 0ab9109..51e71a8 100644 --- a/dlls/winmm/winecoreaudio/audio.c +++ b/dlls/winmm/winecoreaudio/audio.c @@ -160,6 +160,8 @@ typedef struct { typedef struct { /* Access to the following fields is synchronized across threads. */ volatile int state; + LPWAVEHDR lpQueuePtr; + DWORD dwTotalRecorded; /* Synchronization mechanism to protect above fields */ OSSpinLock lock; @@ -170,15 +172,20 @@ typedef struct { /* Record the arguments used when opening the device. */ WAVEOPENDESC waveDesc; WORD wFlags; + PCMWAVEFORMAT format; + + AudioUnit audioUnit; + + /* Record state of debug channels at open. Used to control fprintf's since + * we can't use Wine debug channel calls in non-Wine AudioUnit threads. */ + BOOL trace_on; + BOOL warn_on; + BOOL err_on; /* These fields aren't used. */ #if 0 CoreAudio_Device *cadev; - PCMWAVEFORMAT format; - LPWAVEHDR lpQueuePtr; - DWORD dwTotalRecorded; - AudioUnit audioUnit; AudioStreamBasicDescription streamDescription; #endif } WINE_WAVEIN; @@ -202,6 +209,9 @@ extern OSStatus AudioUnitUninitialize(Au extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); +extern int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, + WORD nChannels, DWORD nSamplesPerSec, WORD wBitsPerSample); + OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, @@ -1510,6 +1520,8 @@ static DWORD widGetDevCaps(WORD wDevID, */ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { + WINE_WAVEIN* wwi; + TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -1522,8 +1534,72 @@ static DWORD widOpen(WORD wDevID, LPWAVE return MMSYSERR_BADDEVICEID; } - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + TRACE("Format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n", + lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, + lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); + + if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM || + lpDesc->lpFormat->nChannels == 0 || + lpDesc->lpFormat->nSamplesPerSec == 0 + ) + { + WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n", + lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, + lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); + return WAVERR_BADFORMAT; + } + + if (dwFlags & WAVE_FORMAT_QUERY) + { + TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n", + lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, + lpDesc->lpFormat->nSamplesPerSec); + return MMSYSERR_NOERROR; + } + + wwi = &WInDev[wDevID]; + if (!OSSpinLockTry(&wwi->lock)) + return MMSYSERR_ALLOCATED; + + if (wwi->state != WINE_WS_CLOSED) + { + OSSpinLockUnlock(&wwi->lock); + return MMSYSERR_ALLOCATED; + } + + wwi->state = WINE_WS_STOPPED; + wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + + memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); + + if (wwi->format.wBitsPerSample == 0) + { + WARN("Resetting zeroed wBitsPerSample\n"); + wwi->format.wBitsPerSample = 8 * + (wwi->format.wf.nAvgBytesPerSec / + wwi->format.wf.nSamplesPerSec) / + wwi->format.wf.nChannels; + } + + wwi->dwTotalRecorded = 0; + + wwi->trace_on = TRACE_ON(wave); + wwi->warn_on = WARN_ON(wave); + wwi->err_on = ERR_ON(wave); + + if (!AudioUnit_CreateInputUnit(wwi, &wwi->audioUnit, + wwi->format.wf.nChannels, wwi->format.wf.nSamplesPerSec, + wwi->format.wBitsPerSample)) + { + ERR("AudioUnit_CreateInputUnit failed\n"); + OSSpinLockUnlock(&wwi->lock); + return MMSYSERR_ERROR; + } + + OSSpinLockUnlock(&wwi->lock); + + return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); } @@ -1532,6 +1608,9 @@ static DWORD widOpen(WORD wDevID, LPWAVE */ static DWORD widClose(WORD wDevID) { + DWORD ret = MMSYSERR_NOERROR; + WINE_WAVEIN* wwi; + TRACE("(%u);\n", wDevID); if (wDevID >= MAX_WAVEINDRV) @@ -1540,8 +1619,45 @@ static DWORD widClose(WORD wDevID) return MMSYSERR_BADDEVICEID; } - FIXME("unimplemented\n"); - return MMSYSERR_NOTENABLED; + wwi = &WInDev[wDevID]; + OSSpinLockLock(&wwi->lock); + if (wwi->state == WINE_WS_CLOSED) + { + WARN("Device already closed.\n"); + ret = MMSYSERR_INVALHANDLE; + } + else if (wwi->lpQueuePtr) + { + WARN("Buffers in queue.\n"); + ret = WAVERR_STILLPLAYING; + } + else + { + wwi->state = WINE_WS_CLOSED; + } + + OSSpinLockUnlock(&wwi->lock); + + if (ret == MMSYSERR_NOERROR) + { + OSStatus err = AudioUnitUninitialize(wwi->audioUnit); + if (err) + { + ERR("AudioUnitUninitialize return %c%c%c%c\n", (char) (err >> 24), + (char) (err >> 16), + (char) (err >> 8), + (char) err); + } + + if (!AudioUnit_CloseAudioUnit(wwi->audioUnit)) + { + ERR("Can't close AudioUnit\n"); + } + + ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + } + + return ret; }

1 0