lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 12:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix various Capture bugs

Browse source
This commit is contained in:
Nevyn Bengtsson 2020-12-03 17:08:33 +01:00 committed by Bjorn
parent 1e05f29da4
commit 7efc855929
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/modules/audio/audio.c
View file

@ -402,9 +402,9 @@ uint32_t lovrAudioGetCaptureSampleCount() {
struct SoundData* lovrAudioCapture(uint32_t frameCount, SoundData *soundData, uint32_t offset) { struct SoundData* lovrAudioCapture(uint32_t frameCount, SoundData *soundData, uint32_t offset) {
uint32_t availableFrames = lovrAudioGetCaptureSampleCount(); uint32_t bufferedFrames = lovrAudioGetCaptureSampleCount();
if (frameCount == 0 || frameCount > availableFrames) { if (frameCount == 0 || frameCount > bufferedFrames) {
frameCount = availableFrames; frameCount = bufferedFrames;
} }
if (frameCount == 0) { if (frameCount == 0) {
@ -414,28 +414,29 @@ struct SoundData* lovrAudioCapture(uint32_t frameCount, SoundData *soundData, ui
if (soundData == NULL) { if (soundData == NULL) {
soundData = lovrSoundDataCreate(frameCount, CAPTURE_CHANNELS, LOVR_AUDIO_SAMPLE_RATE, OUTPUT_FORMAT, NULL, 0); soundData = lovrSoundDataCreate(frameCount, CAPTURE_CHANNELS, LOVR_AUDIO_SAMPLE_RATE, OUTPUT_FORMAT, NULL, 0);
} else { } else {
lovrAssert(soundData->channels == OUTPUT_CHANNELS, "Capture and SoundData channel counts must match"); lovrAssert(soundData->channels == CAPTURE_CHANNELS, "Capture and SoundData channel counts must match");
lovrAssert(soundData->sampleRate == LOVR_AUDIO_SAMPLE_RATE, "Capture and SoundData sample rates must match"); lovrAssert(soundData->sampleRate == LOVR_AUDIO_SAMPLE_RATE, "Capture and SoundData sample rates must match");
lovrAssert(soundData->format == OUTPUT_FORMAT, "Capture and SoundData formats must match"); lovrAssert(soundData->format == OUTPUT_FORMAT, "Capture and SoundData formats must match");
lovrAssert(offset + frameCount <= soundData->frames, "Tried to write samples past the end of a SoundData buffer"); lovrAssert(offset + frameCount <= soundData->frames, "Tried to write samples past the end of a SoundData buffer");
} }
uint32_t bytesPerFrame = sizeof(float) * CAPTURE_CHANNELS;
while(frameCount > 0) { while(frameCount > 0) {
uint32_t availableFrames = frameCount; uint32_t availableFramesInRB = frameCount;
void *store; void *store;
ma_result acquire_status = ma_pcm_rb_acquire_read(&state.captureRingbuffer, &availableFrames, &store); ma_result acquire_status = ma_pcm_rb_acquire_read(&state.captureRingbuffer, &availableFramesInRB, &store);
if (acquire_status != MA_SUCCESS) { if (acquire_status != MA_SUCCESS) {
lovrAssert(false, "Failed to acquire ring buffer for read: %d\n", acquire_status); lovrAssert(false, "Failed to acquire ring buffer for read: %d\n", acquire_status);
return NULL; return NULL;
} }
memcpy(soundData->blob->data + offset, store, availableFrames * sizeof(float) * CAPTURE_CHANNELS); memcpy(soundData->blob->data + offset * bytesPerFrame, store, availableFramesInRB * bytesPerFrame);
ma_result commit_status = ma_pcm_rb_commit_read(&state.captureRingbuffer, availableFrames, store); ma_result commit_status = ma_pcm_rb_commit_read(&state.captureRingbuffer, availableFramesInRB, store);
if (commit_status != MA_SUCCESS) { if (commit_status != MA_SUCCESS) {
lovrAssert(false, "Failed to commit ring buffer for read: %d\n", acquire_status); lovrAssert(false, "Failed to commit ring buffer for read: %d\n", acquire_status);
return NULL; return NULL;
} }
frameCount -= availableFrames; frameCount -= availableFramesInRB;
offset += availableFrames; offset += availableFramesInRB;
} }
return soundData; return soundData;