diff options
author | Chris Robinson <[email protected]> | 2018-09-17 23:43:23 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-09-17 23:43:23 -0700 |
commit | 952ff84b994b72ec39e97e2441a422085884932a (patch) | |
tree | 43b59c849582ea8bd2dd1aee90c75aaebfc64c30 /Alc | |
parent | b77e6096b8ed26b8fee24a18820c0592eeee87b4 (diff) |
Properly queue buffers for OpenSL capture
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/backends/opensl.c | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c index 9815b390..aa2a1a6e 100644 --- a/Alc/backends/opensl.c +++ b/Alc/backends/opensl.c @@ -950,14 +950,16 @@ static ALCenum ALCopenslCapture_captureSamples(ALCopenslCapture *self, ALCvoid * SLAndroidSimpleBufferQueueItf bufferQueue; ll_ringbuffer_data_t data[2]; SLresult result; - size_t advance; ALCuint i; + result = VCALL(self->mRecordObj,GetInterface)(SL_IID_ANDROIDSIMPLEBUFFERQUEUE, + &bufferQueue); + PRINTERR(result, "recordObj->GetInterface"); + /* Read the desired samples from the ring buffer then advance its read * pointer. */ ll_ringbuffer_get_read_vector(self->mRing, data); - advance = 0; for(i = 0;i < samples;) { ALCuint rem = minu(samples - i, device->UpdateSize - self->mSplOffset); @@ -970,7 +972,11 @@ static ALCenum ALCopenslCapture_captureSamples(ALCopenslCapture *self, ALCvoid * { /* Finished a chunk, reset the offset and advance the read pointer. */ self->mSplOffset = 0; - advance++; + + ll_ringbuffer_read_advance(self->mRing, 1); + result = VCALL(bufferQueue,Enqueue)(data[0].buf, chunk_size); + PRINTERR(result, "bufferQueue->Enqueue"); + if(SL_RESULT_SUCCESS != result) break; data[0].len--; if(!data[0].len) @@ -981,35 +987,6 @@ static ALCenum ALCopenslCapture_captureSamples(ALCopenslCapture *self, ALCvoid * i += rem; } - if(!advance) - return ALC_NO_ERROR; - ll_ringbuffer_read_advance(self->mRing, advance); - - result = VCALL(self->mRecordObj,GetInterface)(SL_IID_ANDROIDSIMPLEBUFFERQUEUE, - &bufferQueue); - PRINTERR(result, "recordObj->GetInterface"); - - /* Enqueue any newly-writable chunks in the ring buffer. Limit the number - * of enqueued chunks to the number of fully read chunks. - */ - ll_ringbuffer_get_write_vector(self->mRing, data); - if(data[0].len > advance) - { - data[0].len = advance; - data[1].len = 0; - } - else if(data[1].len > advance-data[0].len) - data[1].len = advance-data[0].len; - for(i = 0;i < data[0].len && SL_RESULT_SUCCESS == result;i++) - { - result = VCALL(bufferQueue,Enqueue)(data[0].buf + chunk_size*i, chunk_size); - PRINTERR(result, "bufferQueue->Enqueue"); - } - for(i = 0;i < data[1].len && SL_RESULT_SUCCESS == result;i++) - { - result = VCALL(bufferQueue,Enqueue)(data[1].buf + chunk_size*i, chunk_size); - PRINTERR(result, "bufferQueue->Enqueue"); - } if(SL_RESULT_SUCCESS != result) { |