wine-devel November 2021

wine-devel@winehq.org

83 participants
756 discussions

[PATCH 11/12] winecoreaudio: Move get_capture_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 56 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 55 +++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 12 +++++++ 3 files changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2519a6bcfaa..ae44b562c22 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1402,6 +1402,61 @@ static NTSTATUS release_render_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 chunk_bytes, chunk_frames; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + + capture_resample(stream); + + *params->frames = 0; + + if(stream->held_frames < stream->period_frames){ + params->result = AUDCLNT_S_BUFFER_EMPTY; + goto end; + } + + *params->flags = 0; + chunk_frames = stream->bufsize_frames - stream->lcl_offs_frames; + if(chunk_frames < stream->period_frames){ + chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + if(!stream->tmp_buffer){ + stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } + *params->data = stream->tmp_buffer; + memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, + chunk_bytes); + memcpy(*params->data + chunk_bytes, stream->local_buffer, + stream->period_frames * stream->fmt->nBlockAlign - chunk_bytes); + }else + *params->data = stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *params->frames = stream->period_frames; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1412,6 +1467,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, get_render_buffer, release_render_buffer, + get_capture_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1874382304b..84525ac8a53 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1359,7 +1359,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - UINT32 chunk_bytes, chunk_frames; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1372,51 +1372,14 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - capture_resample(This); - - if(This->stream->held_frames < This->stream->period_frames){ - *frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_S_BUFFER_EMPTY; - } - - *flags = 0; - - chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; - if(chunk_frames < This->stream->period_frames){ - chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer){ - This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); - } - *data = This->stream->tmp_buffer; - memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); - }else - *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->getbuf_last = *frames = This->stream->period_frames; - - if(devpos) - *devpos = This->stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; + UNIX_CALL(get_capture_buffer, &params); + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 80f42741e34..2211f1048a3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -109,6 +109,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct coreaudio_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + DWORD *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct get_mix_format_params { EDataFlow flow; @@ -158,6 +169,7 @@ enum unix_funcs unix_reset, unix_get_render_buffer, unix_release_render_buffer, + unix_get_capture_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 10/12] winecoreaudio: Move release_render_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 45 ++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 73 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 ++++ 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0bf21cd6c7d..2519a6bcfaa 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1358,6 +1358,50 @@ end: return STATUS_SUCCESS; } +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + BYTE *buffer; + + OSSpinLockLock(&stream->lock); + + if(!params->frames){ + stream->getbuf_last = 0; + params->result = S_OK; + }else if(!stream->getbuf_last) + params->result = AUDCLNT_E_OUT_OF_ORDER; + else if(params->frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + params->result = AUDCLNT_E_INVALID_SIZE; + else{ + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, params->frames); + + if(stream->getbuf_last < 0) + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + buffer, params->frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += params->frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += params->frames; + stream->written_frames += params->frames; + stream->getbuf_last = 0; + + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1367,6 +1411,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, get_render_buffer, + release_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5dca497594a..1874382304b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,30 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, - BYTE *src, UINT32 src_bytes) -{ - UINT32 chunk_bytes = dst_bytes - dst_offs; - - if(chunk_bytes < src_bytes){ - memcpy(dst + dst_offs, src, chunk_bytes); - memcpy(dst, src + chunk_bytes, src_bytes - chunk_bytes); - }else - memcpy(dst + dst_offs, src, src_bytes); -} - -static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static void capture_resample(ACImpl *This) { UNIX_CALL(capture_resample, This->stream); @@ -1322,52 +1298,15 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->stream->lock); - - if(!frames){ - This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - if(!This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_INVALID_SIZE; - } - - if(This->stream->getbuf_last >= 0) - buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - else - buffer = This->stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->stream, buffer, frames); - - if(This->stream->getbuf_last < 0) - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - buffer, frames * This->stream->fmt->nBlockAlign); - - - This->stream->wri_offs_frames += frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - This->stream->held_frames += frames; - This->stream->written_frames += frames; - This->stream->getbuf_last = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.flags = flags; + UNIX_CALL(release_render_buffer, &params); + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e2ae457e705..80f42741e34 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -101,6 +101,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + DWORD flags; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -149,6 +157,7 @@ enum unix_funcs unix_stop, unix_reset, unix_get_render_buffer, + unix_release_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 09/12] winecoreaudio: Move get_render_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 60 +++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 75 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 10 +++- 3 files changed, 73 insertions(+), 72 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ee34cd29de1..0bf21cd6c7d 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -699,6 +699,9 @@ static NTSTATUS release_stream( void *args ) if(stream->local_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &stream->local_buffer_size, MEM_RELEASE); + if(stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); free(stream->fmt); params->result = S_OK; return STATUS_SUCCESS; @@ -1230,9 +1233,9 @@ static NTSTATUS get_current_padding(void *args) struct get_current_padding_params *params = args; struct coreaudio_stream *stream = params->stream; - if(params->lock) OSSpinLockLock(&stream->lock); + OSSpinLockLock(&stream->lock); *params->padding = get_current_padding_nolock(stream); - if(params->lock) OSSpinLockUnlock(&stream->lock); + OSSpinLockUnlock(&stream->lock); params->result = S_OK; return STATUS_SUCCESS; } @@ -1303,6 +1306,58 @@ static NTSTATUS reset(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 pad; + + OSSpinLockLock(&stream->lock); + + pad = get_current_padding_nolock(stream); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + if(!params->frames){ + params->result = S_OK; + goto end; + } + if(pad + params->frames > stream->bufsize_frames){ + params->result = AUDCLNT_E_BUFFER_TOO_LARGE; + goto end; + } + + if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < params->frames){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); + stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + params->result = E_OUTOFMEMORY; + goto end; + } + stream->tmp_buffer_frames = params->frames; + } + *params->data = stream->tmp_buffer; + stream->getbuf_last = -params->frames; + }else{ + *params->data = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + stream->getbuf_last = params->frames; + } + + silence_buffer(stream, *params->data, params->frames); + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1311,6 +1366,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = start, stop, reset, + get_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cf2c23a0f40..5dca497594a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -554,9 +554,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) CloseHandle(event); } if(This->stream){ - if(This->stream->tmp_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -871,21 +868,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return params.result; } -static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, - UINT32 *numpad) -{ - struct get_current_padding_params params; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = numpad; - params.lock = FALSE; - UNIX_CALL(get_current_padding, &params); - return params.result; -} - static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { @@ -902,7 +884,6 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, params.stream = This->stream; params.padding = numpad; - params.lock = TRUE; UNIX_CALL(get_current_padding, &params); return params.result; } @@ -1322,8 +1303,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad; - HRESULT hr; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1331,54 +1311,11 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - hr = AudioClient_GetCurrentPadding_nolock(This, &pad); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - if(pad + frames > This->stream->bufsize_frames){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ - if(This->stream->tmp_buffer_frames < frames){ - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); - This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ - This->stream->tmp_buffer_frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; - } - This->stream->tmp_buffer_frames = frames; - } - *data = This->stream->tmp_buffer; - This->stream->getbuf_last = -frames; - }else{ - *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - This->stream->getbuf_last = frames; - } - - silence_buffer(This->stream, *data, frames); - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.data = data; + UNIX_CALL(get_render_buffer, &params); + return params.result; } static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 450293052c7..e2ae457e705 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,14 @@ struct reset_params HRESULT result; }; +struct get_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct get_mix_format_params { EDataFlow flow; @@ -128,7 +136,6 @@ struct get_latency_params struct get_current_padding_params { struct coreaudio_stream *stream; - BOOL lock; /* temporary */ HRESULT result; UINT32 *padding; }; @@ -141,6 +148,7 @@ enum unix_funcs unix_start, unix_stop, unix_reset, + unix_get_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 08/12] winecoreaudio: Move reset to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 29 ++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 31 ++++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5a49a786f48..ee34cd29de1 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1275,6 +1275,34 @@ static NTSTATUS stop(void *args) return STATUS_SUCCESS; } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else if(stream->getbuf_last) + params->result = AUDCLNT_E_BUFFER_OPERATION_PENDING; + else{ + if(stream->flow == eRender) + stream->written_frames = 0; + else + stream->written_frames += stream->held_frames; + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + stream->cap_offs_frames = 0; + stream->cap_held_frames = 0; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1282,6 +1310,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e214a85c0d3..cf2c23a0f40 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1041,39 +1041,16 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(This->dataflow == eRender){ - This->stream->written_frames = 0; - }else{ - This->stream->written_frames += This->stream->held_frames; - } - - This->stream->held_frames = 0; - This->stream->lcl_offs_frames = 0; - This->stream->wri_offs_frames = 0; - This->stream->cap_offs_frames = 0; - This->stream->cap_held_frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(reset, &params); + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c3da84c2c7a..450293052c7 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -87,6 +87,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -134,6 +140,7 @@ enum unix_funcs unix_release_stream, unix_start, unix_stop, + unix_reset, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 07/12] winecoreaudio: Move stop to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 ++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++------------ dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 133ab3da124..5a49a786f48 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1256,12 +1256,32 @@ static NTSTATUS start(void *args) return STATUS_SUCCESS; } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(!stream->playing) + params->result = S_FALSE; + else{ + stream->playing = FALSE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, start, + stop, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 30858931338..e214a85c0d3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1026,24 +1026,16 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(!This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return S_FALSE; - } - - This->stream->playing = FALSE; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(stop, &params); + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index b4e9e5bf950..c3da84c2c7a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -81,6 +81,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -127,6 +133,7 @@ enum unix_funcs unix_create_stream, unix_release_stream, unix_start, + unix_stop, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 06/12] winecoreaudio: Move start to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 39 ++++++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 7 ++++++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 76febf1eb91..133ab3da124 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1237,11 +1237,31 @@ static NTSTATUS get_current_padding(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else{ + stream->playing = TRUE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, + start, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5d140665a83..30858931338 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -996,38 +996,31 @@ void CALLBACK ca_period_cb(void *user, BOOLEAN timer) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct start_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->stream->lock); + if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event) return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(This->event && !This->timer) - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ - This->timer = NULL; - OSSpinLockUnlock(&This->stream->lock); - WARN("Unable to create timer: %u\n", GetLastError()); - return E_OUTOFMEMORY; - } - - This->stream->playing = TRUE; - OSSpinLockUnlock(&This->stream->lock); + params.stream = This->stream; + UNIX_CALL(start, &params); - return S_OK; + if(SUCCEEDED(params.result)){ + if(This->event && !This->timer){ + if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, This, 0, + This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This->timer = NULL; + IAudioClient3_Stop(iface); + WARN("Unable to create timer: %u\n", GetLastError()); + return E_OUTOFMEMORY; + } + } + } + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 072ffd233c3..b4e9e5bf950 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -75,6 +75,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -120,6 +126,7 @@ enum unix_funcs unix_get_endpoint_ids, unix_create_stream, unix_release_stream, + unix_start, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 05/12] winecoreaudio: Move get_current_padding to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 19 +++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++++-------------- dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2d5aa29555a..76febf1eb91 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1219,6 +1219,24 @@ static NTSTATUS get_latency(void *args) return STATUS_SUCCESS; } +static UINT32 get_current_padding_nolock(struct coreaudio_stream *stream) +{ + if(stream->flow == eCapture) capture_resample(stream); + return stream->held_frames; +} + +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(params->lock) OSSpinLockLock(&stream->lock); + *params->padding = get_current_padding_nolock(stream); + if(params->lock) OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1228,6 +1246,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_buffer_size, get_latency, + get_current_padding, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 63deb458f1a..5d140665a83 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -874,22 +874,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, UINT32 *numpad) { + struct get_current_padding_params params; + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - if(This->dataflow == eCapture) - capture_resample(This); - - *numpad = This->stream->held_frames; - - return S_OK; + params.stream = This->stream; + params.padding = numpad; + params.lock = FALSE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, numpad); @@ -899,13 +900,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.padding = numpad; + params.lock = TRUE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index dd86cd81973..072ffd233c3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -107,6 +107,14 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct coreaudio_stream *stream; + BOOL lock; /* temporary */ + HRESULT result; + UINT32 *padding; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -116,6 +124,7 @@ enum unix_funcs unix_is_format_supported, unix_get_buffer_size, unix_get_latency, + unix_get_current_padding, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 04/12] winecoreaudio: Move get_latency to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 93 ++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 119 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 8 ++ 3 files changed, 109 insertions(+), 111 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 56504a8b7b0..2d5aa29555a 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1127,6 +1127,98 @@ static NTSTATUS get_buffer_size(void *args) return STATUS_SUCCESS; } +static HRESULT ca_get_max_stream_latency(struct coreaudio_stream *stream, UInt32 *max) +{ + AudioObjectPropertyAddress addr; + AudioStreamID *ids; + UInt32 size; + OSStatus sc; + int nstreams, i; + + addr.mScope = get_scope(stream->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreams; + + sc = AudioObjectGetPropertyDataSize(stream->dev_id, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get size for _Streams property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + ids = malloc(size); + if(!ids) + return E_OUTOFMEMORY; + + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, ids); + if(sc != noErr){ + WARN("Unable to get _Streams property: %x\n", (int)sc); + free(ids); + return osstatus_to_hresult(sc); + } + + nstreams = size / sizeof(AudioStreamID); + *max = 0; + + addr.mSelector = kAudioStreamPropertyLatency; + for(i = 0; i < nstreams; ++i){ + UInt32 latency; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Unable to get _Latency property: %x\n", (int)sc); + continue; + } + + if(latency > *max) + *max = latency; + } + + free(ids); + + return S_OK; +} + +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct coreaudio_stream *stream = params->stream; + UInt32 latency, stream_latency, size; + AudioObjectPropertyAddress addr; + OSStatus sc; + + OSSpinLockLock(&stream->lock); + + addr.mScope = get_scope(stream->flow); + addr.mSelector = kAudioDevicePropertyLatency; + addr.mElement = 0; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Couldn't get _Latency property: %x\n", (int)sc); + OSSpinLockUnlock(&stream->lock); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + params->result = ca_get_max_stream_latency(stream, &stream_latency); + if(FAILED(params->result)){ + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; + } + + latency += stream_latency; + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + *params->latency = muldiv(latency, 10000000, stream->fmt->nSamplesPerSec) + + stream->period_ms * 10000; + + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1135,6 +1227,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, is_format_supported, get_buffer_size, + get_latency, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cd33cababd1..63deb458f1a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -130,7 +130,6 @@ struct ACImpl { float *vols; AudioDeviceID adevid; - AudioObjectPropertyScope scope; HANDLE timer; AudioSession *session; @@ -263,19 +262,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT osstatus_to_hresult(OSStatus sc) -{ - switch(sc){ - case kAudioFormatUnsupportedDataFormatError: - case kAudioFormatUnknownFormatError: - case kAudioDeviceUnsupportedFormatError: - return AUDCLNT_E_UNSUPPORTED_FORMAT; - case kAudioHardwareBadDeviceError: - return AUDCLNT_E_DEVICE_INVALIDATED; - } - return E_FAIL; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -481,6 +467,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -494,15 +483,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; - if(dataflow == eRender) - This->scope = kAudioDevicePropertyScopeOutput; - else if(dataflow == eCapture) - This->scope = kAudioDevicePropertyScopeInput; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -871,68 +851,11 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, return params.result; } -static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) -{ - AudioObjectPropertyAddress addr; - AudioStreamID *ids; - UInt32 size; - OSStatus sc; - int nstreams, i; - - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreams; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, - &size); - if(sc != noErr){ - WARN("Unable to get size for _Streams property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - ids = HeapAlloc(GetProcessHeap(), 0, size); - if(!ids) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, ids); - if(sc != noErr){ - WARN("Unable to get _Streams property: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, ids); - return osstatus_to_hresult(sc); - } - - nstreams = size / sizeof(AudioStreamID); - *max = 0; - - addr.mSelector = kAudioStreamPropertyLatency; - for(i = 0; i < nstreams; ++i){ - UInt32 latency; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Unable to get _Latency property: %x\n", (int)sc); - continue; - } - - if(latency > *max) - *max = latency; - } - - HeapFree(GetProcessHeap(), 0, ids); - - return S_OK; -} - static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *out) { ACImpl *This = impl_from_IAudioClient3(iface); - UInt32 latency, stream_latency, size; - AudioObjectPropertyAddress addr; - OSStatus sc; - HRESULT hr; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, out); @@ -942,36 +865,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - addr.mScope = This->scope; - addr.mSelector = kAudioDevicePropertyLatency; - addr.mElement = 0; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->stream->lock); - return osstatus_to_hresult(sc); - } - - hr = ca_get_max_stream_latency(This, &stream_latency); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - latency += stream_latency; - /* pretend we process audio in Period chunks, so max latency includes - * the period time */ - *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) - + This->stream->period_ms * 10000; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.latency = out; + UNIX_CALL(get_latency, &params); + return params.result; } static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7e08b347b02..dd86cd81973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,13 @@ struct get_buffer_size_params UINT32 *frames; }; +struct get_latency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -108,6 +115,7 @@ enum unix_funcs unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, + unix_get_latency, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 03/12] winecoreaudio: Move get_buffer_size to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 13 +++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 12 +++++------- dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f1ab4cf7986..56504a8b7b0 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1115,6 +1115,18 @@ static NTSTATUS capture_resample(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + *params->frames = stream->bufsize_frames; + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1122,6 +1134,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + get_buffer_size, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 578312bf4ef..cd33cababd1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -855,6 +855,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, frames); @@ -864,13 +865,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - *frames = This->stream->bufsize_frames; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_buffer_size, &params); + return params.result; } static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c1762c50e7e..7e08b347b02 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,13 @@ struct is_format_supported_params HRESULT result; }; +struct get_buffer_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -100,6 +107,7 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + unix_get_buffer_size, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 02/12] winecoreaudio: Add a temporary capture_resample syscall.
by Huw Davies 23 Nov '21

23 Nov '21

Eventually everything that calls this will reside in the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 105 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 102 +--------------------------- dlls/winecoreaudio.drv/unixlib.h | 2 + 3 files changed, 108 insertions(+), 101 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f7f7777efcb..f1ab4cf7986 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -693,6 +693,7 @@ static NTSTATUS release_stream( void *args ) } if(stream->converter) AudioConverterDispose(stream->converter); + free(stream->resamp_buffer); free(stream->wrap_buffer); free(stream->cap_buffer); if(stream->local_buffer) @@ -1012,6 +1013,108 @@ unsupported: return STATUS_SUCCESS; } +static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) +{ + if(left <= right) + return right - left; + return bufsize - (left - right); +} + +/* place data from cap_buffer into provided AudioBufferList */ +static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, + AudioStreamPacketDescription **packets, void *user) +{ + struct coreaudio_stream *stream = user; + + *nframes = min(*nframes, stream->cap_held_frames); + if(!*nframes){ + data->mBuffers[0].mData = NULL; + data->mBuffers[0].mDataByteSize = 0; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + return noErr; + } + + data->mBuffers[0].mDataByteSize = *nframes * stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + + if(stream->cap_offs_frames + *nframes > stream->cap_bufsize_frames){ + UINT32 chunk_frames = stream->cap_bufsize_frames - stream->cap_offs_frames; + + if(stream->wrap_bufsize_frames < *nframes){ + free(stream->wrap_buffer); + stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + stream->wrap_bufsize_frames = *nframes; + } + + memcpy(stream->wrap_buffer, stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign, + chunk_frames * stream->fmt->nBlockAlign); + memcpy(stream->wrap_buffer + chunk_frames * stream->fmt->nBlockAlign, stream->cap_buffer, + (*nframes - chunk_frames) * stream->fmt->nBlockAlign); + + data->mBuffers[0].mData = stream->wrap_buffer; + }else + data->mBuffers[0].mData = stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign; + + stream->cap_offs_frames += *nframes; + stream->cap_offs_frames %= stream->cap_bufsize_frames; + stream->cap_held_frames -= *nframes; + + if(packets) + *packets = NULL; + + return noErr; +} + +static NTSTATUS capture_resample(void *args) +{ + struct coreaudio_stream *stream = args; + UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, + stream->fmt->nSamplesPerSec); + OSStatus sc; + + /* the resampling process often needs more source frames than we'd + * guess from a straight conversion using the sample rate ratio. so + * only convert if we have extra source data. */ + while(stream->cap_held_frames > resamp_period_frames * 2){ + AudioBufferList converted_list; + UInt32 wanted_frames = stream->period_frames; + + converted_list.mNumberBuffers = 1; + converted_list.mBuffers[0].mNumberChannels = stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * stream->fmt->nBlockAlign; + + if(stream->resamp_bufsize_frames < wanted_frames){ + free(stream->resamp_buffer); + stream->resamp_buffer = malloc(converted_list.mBuffers[0].mDataByteSize); + stream->resamp_bufsize_frames = wanted_frames; + } + + converted_list.mBuffers[0].mData = stream->resamp_buffer; + + sc = AudioConverterFillComplexBuffer(stream->converter, feed_cb, + stream, &wanted_frames, &converted_list, NULL); + if(sc != noErr){ + WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); + break; + } + + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + stream->resamp_buffer, wanted_frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += wanted_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + if(stream->held_frames + wanted_frames > stream->bufsize_frames){ + stream->lcl_offs_frames += buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, + stream->bufsize_frames); + stream->held_frames = stream->bufsize_frames; + }else + stream->held_frames += wanted_frames; + } + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1019,4 +1122,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + + capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 418bbfa00af..578312bf4ef 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,10 +138,6 @@ struct ACImpl { struct coreaudio_stream *stream; struct list entry; - - /* Temporary */ - BYTE *feed_wrap_buffer; - UINT32 feed_wrap_bufsize_frames; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -581,7 +577,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(This->stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, &This->stream->tmp_buffer_size, MEM_RELEASE); - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -591,7 +586,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - free(This->feed_wrap_buffer); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); @@ -736,103 +730,9 @@ static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) -{ - if(left <= right) - return right - left; - return bufsize - (left - right); -} - -/* place data from cap_buffer into provided AudioBufferList */ -static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, - AudioStreamPacketDescription **packets, void *user) -{ - ACImpl *This = user; - - *nframes = min(*nframes, This->stream->cap_held_frames); - if(!*nframes){ - data->mBuffers[0].mData = NULL; - data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - return noErr; - } - - data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - - if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ - UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - - if(This->feed_wrap_bufsize_frames < *nframes){ - free(This->feed_wrap_buffer); - This->feed_wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->feed_wrap_bufsize_frames = *nframes; - } - - memcpy(This->feed_wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, - chunk_frames * This->stream->fmt->nBlockAlign); - memcpy(This->feed_wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, - (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - - data->mBuffers[0].mData = This->feed_wrap_buffer; - }else - data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->cap_offs_frames += *nframes; - This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; - This->stream->cap_held_frames -= *nframes; - - if(packets) - *packets = NULL; - - return noErr; -} - static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); - OSStatus sc; - - /* the resampling process often needs more source frames than we'd - * guess from a straight conversion using the sample rate ratio. so - * only convert if we have extra source data. */ - while(This->stream->cap_held_frames > resamp_period_frames * 2){ - AudioBufferList converted_list; - UInt32 wanted_frames = This->stream->period_frames; - - converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - - if(This->stream->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->stream->resamp_bufsize_frames = wanted_frames; - } - - converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - - sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, - This, &wanted_frames, &converted_list, NULL); - if(sc != noErr){ - WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); - break; - } - - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - - This->stream->wri_offs_frames += wanted_frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ - This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, - This->stream->wri_offs_frames, This->stream->bufsize_frames); - This->stream->held_frames = This->stream->bufsize_frames; - }else - This->stream->held_frames += wanted_frames; - } + UNIX_CALL(capture_resample, This->stream); } static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 23de92ecfdd..c1762c50e7e 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,8 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + + unix_capture_resample /* temporary */ }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

← Newer
1
...
22
23
24
25
26
27
28
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel November 2021