Skip to content

W
wine-cw
Commit aa3df3f7 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

winecoreaudio: Remove unnecessary buffer sizes.

Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent bbd26ea8
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
dlls/winecoreaudio.drv/coreaudio.c
View file @ aa3df3f7
...@@ -92,7 +92,6 @@ struct coreaudio_stream ...@@ -92,7 +92,6 @@ struct coreaudio_stream
INT32 getbuf_last; INT32 getbuf_last;
WAVEFORMATEX *fmt; WAVEFORMATEX *fmt;
BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer;
SIZE_T local_buffer_size, tmp_buffer_size;
}; };
static HRESULT osstatus_to_hresult(OSStatus sc) static HRESULT osstatus_to_hresult(OSStatus sc)
...@@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) ...@@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args)
struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); struct coreaudio_stream *stream = calloc(1, sizeof(*stream));
AURenderCallbackStruct input; AURenderCallbackStruct input;
OSStatus sc; OSStatus sc;
SIZE_T size;
if(!stream){ if(!stream){
params->result = E_OUTOFMEMORY; params->result = E_OUTOFMEMORY;
...@@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) ...@@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args)
goto end; goto end;
} }
stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; size = stream->bufsize_frames * stream->fmt->nBlockAlign;
if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size,
MEM_COMMIT, PAGE_READWRITE)){ MEM_COMMIT, PAGE_READWRITE)){
params->result = E_OUTOFMEMORY; params->result = E_OUTOFMEMORY;
goto end; goto end;
...@@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) ...@@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args)
{ {
struct get_render_buffer_params *params = args; struct get_render_buffer_params *params = args;
struct coreaudio_stream *stream = params->stream; struct coreaudio_stream *stream = params->stream;
SIZE_T size;
UINT32 pad; UINT32 pad;
OSSpinLockLock(&stream->lock); OSSpinLockLock(&stream->lock);
...@@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) ...@@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args)
if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){
if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer_frames < params->frames){
if(stream->tmp_buffer){ if(stream->tmp_buffer){
SIZE_T size = 0; size = 0;
NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer,
&size, MEM_RELEASE); &size, MEM_RELEASE);
stream->tmp_buffer = NULL; stream->tmp_buffer = NULL;
} }
stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; size = params->frames * stream->fmt->nBlockAlign;
if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0,
&stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ &size, MEM_COMMIT, PAGE_READWRITE)){
stream->tmp_buffer_frames = 0; stream->tmp_buffer_frames = 0;
params->result = E_OUTOFMEMORY; params->result = E_OUTOFMEMORY;
goto end; goto end;
...@@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) ...@@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args)
struct coreaudio_stream *stream = params->stream; struct coreaudio_stream *stream = params->stream;
UINT32 chunk_bytes, chunk_frames; UINT32 chunk_bytes, chunk_frames;
LARGE_INTEGER stamp, freq; LARGE_INTEGER stamp, freq;
SIZE_T size;
OSSpinLockLock(&stream->lock); OSSpinLockLock(&stream->lock);
...@@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) ...@@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args)
if(chunk_frames < stream->period_frames){ if(chunk_frames < stream->period_frames){
chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; chunk_bytes = chunk_frames * stream->fmt->nBlockAlign;
if(!stream->tmp_buffer){ if(!stream->tmp_buffer){
stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; size = stream->period_frames * stream->fmt->nBlockAlign;
NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0,
&stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); &size, MEM_COMMIT, PAGE_READWRITE);
} }
*params->data = stream->tmp_buffer; *params->data = stream->tmp_buffer;
memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment