ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-22 23:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed WASAPI input stream releasing a different buffer size than it got.

Browse source 
This caused a SoundIOErrorStreaming error and all following reads would fail. It took a while in the microphone sample, but after ~30 seconds it would always fail for me.
This commit is contained in:
Nils Daumann 2017-05-24 22:57:35 +02:00
parent fde62658d8
commit e3973967d2
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/wasapi.c
View file

@ -2084,7 +2084,9 @@ static int instream_begin_read_wasapi(struct SoundIoPrivate *si, struct SoundIoI
{ {
return SoundIoErrorStreaming; return SoundIoErrorStreaming;
} }
isw->opened_buf_frames = frames_to_read;
isw->read_buf_frames_left = frames_to_read; isw->read_buf_frames_left = frames_to_read;
if (flags & AUDCLNT_BUFFERFLAGS_SILENT) if (flags & AUDCLNT_BUFFERFLAGS_SILENT)
isw->read_buf = NULL; isw->read_buf = NULL;
} }
@ -2096,6 +2098,8 @@ static int instream_begin_read_wasapi(struct SoundIoPrivate *si, struct SoundIoI
for (int ch = 0; ch < instream->layout.channel_count; ch += 1) { for (int ch = 0; ch < instream->layout.channel_count; ch += 1) {
isw->areas[ch].ptr = isw->read_buf + ch * instream->bytes_per_sample; isw->areas[ch].ptr = isw->read_buf + ch * instream->bytes_per_sample;
isw->areas[ch].step = instream->bytes_per_frame; isw->areas[ch].step = instream->bytes_per_frame;
isw->areas[ch].ptr += instream->bytes_per_frame * (isw->opened_buf_frames - isw->read_buf_frames_left);
} }
*out_areas = isw->areas; *out_areas = isw->areas;
@ -2109,10 +2113,15 @@ static int instream_begin_read_wasapi(struct SoundIoPrivate *si, struct SoundIoI
static int instream_end_read_wasapi(struct SoundIoPrivate *si, struct SoundIoInStreamPrivate *is) { static int instream_end_read_wasapi(struct SoundIoPrivate *si, struct SoundIoInStreamPrivate *is) {
struct SoundIoInStreamWasapi *isw = &is->backend_data.wasapi; struct SoundIoInStreamWasapi *isw = &is->backend_data.wasapi;
HRESULT hr; HRESULT hr;
if (FAILED(hr = IAudioCaptureClient_ReleaseBuffer(isw->audio_capture_client, isw->read_frame_count))) {
isw->read_buf_frames_left -= isw->read_frame_count;
if (isw->read_buf_frames_left <= 0) {
if (FAILED(hr = IAudioCaptureClient_ReleaseBuffer(isw->audio_capture_client, isw->opened_buf_frames))) {
return SoundIoErrorStreaming; return SoundIoErrorStreaming;
} }
isw->read_buf_frames_left -= isw->read_frame_count; }
return 0; return 0;
} }

1
src/wasapi.h
View file

@ -100,6 +100,7 @@ struct SoundIoInStreamWasapi {
bool started; bool started;
char *read_buf; char *read_buf;
int read_buf_frames_left; int read_buf_frames_left;
int opened_buf_frames;
struct SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS]; struct SoundIoChannelArea areas[SOUNDIO_MAX_CHANNELS];
}; };