zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmdevapi: Do not modify buffer size after sample rate change.

Browse source
This commit is contained in:
Santino Mazza 2024-10-24 23:45:23 -03:00
parent be97c86737
commit d15b6f0e01
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/mmdevapi/tests/render.c
View file

@ -2724,7 +2724,7 @@ static void test_audio_clock_adjustment(void)
WaitForSingleObject(event, 1000);
hr = IAudioClient_GetBufferSize(ac, &bufsize);
todo_wine ok(bufsize == expected_bufsize, "unexpected bufsize %d expected %d\n", bufsize, expected_bufsize);
ok(bufsize == expected_bufsize, "unexpected bufsize %d expected %d\n", bufsize, expected_bufsize);
hr = IAudioClockAdjustment_SetSampleRate(aca, 44100.00f);
ok(hr == S_OK, "SetSampleRate failed: %08lx\n", hr);
@ -2742,7 +2742,7 @@ static void test_audio_clock_adjustment(void)
WaitForSingleObject(event, 1000);
hr = IAudioClient_GetBufferSize(ac, &bufsize);
todo_wine ok(bufsize == expected_bufsize, "unexpected bufsize %d expected %d\n", bufsize, expected_bufsize);
ok(bufsize == expected_bufsize, "unexpected bufsize %d expected %d\n", bufsize, expected_bufsize);
IAudioClockAdjustment_Release(aca);
IAudioClient_Release(ac);

20
dlls/winepulse.drv/pulse.c
View file

@ -2494,8 +2494,6 @@ static NTSTATUS pulse_set_sample_rate(void *args)
struct pulse_stream *stream = handle_get_stream(params->stream);
HRESULT hr = S_OK;
int success;
SIZE_T size, new_bufsize_frames;
BYTE *new_buffer = NULL;
pa_sample_spec new_ss;
pulse_lock();
@ -2510,22 +2508,12 @@ static NTSTATUS pulse_set_sample_rate(void *args)
new_ss = stream->ss;
new_ss.rate = params->rate;
new_bufsize_frames = ceil((stream->duration / 10000000.) * new_ss.rate);
size = new_bufsize_frames * 2 * pa_frame_size(&stream->ss);
if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&new_buffer,
zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)) {
hr = E_OUTOFMEMORY;
goto exit;
}
if (!wait_pa_operation_complete(pa_stream_update_sample_rate(stream->stream, params->rate, pulse_op_cb, &success)))
success = 0;
if (!success) {
hr = E_OUTOFMEMORY;
size = 0;
NtFreeVirtualMemory(GetCurrentProcess(), (void **)&new_buffer, &size, MEM_RELEASE);
goto exit;
}
@ -2536,15 +2524,9 @@ static NTSTATUS pulse_set_sample_rate(void *args)
stream->pa_offs_bytes = stream->lcl_offs_bytes = 0;
stream->held_bytes = stream->pa_held_bytes = 0;
stream->period_bytes = pa_frame_size(&new_ss) * muldiv(stream->mmdev_period_usec, new_ss.rate, 1000000);
stream->real_bufsize_bytes = size;
stream->bufsize_frames = new_bufsize_frames;
stream->ss = new_ss;
size = 0;
NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &size, MEM_RELEASE);
silence_buffer(new_ss.format, new_buffer, stream->real_bufsize_bytes);
stream->local_buffer = new_buffer;
silence_buffer(new_ss.format, stream->local_buffer, stream->real_bufsize_bytes);
exit:
pulse_unlock();